redid everything for submodules