This milestone will focus on a refactoring of the evaluator that is aimed at large performance improvements as well as fixing disjunction bugs.