More submodule stuff, should be good now