Starting with refactoring, tests now broken.