HW2 - complete

E11 needs some work