Update with refactored code and reflection.
Merge branch 'master' of https://github.com/patrickreynolds/phase_0_unit_2