ContentCatalog almost finished