More AnimationState refactoring, getting good!

#113