This issue is to refactor the various 2 party functions to use the multiparty variants and convert to expected formats.