Change the name of this function to something that doesn't look like a class name?