SOS-1936 Master

Animations are in... booyah