Oops, reverting back to tdd. Two tests are still failing.