Few minor modifications to server stuff. It still needs the threading to be linked in fully, but aside from that looks pretty good