More Inventory work, most of InventoryHook implemented