diff --git a/lib/client.js b/lib/client.js
index e0b234ec..ab55626b 100644
--- a/lib/client.js
+++ b/lib/client.js
@@ -37,14 +37,14 @@ p.connect = function() {
     dataBuffer.copy(fullBuffer, 4, 0);
     self.send(null, fullBuffer);
   });
-  var parser = new Parser();
+
   this.stream.on('data', function(buffer) {
-    parser.setBuffer(buffer);
-    var msg = parser.parseMessage();
+    self.setBuffer(buffer);
+    var msg = self.parseMessage();
     while(msg) {
       self.emit('message', msg);
       self.emit(msg.name, msg);
-      msg = parser.parseMessage();
+      msg = self.parseMessage();
     }
   });
 
@@ -115,4 +115,181 @@ p.pulseQueryQueue = function() {
   }
 };
 
+//parsing methods
+p.setBuffer = function(buffer) {
+  if(this.lastBuffer) {    //we have unfinished biznaz
+    //need to combine last two buffers
+    var remaining = this.lastBuffer.length - this.lastOffset;
+    var combinedBuffer = new Buffer(buffer.length + remaining);
+    this.lastBuffer.copy(combinedBuffer, 0, this.lastOffset);
+    buffer.copy(combinedBuffer, remaining, 0);
+    buffer = combinedBuffer;
+  }
+  this.buffer = buffer;
+  this.offset = 0;
+};
+
+var messageNames = {
+  R: 'authenticationOk',
+  S: 'parameterStatus',
+  K: 'backendKeyData',
+  C: 'commandComplete',
+  Z: 'readyForQuery',
+  T: 'rowDescription',
+  D: 'dataRow',
+  E: 'error'
+};
+
+p.parseMessage =  function() {
+  var remaining = this.buffer.length - this.offset - 1;
+  if(remaining < 5) {
+    //cannot read id + length without at least 5 bytes
+    //just abort the read now
+    this.lastBuffer = this.buffer;
+    this.lastOffset = this.offset;
+    return;
+  }
+  var id = this.readChar();
+  var message = {
+    id: id,
+    name: messageNames[id],
+    length: this.parseInt32()
+  };
+
+  if(remaining < message.length) {
+    this.lastBuffer = this.buffer;
+    //rewind the last 5 bytes we read
+    this.lastOffset = this.offset-5;
+    return false;
+  }
+
+  return this["parse"+message.id](message);
+};
+
+p.parseR = function(msg) {
+  var code = 0;
+  if(msg.length == 8) {
+    code = this.parseInt32();
+    if(code == 3) {
+      msg.name = 'authenticationCleartextPassword';
+    }
+    return msg;
+  }
+  throw new Error("Unknown authenticatinOk message type" + sys.inspect(msg));
+};
+
+p.parseS = function(msg) {
+  msg.parameterName = this.parseCString();
+  msg.parameterValue = this.parseCString();
+  return msg;
+};
+
+p.parseK = function(msg) {
+  msg.processID = this.parseInt32();
+  msg.secretKey = this.parseInt32();
+  return msg;
+};
+
+p.parseC = function(msg) {
+  msg.text = this.parseCString();
+  return msg;
+};
+
+p.parseZ = function(msg) {
+  msg.status = this.readChar();
+  return msg;
+};
+
+p.parseT = function(msg) {
+  msg.fieldCount = this.parseInt16();
+  var fields = [];
+  for(var i = 0; i < msg.fieldCount; i++){
+    fields[i] = this.parseField();
+  }
+  msg.fields = fields;
+  return msg;
+};
+
+p.parseField = function() {
+  var field = {
+    name: this.parseCString(),
+    tableID: this.parseInt32(),
+    columnID: this.parseInt16(),
+    dataTypeID: this.parseInt32(),
+    dataTypeSize: this.parseInt16(),
+    dataTypeModifier: this.parseInt32(),
+    format: this.parseInt16() == 0 ? 'text' : 'binary'
+  };
+  return field;
+};
+
+p.parseD = function(msg) {
+  var fieldCount = this.parseInt16();
+  var fields = [];
+  for(var i = 0; i < fieldCount; i++) {
+    var length = this.parseInt32();
+    fields[i] = (length == -1 ? null : this.readString(length))
+  };
+  msg.fieldCount = fieldCount;
+  msg.fields = fields;
+  return msg;
+};
+
+p.parseE = function(msg) {
+  var fields = {};
+  var fieldType = this.readString(1);
+  while(fieldType != '\0') {
+    fields[fieldType] = this.parseCString();
+    fieldType = this.readString(1);
+  }
+  msg.severity = fields.S;
+  msg.code = fields.C;
+  msg.message = fields.M;
+  msg.detail = fields.D;
+  msg.hint = fields.H;
+  msg.position = fields.P;
+  msg.internalPosition = fields.p;
+  msg.internalQuery = fields.q;
+  msg.where = fields.W;
+  msg.file = fields.F;
+  msg.line = fields.L;
+  msg.routine = fields.R;
+  return msg;
+};
+
+p.readChar = function() {
+  return Buffer([this.buffer[this.offset++]]).toString('utf8');
+};
+
+p.parseInt32 = function() {
+  var value = this.peekInt32();
+  this.offset += 4;
+  return value;
+};
+
+p.peekInt32 = function(offset) {
+  offset = offset || this.offset;
+  var buffer = this.buffer;
+  return ((buffer[offset++] << 24) +
+          (buffer[offset++] << 16) +
+          (buffer[offset++] << 8) +
+          buffer[offset++]);
+};
+
+
+p.parseInt16 = function() {
+  return ((this.buffer[this.offset++] << 8) +
+          (this.buffer[this.offset++] << 0));
+};
+
+p.readString = function(length) {
+  return this.buffer.toString('utf8', this.offset, (this.offset += length));
+};
+
+p.parseCString = function() {
+  var start = this.offset;
+  while(this.buffer[this.offset++]) { };
+  return this.buffer.toString('utf8',start, this.offset - 1);
+};
+//end parsing methods
 module.exports = Client;
diff --git a/lib/parser.js b/lib/parser.js
deleted file mode 100644
index a9921845..00000000
--- a/lib/parser.js
+++ /dev/null
@@ -1,181 +0,0 @@
-var Parser = function() { };
-
-var p = Parser.prototype;
-
-p.setBuffer = function(buffer) {
-  if(this.lastBuffer) {    //we have unfinished biznaz
-    //need to combine last two buffers
-    var remaining = this.lastBuffer.length - this.lastOffset;
-    var combinedBuffer = new Buffer(buffer.length + remaining);
-    this.lastBuffer.copy(combinedBuffer, 0, this.lastOffset);
-    buffer.copy(combinedBuffer, remaining, 0);
-    buffer = combinedBuffer;
-  }
-  this.buffer = buffer;
-  this.offset = 0;
-};
-
-var messageNames = {
-  R: 'authenticationOk',
-  S: 'parameterStatus',
-  K: 'backendKeyData',
-  C: 'commandComplete',
-  Z: 'readyForQuery',
-  T: 'rowDescription',
-  D: 'dataRow',
-  E: 'error'
-};
-
-p.parseMessage =  function() {
-  var remaining = this.buffer.length - this.offset - 1;
-  if(remaining < 5) {
-    //cannot read id + length without at least 5 bytes
-    //just abort the read now
-    this.lastBuffer = this.buffer;
-    this.lastOffset = this.offset;
-    return;
-  }
-  var id = this.readChar();
-  var message = {
-    id: id,
-    name: messageNames[id],
-    length: this.parseInt32()
-  };
-
-  if(remaining < message.length) {
-    this.lastBuffer = this.buffer;
-    //rewind the last 5 bytes we read
-    this.lastOffset = this.offset-5;
-    return false;
-  }
-
-  return this["parse"+message.id](message);
-};
-
-p.parseR = function(msg) {
-  var code = 0;
-  if(msg.length == 8) {
-    code = this.parseInt32();
-    if(code == 3) {
-      msg.name = 'authenticationCleartextPassword';
-    }
-    return msg;
-  }
-  throw new Error("Unknown authenticatinOk message type" + sys.inspect(msg));
-};
-
-p.parseS = function(msg) {
-  msg.parameterName = this.parseCString();
-  msg.parameterValue = this.parseCString();
-  return msg;
-};
-
-p.parseK = function(msg) {
-  msg.processID = this.parseInt32();
-  msg.secretKey = this.parseInt32();
-  return msg;
-};
-
-p.parseC = function(msg) {
-  msg.text = this.parseCString();
-  return msg;
-};
-
-p.parseZ = function(msg) {
-  msg.status = this.readChar();
-  return msg;
-};
-
-p.parseT = function(msg) {
-  msg.fieldCount = this.parseInt16();
-  var fields = [];
-  for(var i = 0; i < msg.fieldCount; i++){
-    fields[i] = this.parseField();
-  }
-  msg.fields = fields;
-  return msg;
-};
-
-p.parseField = function() {
-  var field = {
-    name: this.parseCString(),
-    tableID: this.parseInt32(),
-    columnID: this.parseInt16(),
-    dataTypeID: this.parseInt32(),
-    dataTypeSize: this.parseInt16(),
-    dataTypeModifier: this.parseInt32(),
-    format: this.parseInt16() == 0 ? 'text' : 'binary'
-  };
-  return field;
-};
-
-p.parseD = function(msg) {
-  var fieldCount = this.parseInt16();
-  var fields = [];
-  for(var i = 0; i < fieldCount; i++) {
-    var length = this.parseInt32();
-    fields[i] = (length == -1 ? null : this.readString(length))
-  };
-  msg.fieldCount = fieldCount;
-  msg.fields = fields;
-  return msg;
-};
-
-p.parseE = function(msg) {
-  var fields = {};
-  var fieldType = this.readString(1);
-  while(fieldType != '\0') {
-    fields[fieldType] = this.parseCString();
-    fieldType = this.readString(1);
-  }
-  msg.severity = fields.S;
-  msg.code = fields.C;
-  msg.message = fields.M;
-  msg.detail = fields.D;
-  msg.hint = fields.H;
-  msg.position = fields.P;
-  msg.internalPosition = fields.p;
-  msg.internalQuery = fields.q;
-  msg.where = fields.W;
-  msg.file = fields.F;
-  msg.line = fields.L;
-  msg.routine = fields.R;
-  return msg;
-};
-
-p.readChar = function() {
-  return Buffer([this.buffer[this.offset++]]).toString('utf8');
-};
-
-p.parseInt32 = function() {
-  var value = this.peekInt32();
-  this.offset += 4;
-  return value;
-};
-
-p.peekInt32 = function(offset) {
-  offset = offset || this.offset;
-  var buffer = this.buffer;
-  return ((buffer[offset++] << 24) +
-          (buffer[offset++] << 16) +
-          (buffer[offset++] << 8) +
-          buffer[offset++]);
-};
-
-
-p.parseInt16 = function() {
-  return ((this.buffer[this.offset++] << 8) +
-          (this.buffer[this.offset++] << 0));
-};
-
-p.readString = function(length) {
-  return this.buffer.toString('utf8', this.offset, (this.offset += length));
-};
-
-p.parseCString = function() {
-  var start = this.offset;
-  while(this.buffer[this.offset++]) { };
-  return this.buffer.toString('utf8',start, this.offset - 1);
-};
-
-module.exports = Parser;