more work on evaluation engine