Homework 7 sort-of done