diff --git a/MCInfoBot.py b/MCInfoBot.py
index cd70fe4..a503207 100644
--- a/MCInfoBot.py
+++ b/MCInfoBot.py
@@ -1,5 +1,12 @@
 import discord
 from discord.ext import commands
+from sqlalchemy import create_engine
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy import Column, Integer, String
+from sqlalchemy.orm import sessionmaker
+
+engine = create_engine('sqlite:///:memory:', echo=True)
+SQL_Base = declarative_base()
 
 TOKEN = ''
 command_prefix = '?'
@@ -8,11 +15,12 @@ least he knows where your bases are.'''
 
 bot = commands.Bot(command_prefix=command_prefix , description=description)
 
-class Location:
-	name = ''
-	x = 0;
-	y = 0;
-	z = 0;
+class Location(SQL_Base):
+	__tablename__ = 'Locations'
+	name = Column(String, primary_key=True)
+	x = Column(Integer)
+	y = Column(Integer)
+	z = Column(Integer)
 	
 	def __init__(self,args) :
 		self.name = args[0]
@@ -22,6 +30,15 @@ class Location:
 
 	def  posToStr(self) :
 		return '(x=' + str(self.x) + ', y=' + str(self.y) + ', z=' + str(self.z) + ')' 
+		
+	def __repr__(self):
+		return "(name= {}, pos={})".format(self.name,posToStr)
+		
+SQL_Base.metadata.create_all(engine)
+
+Session = sessionmaker(bind=engine)
+session = Session()
+
 			
 #Bot Commands ******************************************************************		
 @bot.event
@@ -36,12 +53,14 @@ async def test():
 	await bot.say('I\'m here you ding dong')
 
 @bot.command(pass_context=True)
-async def addBase(ctx, * args):
+async def addbase(ctx, * args):
+	'''Add your base to the database.'''
 	if (len(args) == 4) :
 		try:
 			base = Location(args)
+			session.add(base)
 			await bot.say('{}, your base named {} located at {} has been added'
-				'to the database.'.format(ctx.message.author.mention, base.name, base.posToStr()))
+				' to the database.'.format(ctx.message.author.mention, base.name, base.posToStr()))
 		except ValueError:
 			await bot.say('Invalid syntax, try again (?addbase [name] [x coord] [z coord])')
 			
@@ -49,6 +68,15 @@ async def addBase(ctx, * args):
 		await bot.say('Allows you to add your base location to the database. '
 			'Syntax: ?addbase [Base Name] [X Coordinate] [Z Coordinate]')
 
+@bot.command(pass_context=True)			
+async def findbase(ctx, * args):
+	'''Allows you to find a base in the database.'''
+	base = session.query(Location).filter_by(name=args[0]).first()
+	if (base is not None) :
+		await bot.say('{}, {} is located at {}.'.format(ctx.message.author.mention, base.name, base.posToStr()))
+	else :
+		await bot.say('{}, {} is not in the database'.format(ctx.message.author.mention, args[0]))
+				
 #Bot Startup ******************************************************************	
 try :
 	file = open('token.dat','r')
@@ -58,6 +86,4 @@ except FileNotFoundError:
 except IOError:
 	print('Error reading token.dat')
 
-bot.run(TOKEN)
-
-	
\ No newline at end of file
+bot.run(TOKEN)
\ No newline at end of file