Refactor to allow for rotation and writing to be animated