Starting to go down a module path. Refactoring incoming