Added firs round of zM Easy CPT

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>
Bug fixes, removed dead code.

Signed-off-by: Zane M. Kolnik <zanematthew@gmail.com>