Middle of major refactoring.
4 files changed