Just started OO-fying the code