Project Complete

This commit should include all the requirements for project 1.