added stuff from cm build that isn't actually in my build dir