near final tweaks on refactor of makeInventory