I think I will collapse the two classes into one.