Moar CM

Change-Id: Ia722d51c02c5964c4ebce33771ab1129ea0e2b3b