Assignment 1, first commit