So it looks like switching to CMS might actually work here