Rewrote server, hopefully it's more stable without Connect