First working commit of server