Final version of hw2

Check that this works