Update for CNC

Added the half finished version of the 1.5 version so I can finish it
on Github