Homework 6

Not working, dammit.
Homework 6 - more passing tests

Don't develop on a machine with 2g ram.