More work on the animation, although this one is a bit buggy