Did some merges with the newer animation code.  This is still outdated animation code though.