More TDD - Still trying to drive the model