Actually made it Object oriented.