Working on adding tranform logic