Andrew/fieldreport

next pr