diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e660fd9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+bin/
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..29e741d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,7 @@
+# xmpp-bot
+
+Very simple skeleton for a XMPP chatbot. It will start as an expense tracking bot.
+
+If the necessity arises this should be a generic interface for a bot
+that exposes functions such as `message_handler` that can parse and
+react to messages.
diff --git a/makefile b/makefile
new file mode 100644
index 0000000..66f239c
--- /dev/null
+++ b/makefile
@@ -0,0 +1,31 @@
+SRC = src/main.c 
+LOCPATH = ./bin
+INSTALLPATH = /usr/local
+CFLAGS = -O2
+LFLAGS =  -lstrophe
+DEBFLAGS = -g -Wall
+NAME = xmpp-bot
+
+all:
+	mkdir -p $(LOCPATH)
+	gcc $(SRC) -o $(LOCPATH)/$(NAME) $(CFLAGS) $(LFLAGS) $(LFLAGS_STATUS)
+nostatus:
+	mkdir -p $(LOCPATH)
+	gcc $(SRC) -o $(LOCPATH)/$(NAME) -O2 $(LFLAGS)
+debug:
+	mkdir -p $(LOCPATH)/debug
+	gcc $(SRC) -o $(LOCPATH)/debug/$(NAME)_debug $(CFLAGS) $(LFLAGS) $(DEBFLAGS) $(LFLAGS_STATUS)
+prof:
+	mkdir -p $(LOCPATH)/prof
+	gcc $(SRC) -o $(LOCPATH)/prof/$(NAME)_prof $(CFLAGS) $(LFLAGS) $(LFLAGS_STATUS) -pg
+asan:
+	gcc $(SRC) -o $(LOCPATH)/debug/$(NAME)_debug_asan $(CFLAGS) $(LFLAGS) $(DEBFLAGS) $(LFLAGS_STATUS) -fsanitize=address
+clean:
+	rm -f $(LOCPATH)/$(NAME)
+	rm -f $(LOCPATH)/debug/$(NAME)_debug
+distclean:
+	rm -r $(LOCPATH)
+install:
+	cp $(LOCPATH)/$(NAME) $(INSTALLPATH)/bin/$(NAME)
+uninstall:
+	rm $(INSTALLPATH)/bin/$(NAME)
diff --git a/src/main.c b/src/main.c
new file mode 100644
index 0000000..73403d4
--- /dev/null
+++ b/src/main.c
@@ -0,0 +1,179 @@
+/* bot.c
+** libstrophe XMPP client library -- basic usage example
+**
+** Copyright (C) 2005-2009 Collecta, Inc. 
+**
+**  This software is provided AS-IS with no warranty, either express
+**  or implied.
+**
+**  This software is distributed under license and may not be copied,
+**  modified or distributed except as expressly authorized under the
+**  terms of the license contained in the file LICENSE.txt in this
+**  distribution.
+*/
+
+/* simple bot example
+**  
+** This example was provided by Matthew Wild <mwild1@gmail.com>.
+**
+** This bot responds to basic messages and iq version requests.
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include <strophe.h>
+
+
+int version_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
+{
+	xmpp_stanza_t *reply, *query, *name, *version, *text;
+	const char *ns;
+	xmpp_ctx_t *ctx = (xmpp_ctx_t*)userdata;
+	printf("Received version request from %s\n", xmpp_stanza_get_attribute(stanza, "from"));
+	
+	reply = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_name(reply, "iq");
+	xmpp_stanza_set_type(reply, "result");
+	xmpp_stanza_set_id(reply, xmpp_stanza_get_id(stanza));
+	xmpp_stanza_set_attribute(reply, "to", xmpp_stanza_get_attribute(stanza, "from"));
+	
+	query = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_name(query, "query");
+    ns = xmpp_stanza_get_ns(xmpp_stanza_get_children(stanza));
+    if (ns) {
+        xmpp_stanza_set_ns(query, ns);
+    }
+
+	name = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_name(name, "name");
+	xmpp_stanza_add_child(query, name);
+	
+	text = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_text(text, "libstrophe example bot");
+	xmpp_stanza_add_child(name, text);
+	
+	version = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_name(version, "version");
+	xmpp_stanza_add_child(query, version);
+	
+	text = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_text(text, "1.0");
+	xmpp_stanza_add_child(version, text);
+	
+	xmpp_stanza_add_child(reply, query);
+
+	xmpp_send(conn, reply);
+	xmpp_stanza_release(reply);
+	return 1;
+}
+
+
+int message_handler(xmpp_conn_t * const conn, xmpp_stanza_t * const stanza, void * const userdata)
+{
+	xmpp_stanza_t *reply, *body, *text;
+	char *intext, *replytext;
+	xmpp_ctx_t *ctx = (xmpp_ctx_t*)userdata;
+	
+	if(!xmpp_stanza_get_child_by_name(stanza, "body")) return 1;
+	if(!strcmp(xmpp_stanza_get_attribute(stanza, "type"), "error")) return 1;
+	
+	intext = xmpp_stanza_get_text(xmpp_stanza_get_child_by_name(stanza, "body"));
+	
+	printf("Incoming message from %s: %s\n", xmpp_stanza_get_attribute(stanza, "from"), intext);
+	
+	reply = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_name(reply, "message");
+	xmpp_stanza_set_type(reply, xmpp_stanza_get_type(stanza)?xmpp_stanza_get_type(stanza):"chat");
+	xmpp_stanza_set_attribute(reply, "to", xmpp_stanza_get_attribute(stanza, "from"));
+	
+	body = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_name(body, "body");
+	
+	replytext = malloc(strlen(" to you too!") + strlen(intext) + 1);
+	strcpy(replytext, intext);
+	strcat(replytext, " to you too!");
+	
+	text = xmpp_stanza_new(ctx);
+	xmpp_stanza_set_text(text, replytext);
+	xmpp_stanza_add_child(body, text);
+	xmpp_stanza_add_child(reply, body);
+	
+	xmpp_send(conn, reply);
+	xmpp_stanza_release(reply);
+	free(replytext);
+	return 1;
+}
+
+/* define a handler for connection events */
+void conn_handler(xmpp_conn_t * const conn, const xmpp_conn_event_t status, 
+                  const int error, xmpp_stream_error_t * const stream_error,
+                  void * const userdata)
+{
+    xmpp_ctx_t *ctx = (xmpp_ctx_t *)userdata;
+
+    if (status == XMPP_CONN_CONNECT) {
+        xmpp_stanza_t* pres;
+        fprintf(stderr, "DEBUG: connected\n");
+        xmpp_handler_add(conn,version_handler, "jabber:iq:version", "iq", NULL, ctx);
+        xmpp_handler_add(conn,message_handler, NULL, "message", NULL, ctx);
+	
+        /* Send initial <presence/> so that we appear online to contacts */
+        pres = xmpp_stanza_new(ctx);
+        xmpp_stanza_set_name(pres, "presence");
+        xmpp_send(conn, pres);
+        xmpp_stanza_release(pres);
+    }
+    else {
+        fprintf(stderr, "DEBUG: disconnected\n");
+        xmpp_stop(ctx);
+    }
+}
+
+int main(int argc, char **argv)
+{
+    xmpp_ctx_t *ctx;
+    xmpp_conn_t *conn;
+    xmpp_log_t *log;
+    char *jid, *pass;
+
+    /* take a jid and password on the command line */
+    if (argc != 3) {
+        fprintf(stderr, "Usage: bot <jid> <pass>\n\n");
+        return 1;
+    }
+    
+    jid = argv[1];
+    pass = argv[2];
+
+    /* init library */
+    xmpp_initialize();
+
+    /* create a context */
+    log = xmpp_get_default_logger(XMPP_LEVEL_DEBUG); /* pass NULL instead to silence output */
+    ctx = xmpp_ctx_new(NULL, log);
+
+    /* create a connection */
+    conn = xmpp_conn_new(ctx);
+
+    /* setup authentication information */
+    xmpp_conn_set_jid(conn, jid);
+    xmpp_conn_set_pass(conn, pass);
+
+    /* initiate connection */
+    xmpp_connect_client(conn, NULL, 0, conn_handler, ctx);
+
+    /* enter the event loop - 
+       our connect handler will trigger an exit */
+    xmpp_run(ctx);
+
+    /* release our connection and context */
+    xmpp_conn_release(conn);
+    xmpp_ctx_free(ctx);
+
+    /* final shutdown of the library */
+    xmpp_shutdown();
+
+    return 0;
+}