Doesn't compile yet. Dreading the time when it does and there's an error in the hundreds of lines I changed. For future: commit small changes that can be compiled and tested atomically.
