Mostly finish problem 7, I think