Started conversion to OO
Started conversion to OO