Started reworking inventory handling