Reordering things, end (?) of the work on races/classes.