Re-adding class page redesign I guess? About to head into merge territory...