Refatoring the class definition...
Rolling some ideas back, a pitty...