Revamp for CMX
Signed-off-by: Kristofer Ard <kristoferard@gmail.com>