Sorted out domains in prep for making things good(TM)