Feature/global inventory

Pull request for the feature/globalInventory branch