Updating CAM so that the submodules actually work. Might be useful yes?