Need to get the structure in place, add tests for the existing code, then get caught up to where TDD is practical.