Almost complete re-write of inventory