Disconnect needs rework before going into UI stuff