completed all tests - still looks bad though! :)