all tests now passing, but still tons of todos to nail out