phto updates
Merge branch 'step7_todo' of https://github.com/3musket33rs/ThreeCircles into step7_todo