Final commit for Milestone 4