Added submodule calls

Not sure how many times I've been fucked by submodules. I avoid them now, but still the pain lingers