Put in a somehow working submodule system