Major checkin after animation added.