Week 5, GPS 2.1: Finished up solutions

Refactored solution with Natalie