HW2 redux - still not working