Another WIP refactor checkpoint.