Adding variables to disable animation features
More progress on animation deconstruction