haggertk/cm_build_stuff 4 commits