hw 6 and 7 done