Various changes in the existing code and untested implementation of server functions.