Move to use multiparty

Closes #851