Continuing the revival of the non web socket connection. mostly works again it seems