Testing refactor

seems to have broken animation
Fixed animation

Left out a few lines
Merge pull request #2 from brynnb/testing-refactor

Testing refactor