Fix Transformations

Created a more sane approach to transformations.