Added project7 version of Server