Completed the server side implementation needs testing