Object-oriented the animation... but still inefficient.