do this in the right place.
further reorganisation
This doesn't work reliably as the office DNS doesn't always set domain correctly.