More Inventory rewrite stuff.