Assignment 1 final commit