Animation system rewrite