started work on handling disconnects