Update 2 on HW 3

Completed 6-10, along with the changes made on 5