Switch things up
Update submodules