Continued refactor.