the great refactor part one: moving all this to dzserver
part two of the great refactor: get rid of old references
the great refactor part three: cleaning up