Delete some cm stuff, add some stuff

Signed-off-by: anerik <anerikgames@gmail.com>