:+1: to moving it out of the `CatalogController`.  That has been kind of confusing to me in general.

I like that name better.  I have updated that in 1ae3d88