Moves and animations now interacting better together