checking in Mike's stage 3 / widget work from yesterday