Good point about having the class in two places.