Working on better integrating CML

Things are a little broken right now. They'll be not broken again soon.
Hopefully.