First version of class-override code, not quite working.