Add animations, update controller