Initial work for the transformation with one issue to be resolved