WIP: Sgclark guest/wrapper changes

Scarlett Gately Moorerequested to merge
sgclark-guest/wrapper_changes into master

Use dispace and wrapper to adhere to policy 9.9

Merge request reports