Finalized Animations

Got everything to work, so hopefully it still does after this commit.
Fixing merge conflicts

All done?