Should this be taking a class name argument?