diff --git a/bot.py b/bot.py
new file mode 100644
index 0000000..7c9c058
--- /dev/null
+++ b/bot.py
@@ -0,0 +1,171 @@
+import threading
+import inspect
+import re
+import urllib
+import time
+import os
+import utils
+
+from constants import *
+from googleclient import GoogleClient
+
+from Yowsup.Contacts.contacts import WAContactsSyncRequest
+
+class Bot():
+	def __init__(self, session, name = "Bot"):
+		self.session = session
+		self.name = name
+
+		self.google = GoogleClient()
+
+		self.commands = {
+			"import": self._import,
+			"help": self._help,
+			"prune": self._prune,
+			"welcome": self._welcome,
+			"fortune": self._fortune,
+			"sync": self._sync
+		}
+
+	def parse(self, message):
+		args = message.split(" ")
+		cmd = args.pop(0)
+
+		if cmd[0] == '\\':
+			try:
+				self.call(cmd[1:], args)
+			except KeyError:
+				self.send("invalid command")
+			except TypeError:
+				self.send("invalid syntax")
+		else:
+			self.send("a valid command starts with a backslash")
+
+	def call(self, cmd, args = []):
+		func = self.commands[cmd]
+		spec = inspect.getargspec(func)
+		maxs = len(spec.args) - 1
+		reqs = maxs - len(spec.defaults or [])
+		if reqs > len(args) > maxs:
+			raise TypeError()
+
+		thread = threading.Thread(target=func, args=tuple(args))
+		thread.start()
+
+	def send(self, message):
+		self.session.backend.handleMessage(self.session.user, self.name, message)
+
+	def __do_import(self, token):
+		# Google
+		google = self.google.getContacts(token)
+		self.send("%d buddies imported from google" % len(google))
+
+		result = { }
+		for number, name in google.iteritems():
+			number = re.sub("[^0-9]", "", number)
+			number = number if number[0] == "0"  else "+" + number
+
+			result[number] = { 'nick': name, 'state': 0 }
+
+		# WhatsApp
+		user = self.session.legacyName
+		password = self.session.password
+		sync = WAContactsSyncRequest(user, password, result.keys())
+		whatsapp = sync.send()['c']
+
+		for w in whatsapp:
+			result[w['p']]['state'] = w['w']
+			result[w['p']]['number'] = w['n']
+
+		self.send("%d buddies are using whatsapp" % len(filter(lambda w: w['w'], whatsapp)))
+
+		for r in result.values():
+			if r['nick']:
+				self.session.buddies.add(
+					number = r['number'],
+					nick = r['nick'],
+					groups = [u'Google'],
+					state = r['state']
+				)
+
+		self.send("%d buddies imported" % len(whatsapp))
+
+	def __get_token(self, filename, timeout = 30):
+		file = open(filename, 'r')
+		file.seek(-1, 2) # look at the end
+
+		count = 0
+		while count < timeout:
+			line = file.readline()
+
+			if line in ["", "\n"]:
+				time.sleep(1)
+				count += 1
+				continue
+			else:
+				timestamp, number, token = line[:-1].split("\t")
+				if (number == self.session.legacyName):
+					file.close()
+					return token
+
+		file.close()
+
+	# commands
+	def _import(self, token = None):
+		if not token:
+			token_url = self.google.getTokenUrl("http://whatsapp.0l.de/auth.py")
+			auth_url = "http://whatsapp.0l.de/auth.py?number=%s&auth_url=%s" % (self.session.legacyName, urllib.quote(token_url))
+			short_url = utils.shorten(auth_url)
+			self.send("please visit this url to auth: %s" % short_url)
+
+			self.send("waiting for authorization...")
+			token = self.__get_token(TOKEN_FILE)
+			if token:
+				self.send("got token: %s" % token)
+				self.__do_import(token)
+				self.session.updateRoster()
+			else:
+				self.send("timeout! please use \"\\import [token]\"")
+		else:
+			self.__do_import(token)
+			self.session.updateRoster()
+
+	def _sync(self):
+		user = self.session.legacyName
+		password = self.session.password
+
+		count = self.session.buddies.sync(user, password)
+		self.session.updateRoster()
+
+		if count:
+			self.send("sync complete, %d buddies are using WhatsApp" % count)
+		else:
+			self.send("sync failed, sorry something went wrong")
+
+	def _help(self):
+		self.send("""following bot commands are available:
+\\help				show this message
+\\prune			clear your buddylist
+\\import [token]		import buddies from Google
+\\sync			sync your imported contacts with WhatsApp
+\\fortune [database]		give me a quote
+
+following user commands are available:
+\\lastseen			request last online timestamp from buddy""")
+
+	def _fortune(self, database = '', prefix=''):
+		if os.path.exists("/usr/share/games/fortunes/%s" % database):
+			fortune = os.popen('/usr/games/fortune %s' % database).read()
+			self.send(prefix + fortune[:-1])
+		else:
+			self.send("invalid database")
+
+	def _welcome(self):
+		motd = open(MOTD_FILE, "r").read()
+		self.send(motd[:-1])
+		self.call("fortune", ("disclaimer", "Disclaimer: "))
+
+	def _prune(self):
+		self.session.buddies.prune()
+		self.session.updateRoster()
+		self.send("buddy list cleared")