Put it in a new class