strill trying to clean up this mess
ok we went back to submodules