Halfway through another wave of major refactoring
Pfew MVR was huge