Assignment 2 almost complete

Need to prettify and remove testing code