name change and trivia
a moderate amount of test-driven work