Working a bit, trying to make it better with disconnects