Redone connection management, now supports proper p2p