More new class stuff.