Finished the first wave of this major refactor.