more submodule shenanigans