Refactoring, working animatic