Debugging, continuing refactor.