Almost finished with adding calls to the server