Another place where a dict of methods might be easier