still trying to get rid of submodules