Adding variables to disable animation features
More progress on animation deconstruction
Merge pull request #1 from David20321/master

pulling upsteam