Assigment 5, first commit