Refactor, tests run all the way through now