Animation update

Big progress. Everything (almost?) done.