More work on Class/Race features.