Rework of animation system, now partially working