added server stuff and contributions to design doc