Extend evaluator done

Branch work was committed to master (accidentally?) then worked on some more. So the merge will be nasty.