Updated for new fields and ported shop inventory