Mucked around with submodule stuff