Implementing animate
Merge branch 'topic/animate'