Basic server code added back