clean up production behavior
Start building out services using TDD.