Not based on IPs anymore. Removed handshake listener. Now uses NMS