Andrew/fieldreport data

Merge conflicts with the project file are fixed too!
Looks like you used this more than once, move it to the constants file?