got all the tests to pass. fixed all errors in the original project before I could begin to refactor properly