move listener startup to handshake