This is an update to the the Server file that puts down the basic outlines