Final assignment 2 code
General clean up and prep for assignments 2/3/4