Merge wied03/dev_merge (#153)

* client built with sorted domain types (#152)

* reapply issue 1 changes

---------

Co-authored-by: Brent Halsey <[email protected]>

Author: wied03