First pass on attempt to eliminate reconnection bottleneck