Pulled back to a TDD approach