Some more refactoring

Committing before I make sweeping changes to how the animations work