Assignment 3, first commit