Made it object oriented