Diamond CMS - work in progress