put stuff in new class