Great, thanks. Unfortunately neither seem to be working quite right for me with

make catalog

I will see what I can track down.