Adding submodules for real this time