This seems to be duplicating the class method in the previous file. Could that be dried up?