Middle of major refactoring.
2 files changed