diff --git a/README.md b/README.md
index da35a7f..9b8eda5 100644
--- a/README.md
+++ b/README.md
@@ -2,11 +2,23 @@
 The goal of this project is to bypass the limitations caused by ISPs blocking incoming connections.
 It is estimated to require two servlets - one on the webhost (`mispbridge`), and one on the localhost (`mispclient`).
 
+<br>
+
 ### Overview
 ![](overview.png)
 
+<br>
+
+### Run / Deploy
+
+<br>
+
+#### How to Run / Debug
+* In `mispmock` run `core.Main`.
 
-### How to Run
+<br>
+
+#### How to Deploy
 * Install Tomcat
     * `apt-get install tomcat9`
 * Start Tomcat:
@@ -19,3 +31,8 @@ It is estimated to require two servlets - one on the webhost (`mispbridge`), and
     * `<bar>/mispbridge/mispbridge/WEB-INF/classes/`
     * `<bar>/mispclient/mispclient/WEB-INF/classes/`
 * Compile the project & restart Tomcat.
+
+<br>
+
+### TODO
+* See [TODO.md](TODO.md).
\ No newline at end of file
diff --git a/TODO.md b/TODO.md
new file mode 100644
index 0000000..dfa9fe0
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,19 @@
+#### TODO
+
+* In `ClientMock` put `GET (Ride)(Request)(Data)` on it's own thread.
+    * Currently it is on the `POST (Ride)` thread.
+    * It would be better to "decouple" it.
+* Clean the `mispmock` code.
+* Copy & adapt the `mispmock` code to `mispclient` and `mispbridge`
+    * Test with Tomcat.
+ 
+<br>
+<br>
+    
+#### DO MAYBE
+
+* In `ClientMock` put  `GET (Request)` on it's own thread.
+    * Currently it is on the `POST (Ride)` thread.
+    * This might be tricky since 
+        * `GET (Request)` doesn't neccessarily know `(Ride)`
+        * and thus need a trick (?) to be syncronized with it
\ No newline at end of file