Phase 3 of DTGOV-127: domain mode
Merge pull request #462 from EricWittmann/DTGOV-127-3

Phase 3 of DTGOV-127: domain mode