Homework 9

A few more test passing, more to do.