test animation working
Refactor