Working through the refactor to get the tests to pass
bump
bump
Getting closer but still not there