More functionality and changes to InventoryItem