Merge to latest CM

* Well.... minus some of the CM stuff I don't like!

Signed-off-by: Chester Kener <Cl3Kener@gmail.com>