Transition mostly working again.

Transition broke due to refactor. Now works, but not with the rotate.
Need to account for the transform.