[Reviewer: Ellie] Multiple domain support

Ellie,

Please can you review my changes for multiple domain support?

Thanks,

Matt