Try handle race conditions
Handle disconnections

Still have a race condition...