Assignment 1 Submission

Closes issues 2-7