- Extract evaluator (still needs work to clean up) - Add tests for evaluator - Fix all the things that break on the new tests - Misc cleanup
