Move to new class stack