Made it object oriented
Made it object oriented