Andrew/fieldreport data

Merge conflicts with the project file are fixed too!
don't you do the assignment right above the commented block?