diff --git a/Twidder (Lab3)/.DS_Store b/Twidder (Lab3)/.DS_Store
index d183d492008786c97f626967e964132a3d915107..35a039af7dafc2257cfcbe0559f12dc1b86c6191 100644
Binary files a/Twidder (Lab3)/.DS_Store and b/Twidder (Lab3)/.DS_Store differ
diff --git a/Twidder (Lab3)/database.db b/Twidder (Lab3)/database.db
index e206d1c7ac9e883e5e2080bc8f604578ce5cee97..40ffc3132bd58bd4a9d4dc18e33c68c34ecfab1d 100644
Binary files a/Twidder (Lab3)/database.db and b/Twidder (Lab3)/database.db differ
diff --git a/Twidder (Lab3)/static/client.js b/Twidder (Lab3)/static/client.js
index cf894d693b8fe1e3df9d009cbacfd9653979250a..8bb4071faff5377383bdabbfa73baa442d64a685 100644
--- a/Twidder (Lab3)/static/client.js	
+++ b/Twidder (Lab3)/static/client.js	
@@ -89,8 +89,8 @@ function signUp(formData) {
 
     let req = new XMLHttpRequest();
     req.open("POST", "/users/sign_up", true);
-    req.setRequestHeader("Content-type", "application/json;charset=UTF-8")
-    req.setRequestHeader("Authorization", "12332432iuh32kj4gh3h2jkg")
+    req.setRequestHeader("Content-type", "application/json;charset=UTF-8");
+    req.setRequestHeader("Authorization", "12332432iuh32kj4gh3h2jkg");
     req.send(JSON.stringify(user));
 
     req.onreadystatechange =  function(){
@@ -126,7 +126,7 @@ function signIn(formData) {
 
     let req = new XMLHttpRequest();
     req.open("POST", "/users/sign_in", true);
-    req.setRequestHeader("Content-type", "application/json;charset=UTF-8")
+    req.setRequestHeader("Content-type", "application/json;charset=UTF-8");
     req.send(JSON.stringify(user));
 
     req.onreadystatechange =  function(){
@@ -165,8 +165,8 @@ function signOut() {
 
   let req = new XMLHttpRequest();
   req.open("POST", "/users/sign_out", true);
-  req.setRequestHeader("Content-type", "application/json;charset=UTF-8")
-  req.setRequestHeader("token", localStorage.getItem("token"))
+  req.setRequestHeader("Content-type", "application/json;charset=UTF-8");
+  req.setRequestHeader("token", localStorage.getItem("token"));
   req.send(null);
 
   req.onreadystatechange =  function(){
@@ -208,7 +208,18 @@ function message_management(tab){
   }
 
   if(message.length > 0) {
-    serverstub.postMessage(localStorage.getItem("token"), message, email);
+    let value = {
+      "message" : message,
+      "email_recipient" : email
+    }
+    let token = localStorage.getItem("token");
+
+    let req = new XMLHttpRequest();
+    req.open("POST", "/account/post_message", true);
+    req.setRequestHeader("Content-type", "application/json;charset=UTF-8");
+    req.setRequestHeader("token", token);
+    req.send(JSON.stringify(value));
+
     display_wall(email, tab);
   }
 
@@ -309,16 +320,31 @@ function get_user_info(email, tab) {
 }
 
 function display_wall(email, tab) {
-  let messages = serverstub.getUserMessagesByEmail(localStorage.getItem("token"), email);
+  let messages = [];
+
+  var xhttp = new XMLHttpRequest();
+  xhttp.onreadystatechange = function() {
+      if (this.readyState == 4 && this.status == 200) {
+         let resp = JSON.parse(xhttp.responseText);
+         for(c in resp) {
+           messages.push(resp[c].writer);
+         }
+      }
+  };
+  xhttp.open("GET", "/account/get/message/" + email, true);
+  xhttp.setRequestHeader("token", localStorage.getItem("token"));
+  xhttp.send();
+
+  console.log(messages);
 
-  for(let i = 0; i < messages.data.length; i++) {
+  for(let i = 0; i < messages.length; i++) {
     if(i==0) {
       document.getElementById(tab + "_wall").innerHTML = "";
       document.getElementById(tab + "_wall").style = "";
     }
     document.getElementById(tab + "_wall").innerHTML += "<div id=" + tab + i + ">";
-    document.getElementById(tab + i).innerHTML += "<div id='writer" + tab + i + "'>" + messages.data[i].writer + "</div>";
-    document.getElementById(tab + i).innerHTML += messages.data[i].content;
+    document.getElementById(tab + i).innerHTML += "<div id='writer" + tab + i + "'>" + messages[i][1] + "</div>";
+    document.getElementById(tab + i).innerHTML += messages[i][0];
     document.getElementById(tab + "_wall").innerHTML +=   "</div>";
     document.getElementById(tab + i).style.backgroundColor = "white";
     document.getElementById(tab + i).style.width = "460px";