Catalog2

Migrating catalog items to new code