Submodules hopefully done