Mod7

My work for the first half of week 5. No real questions on this section, and I did a close refactor watching the solutions afterwards. Thanks for any feedback!