Object Oriented Transformation

Attempting a more object oriented approach for the most part.