diff --git a/lib/xmpp-client/basic-client.js b/lib/xmpp-client/basic-client.js
new file mode 100644
index 0000000..6fa4c45
--- /dev/null
+++ b/lib/xmpp-client/basic-client.js
@@ -0,0 +1,89 @@
+/*
+	A very simple xmpp client
+	
+*/
+
+var sys = require('sys'),
+	xmpp = require('node-xmpp'),
+	colors = require('colors'),
+	events = require('events');
+
+var BasicClient = function(params, callback) {
+	events.EventEmitter.call(this);
+	this._iq = 0;
+	var jabber = this;
+	this.jid = new xmpp.JID(params.jid);
+	this.host = (params.host == null) ? this.jid.domain : params.host;
+	this.xmpp = new xmpp.Client(params);
+	this.xmpp.addListener('rawStanza', function(stanza) {
+		//sys.debug("RAW: "[jabber.color] + stanza.toString().white);
+	});
+	this.xmpp.addListener('authFail', function() {
+		sys.error("[Error] Jabber : Authentication failure");
+		process.exit(1);
+	});
+	this.xmpp.addListener('error', function(e) {
+		sys.error(e);
+		process.exit(1);
+	});
+	this.xmpp.addListener('stanza', function(stanza) {
+		switch(stanza.name) {
+			case 'iq':
+				switch(stanza.attrs.type) {
+					case 'error':
+						
+					break;
+					case 'result':
+					
+					break;
+					default:
+						jabber.emit('iq', stanza);
+					break;
+				}
+			break;
+			case 'presence':
+				if(stanza.attrs.type == 'error') {
+					jabber.emit('presence:error', stanza);
+				} else {
+					jabber.emit('presence', stanza);
+				}
+			break;
+			case 'message':
+				jabber.emit('message', stanza);
+			break;
+		}
+	});
+	this._iqCallback = {};
+	this.xmpp.addListener('online', function() {
+		callback.apply(jabber);
+	});
+};
+
+sys.inherits(BasicClient, events.EventEmitter);
+exports.BasicClient = BasicClient;
+
+BasicClient.prototype.message = function(to, message) {
+	this.xmpp.send(new xmpp.Element('message', {
+		to: to,
+		type: 'chat'})
+		.c('body').t(message));
+};
+
+BasicClient.prototype.presence = function(type) {
+	this.xmpp.send(new xmpp.Element('presence', (type != null) ? {type: type} : {}).tree());
+};
+
+BasicClient.prototype.iq = function(to, query, callback, error) {
+	error |= function(stanza) { sys.error(stanza);};
+	var n = 'node' + this._iq++;
+	this._iqCallback[n] = [callback, error];
+	var attrs = {
+		type: 'get',
+		id: n
+	};
+	if(to != null) {
+		attrs.to = to;
+	};
+	this.xmpp.send(new xmpp.Element('iq', attrs).cnode(query).tree());
+	return n;
+};
diff --git a/test/test-basic.js b/test/test-basic.js
new file mode 100644
index 0000000..ccf4c09
--- /dev/null
+++ b/test/test-basic.js
@@ -0,0 +1,15 @@
+var sys = require('sys'),
+	colors = require('colors'),
+	xmpp = require('node-xmpp'),
+	BasicClient = require('../lib/xmpp-client').BasicClient,
+	JID = require('node-xmpp').JID,
+	conf = require('./conf').conf;
+
+exports.testInit = function(test) {
+	test.expect(1);
+	var b = new BasicClient(conf.b, function() {
+		sys.debug('just connected');
+		test.ok('true', 'connected');
+		test.done();
+	});
+};
\ No newline at end of file