Still trying to clean up the submodules stuff