Animate movement dev

Merge animation branch with the master branch.