New revision including a first pass at a shop catalog/inventory/cms model.