More transform stuff (still WIP)