Rotation reworked (WIP)