Use our CMD and Helpers

* This should fix compile errors.  CM has a different set than what the doctor ordered...

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