diff --git a/__pycache__/mocha_server.cpython-36.pyc b/__pycache__/mocha_server.cpython-36.pyc
new file mode 100644
index 0000000..1091d27
Binary files /dev/null and b/__pycache__/mocha_server.cpython-36.pyc differ
diff --git a/mocha.db b/mocha.db
index 6bb9d3f..6f7a339 100644
Binary files a/mocha.db and b/mocha.db differ
diff --git a/mocha_server.py b/mocha_server.py
index 37363f6..33af5cd 100755
--- a/mocha_server.py
+++ b/mocha_server.py
@@ -6,24 +6,43 @@ import json
 import sqlite3
 
 
-DATABASE = '/usr/local/www/mocha-server/mocha.db'
+# DATABASE = '/usr/local/www/mocha-server/mocha.db'
+DATABASE = 'mocha.db'
+
+conn = sqlite3.connect(DATABASE)
+conn.row_factory = sqlite3.Row
+cursor = conn.cursor()
+
+
 
 # TODO: Add fetching of list of users
 # TODO: Add fetching of top N users by score
 # TODO: Add ability to store and retrieve avatars (as image files?)
 
+# add new parameters as needed
+def update_row(user_id, updated_username):
+    print()
+
+def insert_row(user_id, username):
+    """
+	Inserts a row for a NEW user with given parameters
+	This may work better with AUTOINCREMENT to avoid arbitrary ids and duplicates
+	"""
+
+    item = (user_id, username)
+    cursor.execute('insert into users values (?,?)', item)
+    conn.commit()
+    conn.close()
+
 
 def fetch_user(user_id):
     """
     Returns a JSON object containing the requested user
     Also can return a list of all users if user_id == "*"
     """
-    conn = sqlite3.connect(DATABASE)
-    conn.row_factory = sqlite3.Row
-    cursor = conn.cursor()
 
-    if user_id != '*':
-        cursor.execute("SELECT * FROM users WHERE user_id=?", user_id)
+    if user_id != '*': # must use (?), (item,) format
+        cursor.execute("SELECT * FROM users WHERE user_id=(?)", (user_id,))
     else:
         cursor.execute("SELECT * FROM users")
 
diff --git a/test.py b/test.py
new file mode 100644
index 0000000..2950d04
--- /dev/null
+++ b/test.py
@@ -0,0 +1,5 @@
+import mocha_server
+
+#mocha_server.insert_row(4, 'andrew')
+
+print(mocha_server.fetch_user(3))