Finished anim refactor