Merge "Move variables into animation class."