More CML

Committing this now before I forget - probably won't be working more
tonight.  More of the same as the last commit