More peices of the class editing changes.