More animation logic (untested)