Adding back the generic catalogue service but leaving commented out of the build till it is working.