12/11/14  - finished refactoring animation code