Couple of TODOs & server stop listening on connected