Snapshotting current state of code before a significant refactor.
Refactor finished.  Committing to share the update.