start putting the auxiliary class state machine back in