A better name for the class?