Actively discover and manage peers

please merge.