Animation overhaul (36/37)

Animation overhaul