This should use a namedtuple