Project 1 Submission, Needs Cleanup