New animations

New animations should work now..
Pre-merge commit

Again... This shit is blowing up!