More development

Closed Theodore Chang requested to merge 1180-refinement into develop

Closes #1180

Merge request reports