diff --git a/Lab_3/Twidder/static/client.html b/Lab_3/Twidder/static/client.html
index 8ebd769443e0a5c90d0f268f0c563c4c13051edb..4c4df13e7a35687f7e110a0e9eb9447795cb121c 100644
--- a/Lab_3/Twidder/static/client.html
+++ b/Lab_3/Twidder/static/client.html
@@ -6,7 +6,7 @@
         <link href="static/client.css" type="text/css" rel="stylesheet">
         <script src="static/client.js"></script>
         <script src="static/serverstub.js"></script>
-        <!-- <script src="server.py"></script> -->
+        <script src="server.py"></script>
 
         <script type="text/view" id="welcomeview">    
             <div id="repeat_pass"></div>
diff --git a/Lab_3/Twidder/static/client.js b/Lab_3/Twidder/static/client.js
index 89588f9b6383a49bd08fcc0cf75b7351f457e9cc..99540d2f8e824062f0fe2c5c9e7a675ad1921f5c 100644
--- a/Lab_3/Twidder/static/client.js
+++ b/Lab_3/Twidder/static/client.js
@@ -45,6 +45,8 @@ function setUserDetails(who) {
     if (token != null && token != "" ){
         let userTable = document.getElementById(who + "UserInfo");
         let email = localStorage.getItem(who + "Email");
+        
+        // Todo
         //let userDataArray = serverstub.getUserDataByEmail(token, email);
         let userDataArray = server.get_user_data_by_email(email);
 
@@ -82,6 +84,8 @@ function sign_up() {
     else if (user.password != user.repeat_password)
         errorMess.innerHTML = "Passwords does not match";
     else {
+
+        // Todo
         // Submission to "server"
         let signUpObj = serverstub.signUp(user);
         // Set message to user
@@ -101,6 +105,7 @@ function sign_in() {
         errorMess.innerHTML = "Password's length is too short";
     else {
 
+        //Todo
         // Sending sign_in request to "server"
         let signInObj = serverstub.signIn(email, password);
         
@@ -123,6 +128,8 @@ function sign_in() {
 
 function sign_out(){
     let token = localStorage.getItem("currentUser");
+
+    // Todo
     let logOutObj = serverstub.signOut(token);
 
     if (logOutObj["success"]) {
@@ -181,6 +188,8 @@ function change_password(ourEvent){
         error_text.innerHTML = "New password and confirm password does not match";
     }
     else {
+
+        // Todo
         // Success
         let message = serverstub.changePassword(token, old_pass, new_pass);
 
@@ -202,6 +211,7 @@ function updateWall(who){
     let token = localStorage.getItem("currentUser");
     let email = localStorage.getItem(who + "Email");
 
+    // Todo
     // Send user's message to the server
     serverstub.postMessage(token, messageToWall, email);
 
@@ -214,6 +224,8 @@ function reloadWall(who) {
     // "who" could be either home or browse, this way know which wall to load to 
     let token = localStorage.getItem("currentUser");
     let email = localStorage.getItem(who + "Email");
+
+    // Todo
     let currentWall = serverstub.getUserMessagesByEmail(token, email);
 
     // Fromating the text before putting to wall
@@ -230,6 +242,8 @@ function searchAnotherUser(event){
     let token = localStorage.getItem("currentUser");
     let email = event.target["searchInput"].value;
     let error = document.getElementById("searchMessage");
+
+    // Todo
     let user_obj = serverstub.getUserMessagesByEmail(token, email);
 
     error.innerHTML = user_obj["message"];