Continued refactoring on where logic sits.