Andrew/fieldreport data

Merge conflicts with the project file are fixed too!