First pass of animation refactoring. Lot of changes...