Broken commit. Just checkpointing on major refactor.
Checkpointing during refactoring.