animation tests
merge - work was happening on two branches