Inventory overhaul (unfinished)