Finished modular refactor.