Ok. I'm going to move the CMS changes into a separate PR to hand off to @singingwolfboy