Animation system is less horrible