Inter-domain working, but lots of clean-up left.