ACTUALLY refactored for transform helpers

oops