first commit for assignment 2, should be complete