Major re-factor to use XChange exchange clients.