Cnc merge

Merge in CNC classes