Revert "Revert "remove cm stuff"got all screwy. fixes settings fc "

This reverts commit 1bfbc7a9973e003e79a90b73529fb85a2fc5fda1.