Continuing refactor.