Commit before huge refactoring to make evaluator separate entity