Finished Problem 7

Finally finished problem 7. Had to completely redo the whole thing,
which of course didn't work for a few times. Off to start  Problem 8!