CM-ify the build