Adding echoserver and todserver