Oh you didn't change these to a dictionary. Do you think this approach is better?