Final commit for Assignment 1