working copy of Transformation :) but need some cleanup