animation still not quite what i want :'(
Merge branch 'master' into gh-pages