evaluator refactored, contexts for future multithreading added