Finished assignment 2, final draft