Refactor tandem invitations
merge refactor tandem invitation