Added HW 7 and some changes to HW 5