More CNC work