wrote new class and some other stuff