Making this object oriented