More work on animation.