Add some more server stuff and websockets