refactoring
dispose
refactoring
animation testing clean up
new testing