Wire this to the new class?