Fix animating, add isAnimating method