Starting to add more support for bootstrapping of remote-peer info