Catalogs CMS 80 percent there...
Merging catalog CMS edits with individual work layout edits