CM-ify the build..