Reorganize; Add Animation failures
Add generator failure logic