Changed the language definitions over to CPS. Major change, likely many small bugs to be found still.
Took out some temporary debug printing
Fixed merge conflicts