Add an AnimatedObject class
Fix animation
Merge branch 'feature/update'