working transform applied selectively -- tests broken - wip