Reworked to use CL-CMS, removed comments until enabled