Adding in more ability to submodules