would you mind using a dict here? Bunch can lead to problems eg when pickling.