Working on the soft parts of the report
Added evaluation