Working on new class