Reworking some of the CLS setup