Added Server and Client solutions