Track these from CM

We now have overlays so we can track these from CM instead saving us time on merging.