Chunky refactor.