WIP: Better transforms [ci skip]