Maybe we could add a namedtuple here too?