Develop

Will McCreeryrequested to merge
develop into master

adding new fields for missing data types

Merge request reports