more refactor of inventory/item system