CML Generation

Derp, debug stuff forgotten in.