Working on using the new animation format.
Merged stuff.