Making this object oriented.