Assignment 2

Last version, tested