Almost finished the new class definition

Much much simpler to use