Tried to get disconnect working properly. Still not working properly :P