Revert "Revert "Tweaking inventory system""

This reverts commit bd33e2cdeeea8102591d096d289558da6abcf95b.