Added clients and a server