updated the server and completed routing