made new class to fix god class