Modify project to reflect Chapter 5 guidelines / add MapKit