Progress on Inventory

resolve #2