Trying to deal with submodules
More submodule stuff