Add a few TODOs to handle invisible disconnections