Did some quick-fixed to get the evaluator to work.
Still not done, but it's something.