Final commit for Project Milestone 5

Karl