working on new class structure
working on new class structure
working on new class structure