Finished at least the first try at extracting the evaluation architecture from the parsing.