Started to patch in the animation code