Refactor

Merged Chris Hines requested to merge refactor into dev

Merge request reports