Done up to Extra Credit
Tweak to Iteration 5