diff --git a/db.sqlite3 b/db.sqlite3
index 59f2cb0..dea8f11 100755
Binary files a/db.sqlite3 and b/db.sqlite3 differ
diff --git a/mocha_server.py b/mocha_server.py
index f324350..7b3b3a3 100755
--- a/mocha_server.py
+++ b/mocha_server.py
@@ -201,6 +201,8 @@ def process_request(uri):
         -  /mocha/top/n               Returns JSON list of top n users by score
         -  /mocha/register/{username} Returns JSON of token for new user
         -  /mocha/update/{user_id}/{score}
+        -  /mocha/avatar/{user_id}             Get user's avatar
+        -  /mocha/avatar/{user_id}/{avatar}    Set user's avatar
     '''
     parts = uri.split('/')[1:]
     assert parts[0] == 'mocha'
@@ -218,6 +220,11 @@ def process_request(uri):
         output = make_new_account(parts[2])
     elif parts[1] == 'update' and len(parts) > 3:
         output = update(parts[2], parts[3])
+    elif parts[1] == 'avatar' and len(parts) > 2:
+        if len(parts) > 3:
+            output = set_avatar(parts[2], parts[3])
+        else:
+            output = get_avatar(parts[2])
     else:
         output = None
 
@@ -246,8 +253,6 @@ def application(environ, start_response):
 
 
 if __name__ == '__main__':
-    print(get_avatar('1'))
-    set_avatar('1', 'newavatar')
-    print(get_avatar('1'))
+    print(process_request('/mocha/avatar/1'))
 
 # vim: tabstop=4 shiftwidth=4 softtabstop=4 expandtab