First pass of changes for adding zencatalogscan