Borked submodule, fixing part 1
Borked submodule, fixing part 2 (done)