Improved Inventory

No longer hardcoded system