Added Server and User classes, changed code appropriately.