rename
start evaluator
making progress
switch to a parsing based approach