cleaned up more, TDD coming up.