Starting modifications of server client to allow better output