Tidy up imports
Start jitting the rotations [skip ci]