Peer choice

Initial PR
Need to update tests before merge.