Readd Some Build Stuff From CM