diff --git a/multi_bench.js b/multi_bench.js
index 4f9b926cce..5be2e564fd 100644
--- a/multi_bench.js
+++ b/multi_bench.js
@@ -1,135 +1,224 @@
 var redis = require("./index"),
-    num_clients = parseInt(process.argv[2], 10) || 50,
-    active_clients = 0,
-    clients = new Array(num_clients),
+    metrics = require("metrics"),
+    num_clients = parseInt(process.argv[2], 10) || 5,
     num_requests = 20000,
-    issued_requests = 0,
-    latency = new Array(num_requests),
     tests = [],
-    test_start, parser_logged = false,
+    versions_logged = false,
     client_options = {
         return_buffers: false
-    };
+    },
+    small_str, large_str, small_buf, large_buf;
 
 redis.debug_mode = false;
 
-tests.push({
-    descr: "PING",
-    command: ["ping"]
-});
+function lpad(input, len, chr) {
+    var str = input.toString();
+    chr = chr || " ";
 
-tests.push({
-    descr: "SET",
-    command: ["set", "foo_rand000000000000", "bar"]
-});
-
-tests.push({
-    descr: "GET",
-    command: ["get", "foo_rand000000000000"]
-});
-
-tests.push({
-    descr: "INCR",
-    command: ["incr", "counter_rand000000000000"]
-});
-
-tests.push({
-    descr: "LPUSH",
-    command: ["lpush", "mylist", new Array(8).join("-")]
-});
-
-tests.push({
-    descr: "LRANGE (10 elements)",
-    command: ["lrange", "mylist", "0", "9"]
-});
-
-tests.push({
-    descr: "LRANGE (100 elements)",
-    command: ["lrange", "mylist", "0", "99"]
-});
-
-function create_clients(callback) {
-    if (active_clients === num_clients) {
-        // common case is all clients are already created
-        console.log("create_clients: all clients already created " + num_clients);
-        callback();
-    } else {
-        var client, connected = active_clients;
-
-        while (active_clients < num_clients) {
-            client = clients[active_clients++] = redis.createClient(6379, "127.0.0.1", client_options);
-            client.on("connect", function () {
-                if (! parser_logged) {
-                    console.log("Using reply parser " + client.reply_parser.name);
-                    parser_logged = true;
-                }
-
-                // Fire callback when all clients are connected
-                connected += 1;
-                if (connected === num_clients) {
-                    callback();
-                }
-            });
-            // TODO - need to check for client disconnect
-            client.on("error", function (msg) {
-                console.log("Connect problem:" + msg.stack);
-            });
-        }
+    while (str.length < len) {
+        str = chr + str;
     }
+    return str;
 }
 
-function issue_request(client, test, cmd, args) {
-    var i = issued_requests++;
-    latency[i] = Date.now();
+metrics.Histogram.prototype.print_line = function () {
+    var obj = this.printObj();
+    
+    return lpad(obj.min, 4) + "/" + lpad(obj.max, 4) + "/" + lpad(obj.mean.toFixed(2), 7) + "/" + lpad(obj.p95.toFixed(2), 7);
+};
 
-    client[cmd](args, function() {
-        latency[i] = Date.now() - latency[i];
-        if (issued_requests < num_requests) {
-            issue_request(client, test, cmd, args);
+function Test(args) {
+    var self = this;
+
+    this.args = args;
+    
+    this.callback = null;
+    this.clients = [];
+    this.clients_ready = 0;
+    this.commands_sent = 0;
+    this.commands_completed = 0;
+    this.max_pipeline = this.args.pipeline || num_requests;
+    this.client_options = args.client_options || client_options;
+    
+    this.connect_latency = new metrics.Histogram();
+    this.ready_latency = new metrics.Histogram();
+    this.command_latency = new metrics.Histogram();
+}
+
+Test.prototype.run = function (callback) {
+    var self = this, i;
+
+    this.callback = callback;
+
+    for (i = 0; i < num_clients ; i++) {
+        this.new_client(i);
+    }
+};
+
+Test.prototype.new_client = function (id) {
+    var self = this, new_client;
+    
+    new_client = redis.createClient(6379, "127.0.0.1", this.client_options);
+    new_client.create_time = Date.now();
+
+    new_client.on("connect", function () {
+        self.connect_latency.update(Date.now() - new_client.create_time);
+    });
+
+    new_client.on("ready", function () {
+        if (! versions_logged) {
+            console.log("Client count: " + num_clients + ", node version: " + process.versions.node + ", server version: " +
+                new_client.server_info.redis_version + ", parser: " + new_client.reply_parser.name);
+            versions_logged = true;
+        }
+        self.ready_latency.update(Date.now() - new_client.create_time);
+        self.clients_ready++;
+        if (self.clients_ready === self.clients.length) {
+            self.on_clients_ready();
+        }
+    });
+
+    self.clients[id] = new_client;
+};
+
+Test.prototype.on_clients_ready = function () {
+    process.stdout.write(lpad(this.args.descr, 13) + ", " + lpad(this.args.pipeline, 5) + "/" + this.clients_ready + " ");
+    this.test_start = Date.now();
+
+    this.fill_pipeline();
+};
+
+Test.prototype.fill_pipeline = function () {
+    var pipeline = this.commands_sent - this.commands_completed;
+
+    while (this.commands_sent < num_requests && pipeline < this.max_pipeline) {
+        this.commands_sent++;
+        pipeline++;
+        this.send_next();
+    }
+    
+    if (this.commands_completed === num_requests) {
+        this.print_stats();
+        this.stop_clients();
+    }
+};
+
+Test.prototype.stop_clients = function () {
+    var self = this;
+    
+    this.clients.forEach(function (client, pos) {
+        if (pos === self.clients.length - 1) {
+            client.quit(function (err, res) {
+                self.callback();
+            });
         } else {
-            client.end();
-            if (--active_clients == 0)
-                test_complete(test);
+            client.quit();
         }
     });
-}
+};
 
-function test_run(test) {
-    create_clients(function() {
-        var i = num_clients, 
-            cmd = test.command[0],
-            args = test.command.slice(1);
+Test.prototype.send_next = function () {
+    var self = this,
+        cur_client = this.commands_sent % this.clients.length,
+        command_num = this.commands_sent,
+        start = Date.now();
 
-        test_start = Date.now();
-        issued_requests = 0;
-        while(i-- && issued_requests < num_requests) {
-            issue_request(clients[i], test, cmd, args);
+    this.clients[cur_client][this.args.command](this.args.args, function (err, res) {
+        if (err) {
+            throw err;
         }
+        self.commands_completed++;
+        self.command_latency.update(Date.now() - start);
+        self.fill_pipeline();
     });
-}
+};
 
-function test_complete(test) {
-    var min, max, sum, avg;
-    var total_time = Date.now() - test_start;
-    var op_rate = (issued_requests / (total_time / 1000.0)).toFixed(2);
-    var i;
+Test.prototype.print_stats = function () {
+    var duration = Date.now() - this.test_start;
+    
+    console.log("min/max/avg/p95: " + this.command_latency.print_line() + " " + lpad(duration, 6) + "ms total, " +
+        lpad((num_requests / (duration / 1000)).toFixed(2), 8) + " ops/sec");
+};
 
-    latency.sort();
-    min = latency[0];
-    max = latency[issued_requests-1];
-    for (sum = 0, i = 0; i < issued_requests; i++)
-        sum += latency[i];
-    avg = (sum / issued_requests).toFixed(3);
+small_str = "1234";
+small_buf = new Buffer(small_str);
+large_str = (new Array(4097).join("-"));
+large_buf = new Buffer(large_str);
 
-    console.log(test.descr + ": " + issued_requests + " ops " + op_rate + " ops/sec " + min + "/" + max + "/" + avg);
+tests.push(new Test({descr: "PING", command: "ping", args: [], pipeline: 1}));
+tests.push(new Test({descr: "PING", command: "ping", args: [], pipeline: 50}));
+tests.push(new Test({descr: "PING", command: "ping", args: [], pipeline: 200}));
+tests.push(new Test({descr: "PING", command: "ping", args: [], pipeline: 20000}));
 
-    next();
-}
+tests.push(new Test({descr: "SET small str", command: "set", args: ["foo_rand000000000000", small_str], pipeline: 1}));
+tests.push(new Test({descr: "SET small str", command: "set", args: ["foo_rand000000000000", small_str], pipeline: 50}));
+tests.push(new Test({descr: "SET small str", command: "set", args: ["foo_rand000000000000", small_str], pipeline: 200}));
+tests.push(new Test({descr: "SET small str", command: "set", args: ["foo_rand000000000000", small_str], pipeline: 20000}));
+
+tests.push(new Test({descr: "SET small buf", command: "set", args: ["foo_rand000000000000", small_buf], pipeline: 1}));
+tests.push(new Test({descr: "SET small buf", command: "set", args: ["foo_rand000000000000", small_buf], pipeline: 50}));
+tests.push(new Test({descr: "SET small buf", command: "set", args: ["foo_rand000000000000", small_buf], pipeline: 200}));
+tests.push(new Test({descr: "SET small buf", command: "set", args: ["foo_rand000000000000", small_buf], pipeline: 20000}));
+
+tests.push(new Test({descr: "GET small str", command: "get", args: ["foo_rand000000000000"], pipeline: 1}));
+tests.push(new Test({descr: "GET small str", command: "get", args: ["foo_rand000000000000"], pipeline: 50}));
+tests.push(new Test({descr: "GET small str", command: "get", args: ["foo_rand000000000000"], pipeline: 200}));
+tests.push(new Test({descr: "GET small str", command: "get", args: ["foo_rand000000000000"], pipeline: 20000}));
+
+tests.push(new Test({descr: "GET small buf", command: "get", args: ["foo_rand000000000000"], pipeline: 1, client_opts: { return_buffers: true} }));
+tests.push(new Test({descr: "GET small buf", command: "get", args: ["foo_rand000000000000"], pipeline: 50, client_opts: { return_buffers: true} }));
+tests.push(new Test({descr: "GET small buf", command: "get", args: ["foo_rand000000000000"], pipeline: 200, client_opts: { return_buffers: true} }));
+tests.push(new Test({descr: "GET small buf", command: "get", args: ["foo_rand000000000000"], pipeline: 20000, client_opts: { return_buffers: true} }));
+
+tests.push(new Test({descr: "SET large str", command: "set", args: ["foo_rand000000000001", large_str], pipeline: 1}));
+tests.push(new Test({descr: "SET large str", command: "set", args: ["foo_rand000000000001", large_str], pipeline: 50}));
+tests.push(new Test({descr: "SET large str", command: "set", args: ["foo_rand000000000001", large_str], pipeline: 200}));
+tests.push(new Test({descr: "SET large str", command: "set", args: ["foo_rand000000000001", large_str], pipeline: 20000}));
+
+tests.push(new Test({descr: "SET large buf", command: "set", args: ["foo_rand000000000001", large_buf], pipeline: 1}));
+tests.push(new Test({descr: "SET large buf", command: "set", args: ["foo_rand000000000001", large_buf], pipeline: 50}));
+tests.push(new Test({descr: "SET large buf", command: "set", args: ["foo_rand000000000001", large_buf], pipeline: 200}));
+tests.push(new Test({descr: "SET large buf", command: "set", args: ["foo_rand000000000001", large_buf], pipeline: 20000}));
+
+tests.push(new Test({descr: "GET large str", command: "get", args: ["foo_rand000000000001"], pipeline: 1}));
+tests.push(new Test({descr: "GET large str", command: "get", args: ["foo_rand000000000001"], pipeline: 50}));
+tests.push(new Test({descr: "GET large str", command: "get", args: ["foo_rand000000000001"], pipeline: 200}));
+tests.push(new Test({descr: "GET large str", command: "get", args: ["foo_rand000000000001"], pipeline: 20000}));
+
+tests.push(new Test({descr: "GET large buf", command: "get", args: ["foo_rand000000000001"], pipeline: 1, client_opts: { return_buffers: true} }));
+tests.push(new Test({descr: "GET large buf", command: "get", args: ["foo_rand000000000001"], pipeline: 50, client_opts: { return_buffers: true} }));
+tests.push(new Test({descr: "GET large buf", command: "get", args: ["foo_rand000000000001"], pipeline: 200, client_opts: { return_buffers: true} }));
+tests.push(new Test({descr: "GET large buf", command: "get", args: ["foo_rand000000000001"], pipeline: 20000, client_opts: { return_buffers: true} }));
+
+tests.push(new Test({descr: "INCR", command: "incr", args: ["counter_rand000000000000"], pipeline: 1}));
+tests.push(new Test({descr: "INCR", command: "incr", args: ["counter_rand000000000000"], pipeline: 50}));
+tests.push(new Test({descr: "INCR", command: "incr", args: ["counter_rand000000000000"], pipeline: 200}));
+tests.push(new Test({descr: "INCR", command: "incr", args: ["counter_rand000000000000"], pipeline: 20000}));
+
+tests.push(new Test({descr: "LPUSH", command: "lpush", args: ["mylist", small_str], pipeline: 1}));
+tests.push(new Test({descr: "LPUSH", command: "lpush", args: ["mylist", small_str], pipeline: 50}));
+tests.push(new Test({descr: "LPUSH", command: "lpush", args: ["mylist", small_str], pipeline: 200}));
+tests.push(new Test({descr: "LPUSH", command: "lpush", args: ["mylist", small_str], pipeline: 20000}));
+
+tests.push(new Test({descr: "LRANGE 10", command: "lrange", args: ["mylist", "0", "9"], pipeline: 1}));
+tests.push(new Test({descr: "LRANGE 10", command: "lrange", args: ["mylist", "0", "9"], pipeline: 50}));
+tests.push(new Test({descr: "LRANGE 10", command: "lrange", args: ["mylist", "0", "9"], pipeline: 200}));
+tests.push(new Test({descr: "LRANGE 10", command: "lrange", args: ["mylist", "0", "9"], pipeline: 20000}));
+
+tests.push(new Test({descr: "LRANGE 100", command: "lrange", args: ["mylist", "0", "99"], pipeline: 1}));
+tests.push(new Test({descr: "LRANGE 100", command: "lrange", args: ["mylist", "0", "99"], pipeline: 50}));
+tests.push(new Test({descr: "LRANGE 100", command: "lrange", args: ["mylist", "0", "99"], pipeline: 200}));
+tests.push(new Test({descr: "LRANGE 100", command: "lrange", args: ["mylist", "0", "99"], pipeline: 20000}));
 
 function next() {
     var test = tests.shift();
     if (test) {
-        test_run(test);
+        test.run(function () {
+            next();
+        });
+    } else {
+        console.log("End of tests.");
+        process.exit(0);
     }
 }