Assignment 2 final commit