Initial work on server done