[#007] auto play seems to be working
[#007] Some more refactoring for animation