updated todo
Made evaluator static method