Pulled in more modules for complete refactor