Removed animations for now.
Merge branch 'Cameron-Work'