return the klass here? And then have the nil be the default below?