Maybe we should make the catalog type variable, and inject it?