Merge Raj's Inventory Controls

Raj - Merge…’nuff said. :-)