Ugly working version of HW2 complete