diff --git a/android/code/index.mjs b/android/code/index.mjs
index bb5c961..c47b8d9 100644
--- a/android/code/index.mjs
+++ b/android/code/index.mjs
@@ -1,10 +1,9 @@
-import { WebSocketServer } from "ws";
 import child_process from "child_process";
 import fs from "fs";
-import { send_notification } from "./notifications.mjs";
+import { Server } from "socket.io";
 
 async function spawnPromise(program, args) {
-	return new Promise((resolve, reject) => {
+	return new Promise((resolve, _reject) => {
 		let output = "";
 		const process = child_process.spawn(program, args);
 		process.stdout.on("data", (data) => {
@@ -19,58 +18,111 @@ async function spawnPromise(program, args) {
 	});
 }
 
-const wss = new WebSocketServer({ port: 3000 });
+let io = new Server();
 
-//maybe check output of child processes and send errors in some way
-wss.on("connection", (ws) => {
-	ws.on("message", async (dataBuf) => {
-		let data = dataBuf.toString();
-		if (data === "screenshot") {
-			await spawnPromise("bash", ["/conf/screenshot.sh"]);
-			ws.send(fs.readFileSync("/screenshot.png"));
-		} else if (data.includes("touch")) {
-			const dataSplit = data.split(" ");
-			await spawnPromise("bash", [
-				"/conf/touch.sh",
-				dataSplit[1],
-				dataSplit[2],
-			]);
-		} else if (data === "back") {
-			await spawnPromise("bash", ["/conf/back.sh"]);
-		} else if (data === "home") {
-			await spawnPromise("bash", ["/conf/home.sh"]);
-		} else if (data === "install") {
-			const res = await spawnPromise("bash", ["/conf/install.sh"]);
-			send_notification(
-				res.code === 0,
-				"Installing the application",
-				res.output
-			);
-		} else if (data.includes("drag")) {
-			const dataSplit = data.split(" ");
+async function send_private_data() {
+	let adid = fs.readFileSync("/adid").toString();
+	let gps_coords = await spawnPromise("bash", ["/conf/get_location.sh"])
+	gps_coords = gps_coords.output;
+	gps_coords = gps_coords.trim().split(',');
+	io.emit("private_info", {adid, latitude: gps_coords[0], longitude: gps_coords[1]})
+}
 
-			await spawnPromise("bash", [
-				"/conf/drag.sh",
-				dataSplit[1],
-				dataSplit[2],
-				dataSplit[3],
-				dataSplit[4],
-			]);
-		} else if (data.startsWith("setcoord")) {
-			const dataSplit = data.split(" ");
-			const res = await spawnPromise("bash", [
-				"/conf/set_geo.sh",
-				dataSplit[1],
-				dataSplit[2],
-			]);
-			send_notification(
-				res.code === 0,
-				"Setting the moch location",
-				res.output
-			);
-		}
+function send_notification(socket, is_ok, context, message) {
+	socket.emit("notification", {
+		is_ok,
+		context,
+		message,
 	});
-	ws.on("close", (_) => {
-		ws.close();
+}
+
+let screenshot_in_flight = false;
+//maybe check output of child processes and send errors in some way
+io.on("connection", (socket) => {
+	socket.onAny((ev, ...args) => {
+		console.log("server got: ", ev, ...args);
+	});
+	socket.on("screenshot", async () => {
+		if (screenshot_in_flight)
+			return;
+		screenshot_in_flight = true;
+		let screen = await fetch("http://localhost:9987/v2/uiDevice/screenshot");
+		let body = await screen.bytes();
+		socket.emit("screenshot_data", body);
+		screenshot_in_flight = false;
+	});
+
+	socket.on("private_info_req", async () => {
+		await send_private_data();
+	})
+
+	socket.on("reset_adid", async () => {
+		await spawnPromise("bash", ["/conf/reset_adid.sh"]);
+		await send_private_data();
+	})
+
+	socket.on("back", async () => {
+		await spawnPromise("bash", ["/conf/back.sh"]);
+	});
+
+	socket.on("home", async () => {
+		await spawnPromise("bash", ["/conf/home.sh"]);
+	});
+
+	socket.on("install", async () => {
+		const res = await spawnPromise("bash", ["/conf/install.sh"]);
+		send_notification(
+			socket,
+			res.code === 0,
+			"Installing the application",
+			res.output
+		);
+	});
+
+	// drag handles both drag and click
+	socket.on("motionevent", async (data) => {
+		await spawnPromise("bash", [
+			"/conf/motionevent.sh",
+			data.motionType,
+			data.x + "",
+			data.y + ""
+		]);
+	});
+
+	// drag handles both drag and click
+	socket.on("drag", async (data) => {
+		await spawnPromise("bash", [
+			"/conf/drag.sh",
+			data.startX + "",
+			data.startY + "",
+			data.endX + "",
+			data.endY + "",
+			data.dragTime + "",
+		]);
+	});
+
+	socket.on("key", async (data) => {
+		await spawnPromise("bash", [
+			"/conf/press_key.sh",
+			data.key
+		]);
+	});
+
+	socket.on("setcoord", async (data) => {
+		const res = await spawnPromise("bash", [
+			"/conf/set_geo.sh",
+			data.lon + "",
+			data.lat + "",
+		]);
+		send_notification(
+			socket,
+			res.code === 0,
+			"Setting the moch location",
+			res.output
+		);
+		await send_private_data();
 	});
 });
+
+io.listen(3000);
+console.log("listening on port 3000");
diff --git a/android/code/notifications.mjs b/android/code/notifications.mjs
deleted file mode 100644
index f1daa06..0000000
--- a/android/code/notifications.mjs
+++ /dev/null
@@ -1,42 +0,0 @@
-import { WebSocket } from "ws";
-import { WebSocketServer } from "ws";
-
-const notification_proxy = new WebSocketServer({ port: 3001 });
-let notification_subs = [];
-
-notification_proxy.on("connection", (ws) => {
-	notification_subs.push(ws);
-});
-
-export function send_notification(is_ok, context, message) {
-	let updated_subs = [];
-
-	if (notification_subs.length === 0) {
-		console.log("WARNING: Got a notification, but nobody is subscribed");
-	}
-	for (const sub of notification_subs) {
-		if (sub.readyState == WebSocket.CONNECTING) {
-			console.log(
-				"WARNING: Unable to forward a notification to client that is still connecting"
-			);
-			updated_subs.push(sub);
-		} else {
-			try {
-				sub.send(
-					JSON.stringify({
-						is_ok,
-						context,
-						message,
-					})
-				);
-				updated_subs.push(sub);
-			} catch {
-				sub.close();
-				console.log(
-					"WARNING: Fail to send a notification, closing the connection"
-				);
-			}
-		}
-	}
-	notification_subs = updated_subs;
-}
diff --git a/android/code/package-lock.json b/android/code/package-lock.json
index b827a9c..3f7f07a 100644
--- a/android/code/package-lock.json
+++ b/android/code/package-lock.json
@@ -5,9 +5,267 @@
   "packages": {
     "": {
       "dependencies": {
+        "socket.io": "^4.8.1",
         "ws": "^8.18.0"
       }
     },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/cors": {
+      "version": "2.8.18",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.18.tgz",
+      "integrity": "sha512-nX3d0sxJW41CqQvfOzVG1NCTXfFDrDWIghCZncpHeWlVFd81zxB/DLhg7avFg6eHLCRX7ckBmoIIcqa++upvJA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "22.15.21",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz",
+      "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==",
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.21.0"
+      }
+    },
+    "node_modules/accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+      "license": "MIT",
+      "engines": {
+        "node": "^4.5.0 || >= 5.9"
+      }
+    },
+    "node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz",
+      "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.7.2",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1"
+      },
+      "engines": {
+        "node": ">=10.2.0"
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/engine.io/node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/socket.io": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz",
+      "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==",
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "cors": "~2.8.5",
+        "debug": "~4.3.2",
+        "engine.io": "~6.6.0",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.2.0"
+      }
+    },
+    "node_modules/socket.io-adapter": {
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
+      "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "~4.3.4",
+        "ws": "~8.17.1"
+      }
+    },
+    "node_modules/socket.io-adapter/node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/undici-types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "license": "MIT"
+    },
+    "node_modules/vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
     "node_modules/ws": {
       "version": "8.18.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
@@ -30,6 +288,170 @@
     }
   },
   "dependencies": {
+    "@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA=="
+    },
+    "@types/cors": {
+      "version": "2.8.18",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.18.tgz",
+      "integrity": "sha512-nX3d0sxJW41CqQvfOzVG1NCTXfFDrDWIghCZncpHeWlVFd81zxB/DLhg7avFg6eHLCRX7ckBmoIIcqa++upvJA==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
+    "@types/node": {
+      "version": "22.15.21",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz",
+      "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==",
+      "requires": {
+        "undici-types": "~6.21.0"
+      }
+    },
+    "accepts": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+      "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+      "requires": {
+        "mime-types": "~2.1.34",
+        "negotiator": "0.6.3"
+      }
+    },
+    "base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog=="
+    },
+    "cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w=="
+    },
+    "cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "requires": {
+        "object-assign": "^4",
+        "vary": "^1"
+      }
+    },
+    "debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "requires": {
+        "ms": "^2.1.3"
+      }
+    },
+    "engine.io": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz",
+      "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==",
+      "requires": {
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.7.2",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "8.17.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+          "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+          "requires": {}
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q=="
+    },
+    "mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="
+    },
+    "mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "requires": {
+        "mime-db": "1.52.0"
+      }
+    },
+    "ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg=="
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="
+    },
+    "socket.io": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz",
+      "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==",
+      "requires": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "cors": "~2.8.5",
+        "debug": "~4.3.2",
+        "engine.io": "~6.6.0",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
+      }
+    },
+    "socket.io-adapter": {
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
+      "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
+      "requires": {
+        "debug": "~4.3.4",
+        "ws": "~8.17.1"
+      },
+      "dependencies": {
+        "ws": {
+          "version": "8.17.1",
+          "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+          "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+          "requires": {}
+        }
+      }
+    },
+    "socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "requires": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      }
+    },
+    "undici-types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ=="
+    },
+    "vary": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz",
+      "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="
+    },
     "ws": {
       "version": "8.18.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.0.tgz",
diff --git a/android/code/package.json b/android/code/package.json
index 37c3082..a448b41 100644
--- a/android/code/package.json
+++ b/android/code/package.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "socket.io": "^4.8.1",
     "ws": "^8.18.0"
   }
 }
diff --git a/android/conf/drag.sh b/android/conf/drag.sh
index f4c4a76..520d190 100644
--- a/android/conf/drag.sh
+++ b/android/conf/drag.sh
@@ -1 +1 @@
-/opt/android-sdk-linux/platform-tools/adb shell input swipe $1 $2 $3 $4 1000
\ No newline at end of file
+/opt/android-sdk-linux/platform-tools/adb shell input swipe $1 $2 $3 $4 $5
diff --git a/android/conf/get_location.sh b/android/conf/get_location.sh
new file mode 100644
index 0000000..f751fb5
--- /dev/null
+++ b/android/conf/get_location.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+adb shell dumpsys location | grep 'last location=' | head -n 1 | awk -F' ' '{ print $3 }'
diff --git a/android/conf/motionevent.sh b/android/conf/motionevent.sh
new file mode 100644
index 0000000..77887f1
--- /dev/null
+++ b/android/conf/motionevent.sh
@@ -0,0 +1 @@
+/opt/android-sdk-linux/platform-tools/adb shell input motionevent $1 $2 $3
diff --git a/android/conf/press_key.sh b/android/conf/press_key.sh
new file mode 100644
index 0000000..c250b53
--- /dev/null
+++ b/android/conf/press_key.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+# https://stackoverflow.com/questions/7789826/adb-shell-input-events
+if [ "$1" = "Enter" ]; then
+	/opt/android-sdk-linux/platform-tools/adb shell input keyevent 66
+elif [ "$1" = "Backspace" ]; then
+	/opt/android-sdk-linux/platform-tools/adb shell input keyevent 67
+else
+	/opt/android-sdk-linux/platform-tools/adb shell input text "'$1'"
+fi
diff --git a/android/conf/reset_adid.sh b/android/conf/reset_adid.sh
new file mode 100644
index 0000000..9e01789
--- /dev/null
+++ b/android/conf/reset_adid.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+set -xe
+
+# Change the file slightly
+echo | adb shell su root "tee /data/data/com.google.android.gms/shared_prefs/adid_settings.xml"
+
+# Ask android for the ADID. Android detects the changed file (somewhere), and regenerates it
+adb shell su root am start -W -n com.example.adidreader/com.example.adidreader.MainActivity
+
+sleep 0.1
+
+# Get the new ADID
+adb shell su root cat /data/data/com.google.android.gms/shared_prefs/adid_settings.xml | xmllint --xpath 'string(//map/string[@name="adid_key"])' - > /adid
diff --git a/android/conf/screenshot.sh b/android/conf/screenshot.sh
deleted file mode 100755
index 9f4f3c1..0000000
--- a/android/conf/screenshot.sh
+++ /dev/null
@@ -1 +0,0 @@
-curl http://localhost:9987/v2/uiDevice/screenshot -o /screenshot.png
\ No newline at end of file
diff --git a/android/conf/set_geo.sh b/android/conf/set_geo.sh
index 5de2ea8..ab65c9d 100644
--- a/android/conf/set_geo.sh
+++ b/android/conf/set_geo.sh
@@ -3,9 +3,17 @@ ko=$((
 	echo "auth $(cat ~/.emulator_console_auth_token)"
 	echo "geo fix $1 $2 0.0"
 	sleep 0.2
-	) | telnet localhost 5554 | grep KO: );
+	) | telnet localhost 5554 2> /dev/null | grep KO: );
 
 if [ -z "${ko}" ]; then
+	# Check if the location was actually set, for some reason the location moching doesn't work,
+	# unless google maps is launched first, and is given access to the phone location
+	adb shell dumpsys location | grep 'last location=Location\[gps' > /dev/null
+	if [ $? -ne 0 ]; then
+		echo Failed to actually set the location, probably need to launch google maps first
+		exit 1
+	fi
+	echo Succesfully set the coordinates to: $(. /conf/get_location.sh)
 	exit 0
 else
 	echo "$ko"
diff --git a/android/conf/start_culebra.sh b/android/conf/start_culebra.sh
index d638ea7..8473c21 100644
--- a/android/conf/start_culebra.sh
+++ b/android/conf/start_culebra.sh
@@ -1,3 +1,4 @@
+set -xe
 rm -f /opt/android-sdk-linux/.android/avd/virtual_dev.avd/*.lock
 adb start-server
 cat > /simple.gpx << EOF
@@ -9,8 +10,11 @@ cat > /simple.gpx << EOF
 </gpx>
 EOF
 
-emulator -grpc 5556 -avd virtual_dev -snapshot configured -no-window -no-audio  -debug all,-adb,-gles1emu,-gles,-mtport,-metrics,-memory,-car,-tvremote &
+emulator -avd virtual_dev -writable-system -no-window -no-audio &
 adb wait-for-device
+adb emu avd snapshot load configured
+# emulator -grpc 5556 -avd virtual_dev -snapshot configured -no-window -no-audio -no-metrics -debug-no > /dev/null &
+# adb wait-for-device
 
 export PATH=$PATH:/root/culebraDependencies
 cd /root/culebra
diff --git a/http_server/Dockerfile b/http_server/Dockerfile
index 1fa58d2..777c583 100644
--- a/http_server/Dockerfile
+++ b/http_server/Dockerfile
@@ -6,6 +6,6 @@ WORKDIR /code
 
 RUN mkdir /images
 
-ENV screenshotDelayMs 500
+ENV screenshotDelayMs 100
 
-CMD sh /code/docker-entrypoint.sh
\ No newline at end of file
+CMD sh /code/docker-entrypoint.sh
diff --git a/http_server/code/docker-entrypoint.sh b/http_server/code/docker-entrypoint.sh
index 55f3f67..8c58d63 100644
--- a/http_server/code/docker-entrypoint.sh
+++ b/http_server/code/docker-entrypoint.sh
@@ -2,7 +2,5 @@
 
 npm i
 npm run build
-node waitSocket.mjs
 node --watch index.mjs
-
 #tail -f /dev/null
diff --git a/http_server/code/index.html b/http_server/code/index.html
index ef48e0f..e46cfdb 100644
--- a/http_server/code/index.html
+++ b/http_server/code/index.html
@@ -1,17 +1,17 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head style="height: 100vh">
     <meta charset="UTF-8" />
     <title>Rentgen android</title>
-	<script src="/htmx.js"></script>
+    <script src="/htmx.js"></script>
     <style>
       main {
         display: flex;
       }
 
       .log-section {
-		height: auto;
-		width: 400px;
+        height: auto;
+        width: 400px;
         overflow: auto;
         display: flex;
         flex-direction: column;
@@ -42,171 +42,254 @@
         background-color: aqua;
       }
 
-	  #clicks-log {
-		  font-family: Menlo, Consolas, Monaco, Liberation Mono, Lucida Console,
-		  monospace;
-	  }
+      #clicks-log {
+        font-family:
+          Menlo,
+          Consolas,
+          Monaco,
+          Liberation Mono,
+          Lucida Console,
+          monospace;
+      }
 
-	  .tab {
-		  border: 1px solid #ccc;
-		  background-color: #f1f1f1;
-	  }
+      .tab {
+        border: 1px solid #ccc;
+        background-color: #f1f1f1;
+      }
 
-	  /* Style the buttons that are used to open the tab content */
-	  .tab button {
-		  background-color: inherit;
-		  float: left;
-		  border: none;
-		  outline: none;
-		  cursor: pointer;
-		  padding: 14px 16px;
-		  transition: 0.3s;
-	  }
+      /* Style the buttons that are used to open the tab content */
+      .tab button {
+        background-color: inherit;
+        float: left;
+        border: none;
+        outline: none;
+        cursor: pointer;
+        padding: 14px 16px;
+        transition: 0.3s;
+      }
 
-	  /* Change background color of buttons on hover */
-	  .tab button:hover {
-		  background-color: #ddd;
-	  }
+      /* Change background color of buttons on hover */
+      .tab button:hover {
+        background-color: #ddd;
+      }
 
-	  /* Create an active/current tablink class */
-	  .tab button.active {
-		  background-color: #ccc;
-	  }
-	  .tabcontent.active {
-		  display: flex;
-		  flex-grow: 1;
-	  }
+      /* Create an active/current tablink class */
+      .tab button.active {
+        background-color: #ccc;
+      }
+      .tabcontent.active {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+      }
 
-	  /* Style the tab content */
-	  .tabcontent {
-		  display: none;
-		  padding: 6px 12px;
-		  border: 1px solid #ccc;
-		  border-top: none;
-	  }
-	  html,
-	  body, main{
-		  width: 100%;
-		  height: 100%;
-		  overflow: hidden;
-		  margin: 0;
-	  }
-	  main {
-			display:flex;
-			flex-direction: row;
-			align-items: stretch;
-	  }
-	  #logs-tab {
-		  overflow: auto;
-		  text-wrap: wrap;
-	  }
-	  .screen-section {
-		  display: flex;
-		  flex-direction: column;
-	  }
-	  .screen-section #screen, .screen-section.screen_buttons {
-		  flex-grow: 0;
-	  }
-	  .tab-section {
-			display: flex; flex-direction: column; flex-grow: 1;
-	  }
-	  <!-- TODO: A notification system -->
+      /* Style the tab content */
+      .tabcontent {
+        display: none;
+        padding: 6px 12px;
+        border: 1px solid #ccc;
+        border-top: none;
+      }
+      html,
+      body,
+      main {
+        width: 100%;
+        height: 100%;
+        overflow: hidden;
+        margin: 0;
+      }
+      main {
+        display: flex;
+        flex-direction: row;
+        align-items: stretch;
+      }
+      #logs-tab {
+        overflow: auto;
+        text-wrap: wrap;
+      }
+      .screen-section {
+        display: flex;
+        flex-direction: column;
+      }
+      .screen-section #screen,
+      .screen-section.screen_buttons {
+        flex-grow: 0;
+      }
+      #screen {
+        user-select: none;
+      }
+      .tab-section {
+        display: flex;
+        flex-direction: column;
+        flex-grow: 1;
+      }
 	  #resp {
-		  display: none;
-	  }
-	  #upload_form {
-		  display:flex;
-		  flex-direction: column;
-	  }
-	  #upload_form button, #upload_form label {
-		  border: 2px solid #ccc;
-		  background-color: #f1f1f1;
-		  cursor: pointer;
-		  padding: 3px 10px;
-		  transition: 0.3s;
-	  }
-	  #upload_form button:hover, #upload_form label:hover {
-		  background-color: #ddd;
-	  }
-	  #notifications {
-		  width: 40%;
-		  margin-left: 60%;
-		  position: absolute;
-	  }
+        display: none;
+      }
+      #upload_form {
+        display: flex;
+        flex-direction: column;
+      }
+      #upload_form button,
+      #upload_form label {
+        border: 2px solid #ccc;
+        background-color: #f1f1f1;
+        cursor: pointer;
+        padding: 3px 10px;
+        transition: 0.3s;
+      }
+      #upload_form button:hover,
+      #upload_form label:hover {
+        background-color: #ddd;
+      }
+      #notifications {
+        width: 40%;
+        margin-left: 60%;
+        position: absolute;
+      }
     </style>
   </head>
   <body>
     <div id="notifications"></div>
-	<div id="resp" style="display: none;"></div>
+    <div id="resp" style="display: none"></div>
     <main>
-      <section class="screen-section" >
+      <section class="screen-section">
         <img
           id="screen"
           alt="android screen"
           src=""
           draggable="false"
           class="screen"
-		  style="flex-grow: 0"
+          style="flex-grow: 0"
+          tabindex="0"
         />
         <div class="screen-buttons" style="flex-grow: 0">
           <button class="screen-buttons-home">home</button>
           <button class="screen-buttons-back">back</button>
         </div>
-		<form id="upload_form" hx-post="/upload_apk" enctype="multipart/form-data" hx-target="#resp">
-			<label id="upload_input" for="app">Select file
-				<input type="file" id="app" name="app" accept=".apk" required multiple/>
-			</label>
-			<button type="submit">Install the app</button>
-		</form>
-	  </section>
+        <form
+          id="upload_form"
+          hx-post="/upload_apk"
+          enctype="multipart/form-data"
+          hx-target="#resp"
+        >
+          <label id="upload_input" for="app"
+            >Select file
+            <input
+              type="file"
+              id="app"
+              name="app"
+              accept=".apk"
+              required
+              multiple
+            />
+          </label>
+          <button type="submit">Install the app</button>
+        </form>
+      </section>
 
-	  <div class="tab-section" >
-		<form id="set_coords" hx-post="/setcoord" hx-target="#resp">
-			<input type="text" name="lon"/>
-			<input type="text" name="lat"/>
-			<button type="submit">Submit coords</button>
-		</form>
-		  <div class="tab">
-			  <button class="tablinks active" onclick="open_tab(event, 'httptoolkit-tab')">HttpToolkit UI</button>
-			  <button class="tablinks" onclick="open_tab(event, 'logs-tab')">Logs</button>
-		  </div>
+      <div class="tab-section">
+        <div class="tab">
+          <button
+            class="tablinks active"
+            onclick="open_tab(event, 'httptoolkit-tab')"
+          >
+            HttpToolkit UI
+          </button>
+          <button class="tablinks" onclick="open_tab(event, 'logs-tab')">
+            Logs
+          </button>
+          <button class="tablinks" onclick="open_tab(event, 'controls-tab')">
+            Device Controls
+          </button>
+        </div>
 
-		  <div class="tabcontent" id="logs-tab">
-			  <p id="clicks-log" class="log-section" ></p>
-			  <p id="traffic-log" class="log-section"></p>
-		  </div>
-
-		  <div class="tabcontent active" id="httptoolkit-tab">
-			   <iframe id="httptoolkit-frame" style="flex-grow: 1;" src="http://localhost:9080/" title="httptoolkit"></iframe>
-		  </div>
-	  </div>
+        <div class="tabcontent" id="logs-tab">
+          <p id="clicks-log" class="log-section"></p>
+          <p id="traffic-log" class="log-section"></p>
+        </div>
 
+        <div class="tabcontent active" id="httptoolkit-tab">
+          <iframe
+            id="httptoolkit-frame"
+            style="flex-grow: 1"
+            src="http://localhost:9080/"
+            title="httptoolkit"
+          ></iframe>
+        </div>
+        <div class="tabcontent" id="controls-tab">
+          <form id="set_coords" onsubmit="coords_handler(event)">
+            <label>
+              Latitude:
+              <input type="text" name="lat" />
+            </label>
+            <label>
+              Longitude:
+              <input type="text" name="lon" />
+            </label>
+            <button type="submit">Submit coords</button>
+          </form>
+		  <button id="reset_adid_btn" onclick="reset_adid_handler(event)">Reset ADID</button>
+		  <table>
+			  <thead></thead>
+			  <tbody>
+				  <tr>
+					  <td>ADID:</td>
+					  <td id="adid_priv_info_table">UNKNOWN</td>
+				  </tr>
+				  <tr>
+					  <td>Longitude:</td>
+					  <td id="lon_priv_info_table">UNKNOWN</td>
+				  </tr>
+				  <tr>
+					  <td>Latitude:</td>
+					  <td id="lat_priv_info_table">UNKNOWN</td>
+				  </tr>
+			  </tbody>
+		  </table>
+        </div>
+      </div>
     </main>
-	<script>
-		function open_tab(evt, tab_name) {
-			let i, tabcontent, tablinks;
-
-			// Get all elements with class="tabcontent" and hide them
-			tabcontent = document.getElementsByClassName("tabcontent");
-			for (i = 0; i < tabcontent.length; i++) {
-				if (tabcontent[i].id != tab_name) {
-					tabcontent[i].classList.remove("active");
-				} else {
-					tabcontent[i].classList.add("active");
-				}
-			}
-
-			// Get all elements with class="tablinks" and remove the class "active"
-			tablinks = document.getElementsByClassName("tablinks");
-			for (i = 0; i < tablinks.length; i++) {
-				tablinks[i].classList.remove("active")
-			}
-
-			// Show the current tab, and add an "active" class to the button that opened the tab
-			evt.currentTarget.classList.add("active");
-		}
-	</script>
+    <script src="/socket.io.js"></script>
     <script>
+      var socket = io();
+
+	  function reset_adid_handler(e) {
+        socket.emit("reset_adid");
+	  }
+
+      function coords_handler(e) {
+        e.preventDefault();
+        const form_data = new FormData(e.target);
+        console.log(form_data);
+        socket.emit("setcoord", {
+          lon: Number.parseFloat(form_data.get("lon")),
+          lat: Number.parseFloat(form_data.get("lat")),
+        });
+      }
+
+      function open_tab(evt, tab_name) {
+        let i, tabcontent, tablinks;
+
+        // Get all elements with class="tabcontent" and hide them
+        tabcontent = document.getElementsByClassName("tabcontent");
+        for (i = 0; i < tabcontent.length; i++) {
+          if (tabcontent[i].id != tab_name) {
+            tabcontent[i].classList.remove("active");
+          } else {
+            tabcontent[i].classList.add("active");
+          }
+        }
+
+        // Get all elements with class="tablinks" and remove the class "active"
+        tablinks = document.getElementsByClassName("tablinks");
+        for (i = 0; i < tablinks.length; i++) {
+          tablinks[i].classList.remove("active");
+        }
+
+        // Show the current tab, and add an "active" class to the button that opened the tab
+        evt.currentTarget.classList.add("active");
+      }
       var screen = document.getElementById("screen");
       var clicksLog = document.getElementById("clicks-log");
       const homeButton = document.querySelector(".screen-buttons-home");
@@ -238,14 +321,7 @@
         const span = document.createElement("span");
 
         waitToLog(logText);
-
-        fetch(path, {
-          method: "POST",
-          headers: {
-            "Content-Type": "application/x-www-form-urlencoded",
-          },
-          ...(body ? { body } : {}),
-        });
+        socket.emit(path, body ? body : {});
       };
 
       homeButton.addEventListener("click", () =>
@@ -256,57 +332,118 @@
         registerClick({ path: "back", logText: "await backButton();" })
       );
 
-      async function displayImage() {
+      socket.on("screenshot_data", (data) => {
         try {
-          const response = await fetch("screen");
-          const blob = await response.blob();
+          const blob = new Blob([data]);
           screen.src = URL.createObjectURL(blob);
         } catch (error) {
           console.error("Error fetching image: ", error);
         }
+      });
+
+      socket.on("private_info", (data) => {
+        console.log("private_info");
+		adid_priv_info_table.textContent = data.adid;
+		lat_priv_info_table.textContent = data.latitude;
+		lon_priv_info_table.textContent = data.longitude;
+      });
+
+	  socket.emit("private_info_req");
+
+      socket.onAny((ev, ...args) => {
+        console.log("ev: ", ev, args);
+      });
+
+      async function displayImage() {
+        socket.emit("screenshot");
       }
 
       let isDragging = false;
-      let startDraggingPosX = 0;
-      let endDraggingPosX = 0;
-      let startDraggingPosY = 0;
-      let endDraggingPosY = 0;
-
       const screenSize = [320, 640];
 
-      const handleDraggStart = (e) => {
-        e.preventDefault();
+      function calcMousePos(event) {
+        let rect = screen.getBoundingClientRect();
+        let x = ((event.clientX - rect.left) / rect.width) * screenSize[0];
+        let y = ((event.clientY - rect.top) / rect.height) * screenSize[1];
+        x = Math.min(Math.max(x, 0), screenSize[0]);
+        y = Math.min(Math.max(y, 0), screenSize[1]);
+        return { x, y };
+      }
+
+      screen.addEventListener(
+        "mousemove",
+        (event) => {
+          if (!isDragging) return;
+          let pos = calcMousePos(window.event);
+
+          if (isDragging) {
+            registerClick({
+              path: "motionevent",
+              logText: `await motionevent({motionType: "MOVE", x:${pos.x},y:${pos.y}}});`,
+              body: {
+                motionType: "MOVE",
+                x: pos.x,
+                y: pos.y,
+              },
+            });
+          }
+        },
+        false
+      );
+
+      const handleDraggStart = (event) => {
         isDragging = true;
-        startDraggingPosX = e.offsetX;
-        startDraggingPosY = e.offsetY;
+        let pos = calcMousePos(event);
+        registerClick({
+          path: "motionevent",
+          logText: `await motionevent({motionType: "DOWN", x:${pos.x},y:${pos.y}}});`,
+          body: {
+            motionType: "DOWN",
+            x: pos.x,
+            y: pos.y,
+          },
+        });
       };
 
       screen.addEventListener("mousedown", handleDraggStart);
 
       document.addEventListener("mouseup", (e) => {
-        endDraggingPosX = e.offsetX;
-        endDraggingPosY = e.offsetY;
-        if (
-          isDragging &&
-          (Math.abs(endDraggingPosY - startDraggingPosY) > 10 ||
-            Math.abs(endDraggingPosX - startDraggingPosX) > 10)
-        ) {
-          registerClick({
-            path: "drag",
-            logText: `await drag({x:${startDraggingPosX},y:${startDraggingPosY}},{x:${e.offsetX},y:${e.offsetY}});`,
-            body: `startX=${startDraggingPosX}&startY=${startDraggingPosY}&endX=${e.offsetX}&endY=${e.offsetY}`,
-          });
-        } else if (e.target === screen) {
-          const phoneX = event.offsetX;
-          const phoneY = event.offsetY;
-          if (phoneX <= screenSize[0] && phoneY <= screenSize[1])
-            registerClick({
-              path: "touch",
-              logText: `await click(${phoneX}, ${phoneY});`,
-              body: `x=${phoneX}&y=${phoneY}`,
-            });
-        }
+        if (!isDragging) return;
         isDragging = false;
+        let pos = calcMousePos(e);
+        registerClick({
+          path: "motionevent",
+          logText: `await motionevent({motionType: "MOVE", x:${pos.x},y:${pos.y}}});`,
+          body: {
+            motionType: "MOVE",
+            x: pos.x,
+            y: pos.y,
+          },
+        });
+        registerClick({
+          path: "motionevent",
+          logText: `await motionevent({motionType: "UP", x:${pos.x},y:${pos.y}}});`,
+          body: {
+            motionType: "UP",
+            x: pos.x,
+            y: pos.y,
+          },
+        });
+      });
+
+      window.addEventListener("keydown", (event) => {
+        let key = event.key;
+        if (key === "Space") key = " ";
+        else if (key !== "Enter" && key !== "Backspace" && key.length !== 1)
+          return;
+        console.log(event.key, key);
+        if (document.getElementById("screen").matches(":hover")) {
+          registerClick({
+            path: "key",
+            logText: `await key(${event.key});`,
+            body: { key },
+          });
+        }
       });
 
       async function sleep(time) {
@@ -323,7 +460,6 @@
             await sleep(50);
         }
       }
-
       screenshot_loop();
     </script>
     <script src="/trafficLog.js"></script>
diff --git a/http_server/code/index.mjs b/http_server/code/index.mjs
index 386054e..00ed30c 100644
--- a/http_server/code/index.mjs
+++ b/http_server/code/index.mjs
@@ -1,27 +1,34 @@
 import express from "express";
 import { readFile } from "node:fs/promises";
-import {
-	guardedScreenshot,
-	android_websocket,
-	waitFullBoot,
-} from "./screenshot.mjs";
-
 import { execSync } from "node:child_process";
+import { Server } from "socket.io";
+
+import { io } from "socket.io-client";
 
 import fileUpload from "express-fileupload";
 
-const device_size_x = 320;
-const device_size_y = 640;
-
 const app = express();
+
+async function sleep(time) {
+	return new Promise((resolve) => setTimeout(resolve, time));
+}
+
+console.log("Waiting for full boot...");
+// bidirectional forwarding
+// Wait untill the connection
+const back = io("ws://android:3000", {
+	reconnectionAttempts: 1000000,
+	reconnectionDelay: 100,
+});
+while (!back.connected) {
+	await sleep(100);
+}
+console.log("Boot detected! activating endpoints");
+
 app.use(express.urlencoded({ extended: false }));
 
 app.use(express.static("/code/dist"));
 
-console.log("Waiting for full boot...");
-await waitFullBoot();
-console.log("Boot detected! activating endpoints");
-
 //GET
 app.get("/favicon.ico", function (req, res) {
 	res.sendFile("/code/favicon.ico");
@@ -31,13 +38,8 @@ app.get("/htmx.js", function (req, res) {
 	res.sendFile("/code/node_modules/htmx.org/dist/htmx.min.js");
 });
 
-app.get("/trafficLog", async function (req, res) {
-	res.sendFile("/log/trafficLog");
-});
-
-app.get("/screen", async function (req, res) {
-	await guardedScreenshot();
-	res.sendFile("/code/screenshot.png");
+app.get("/socket.io.js", function (_req, res) {
+	res.sendFile("/code/node_modules/socket.io/client-dist/socket.io.js");
 });
 
 app.get("/", async function (req, res) {
@@ -55,12 +57,6 @@ app.get("/", async function (req, res) {
 });
 
 //POST
-app.post("/back", function (req, res) {
-	android_websocket.send(`back`);
-	res.sendStatus(200);
-});
-
-// default options
 app.use(fileUpload());
 app.post("/upload_apk", async function (req, res) {
 	if (!req.files || Object.keys(req.files).length === 0) {
@@ -76,48 +72,25 @@ app.post("/upload_apk", async function (req, res) {
 		let uploadPath = "/shared_buffer/app" + 0 + ".apk";
 		await req.files.app.mv(uploadPath);
 	}
-	android_websocket.send(`install`);
+	back.emit("install");
 	res.send("Files uploaded!");
 });
 
-app.post("/home", function (req, res) {
-	android_websocket.send(`home`);
-	res.sendStatus(200);
+let server = app.listen(8080, () => console.log("Listening in port 8080"));
+
+const front = new Server(server);
+
+// forwarding the messages
+front.on("connection", (socket) => {
+	socket.onAny((event, ...args) => {
+		if (back.connected) {
+			back.emit(event, ...args);
+		} else {
+			console.log("Front tried to send: ", event, ...args);
+		}
+	});
 });
 
-app.post("/touch", function (req, res) {
-	const x = parseInt(req.body.x);
-	const y = parseInt(req.body.y);
-
-	if (isNaN(x) || isNaN(y) || x > device_size_x || y > device_size_y) {
-		res.send(
-			`the query params must be x <= ${device_size_x}, y <= ${device_size_y}\n`
-		);
-	} else {
-		android_websocket.send(`touch ${x} ${y}`);
-		res.sendStatus(200);
-	}
+back.onAny((event, ...args) => {
+	front.emit(event, ...args);
 });
-
-app.post("/drag", function (req, res) {
-	const body = req.body;
-	const startX = Number(body.startX);
-	const startY = Number(body.startY);
-	const endX = Number(body.endX);
-	const endY = Number(body.endY);
-	android_websocket.send(`drag ${startX} ${startY} ${endX} ${endY}`);
-	res.sendStatus(200);
-});
-
-app.post("/setcoord", function (req, res) {
-	console.log(req.body);
-	console.log(req.body.lat);
-	console.log(req.body.lon);
-	const lat = Number(req.body.lat);
-	const lon = Number(req.body.lon);
-	console.log(lat, lon);
-	android_websocket.send(`setcoord ${lat} ${lon}`);
-	res.sendStatus(200);
-});
-
-app.listen(8080, () => console.log("Listening in port 8080"));
diff --git a/http_server/code/package-lock.json b/http_server/code/package-lock.json
index 21386ed..b57ca33 100644
--- a/http_server/code/package-lock.json
+++ b/http_server/code/package-lock.json
@@ -9,6 +9,8 @@
         "express-fileupload": "^1.5.1",
         "htmx.org": "^1.9.12",
         "preact": "^10.18.1",
+        "socket.io": "^4.8.1",
+        "socket.io-client": "^4.8.1",
         "ws": "^8.18.0"
       },
       "devDependencies": {
@@ -367,6 +369,30 @@
         "node": ">=12"
       }
     },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/cors": {
+      "version": "2.8.18",
+      "resolved": "https://registry.npmjs.org/@types/cors/-/cors-2.8.18.tgz",
+      "integrity": "sha512-nX3d0sxJW41CqQvfOzVG1NCTXfFDrDWIghCZncpHeWlVFd81zxB/DLhg7avFg6eHLCRX7ckBmoIIcqa++upvJA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/node": {
+      "version": "22.15.21",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.15.21.tgz",
+      "integrity": "sha512-EV/37Td6c+MgKAbkcLG6vqZ2zEYHD7bvSrzqqs2RIhbA6w3x+Dqz8MZM3sP6kGTeLrdoOgKZe+Xja7tUB2DNkQ==",
+      "license": "MIT",
+      "dependencies": {
+        "undici-types": "~6.21.0"
+      }
+    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -384,6 +410,15 @@
       "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
       "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
     },
+    "node_modules/base64id": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-2.0.0.tgz",
+      "integrity": "sha512-lGe34o6EHj9y3Kts9R4ZYs/Gr+6N7MCaMlIFA3F1R2O5/m7K06AxfSeO5530PEERE6/WyEg3lsuyw4GHlPZHog==",
+      "license": "MIT",
+      "engines": {
+        "node": "^4.5.0 || >= 5.9"
+      }
+    },
     "node_modules/body-parser": {
       "version": "1.20.1",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
@@ -470,6 +505,19 @@
       "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
       "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
     },
+    "node_modules/cors": {
+      "version": "2.8.5",
+      "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz",
+      "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==",
+      "license": "MIT",
+      "dependencies": {
+        "object-assign": "^4",
+        "vary": "^1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
@@ -508,6 +556,145 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/engine.io": {
+      "version": "6.6.4",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-6.6.4.tgz",
+      "integrity": "sha512-ZCkIjSYNDyGn0R6ewHDtXgns/Zre/NT6Agvq1/WobF7JXgFff4SeDroKiCO3fNJreU9YG429Sc81o4w5ok/W5g==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/cors": "^2.8.12",
+        "@types/node": ">=10.0.0",
+        "accepts": "~1.3.4",
+        "base64id": "2.0.0",
+        "cookie": "~0.7.2",
+        "cors": "~2.8.5",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1"
+      },
+      "engines": {
+        "node": ">=10.2.0"
+      }
+    },
+    "node_modules/engine.io-client": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz",
+      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1",
+        "xmlhttprequest-ssl": "~2.1.1"
+      }
+    },
+    "node_modules/engine.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io-client/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/engine.io-client/node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/engine.io/node_modules/cookie": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz",
+      "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/engine.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/engine.io/node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/esbuild": {
       "version": "0.19.5",
       "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.19.5.tgz",
@@ -805,6 +992,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/object-inspect": {
       "version": "1.12.3",
       "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.3.tgz",
@@ -978,6 +1174,175 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/socket.io": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-4.8.1.tgz",
+      "integrity": "sha512-oZ7iUCxph8WYRHHcjBEc9unw3adt5CmSNlppj/5Q4k2RIrhl8Z5yY2Xr4j9zj0+wzVZ0bxmYoGSzKJnRl6A4yg==",
+      "license": "MIT",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "base64id": "~2.0.0",
+        "cors": "~2.8.5",
+        "debug": "~4.3.2",
+        "engine.io": "~6.6.0",
+        "socket.io-adapter": "~2.5.2",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.2.0"
+      }
+    },
+    "node_modules/socket.io-adapter": {
+      "version": "2.5.5",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-2.5.5.tgz",
+      "integrity": "sha512-eLDQas5dzPgOWCk9GuuJC2lBqItuhKI4uxGgo9aIV7MYbk2h9Q6uULEh8WBzThoI7l+qU9Ast9fVUmkqPP9wYg==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "~4.3.4",
+        "ws": "~8.17.1"
+      }
+    },
+    "node_modules/socket.io-adapter/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-adapter/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/socket.io-adapter/node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-client": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",
+      "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.6.1",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-client/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-parser/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-parser/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
+    "node_modules/socket.io/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io/node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
+    },
     "node_modules/statuses": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
@@ -1014,6 +1379,12 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/undici-types": {
+      "version": "6.21.0",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
+      "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+      "license": "MIT"
+    },
     "node_modules/unpipe": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
@@ -1057,6 +1428,14 @@
           "optional": true
         }
       }
+    },
+    "node_modules/xmlhttprequest-ssl": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz",
+      "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
     }
   }
 }
diff --git a/http_server/code/package.json b/http_server/code/package.json
index 4af3af4..a6176a7 100644
--- a/http_server/code/package.json
+++ b/http_server/code/package.json
@@ -7,6 +7,8 @@
     "express-fileupload": "^1.5.1",
     "htmx.org": "^1.9.12",
     "preact": "^10.18.1",
+    "socket.io": "^4.8.1",
+    "socket.io-client": "^4.8.1",
     "ws": "^8.18.0"
   },
   "devDependencies": {
diff --git a/http_server/code/src/notifications.jsx b/http_server/code/src/notifications.jsx
index 741523f..5105dc3 100644
--- a/http_server/code/src/notifications.jsx
+++ b/http_server/code/src/notifications.jsx
@@ -1,4 +1,5 @@
 import { render, Component } from "preact";
+import { io } from "socket.io-client";
 
 function rand_num() {
 	return Math.floor(Math.random() * Number.MAX_VALUE);
@@ -19,13 +20,12 @@ class Notifications extends Component {
 
 	componentDidMount() {
 		// This should also be dynamic
-		this.connection = new WebSocket("ws://127.0.0.1:3001");
 
-		this.connection.onmessage = (msg) => {
+		io().on("notification", (data) => {
 			let new_id = rand_num();
 			this.setState({
 				notifications: [
-					{ id: new_id, notification: JSON.parse(msg.data) },
+					{ id: new_id, notification: data },
 					...this.state.notifications,
 				],
 			});
@@ -33,7 +33,7 @@ class Notifications extends Component {
 			setTimeout(() => {
 				this.remove_notification(new_id);
 			}, 10000);
-		};
+		});
 	}
 
 	render() {
diff --git a/http_server/code/waitSocket.mjs b/http_server/code/waitSocket.mjs
deleted file mode 100644
index 1088ae2..0000000
--- a/http_server/code/waitSocket.mjs
+++ /dev/null
@@ -1,16 +0,0 @@
-import { exit } from "process";
-import { WebSocket } from "ws";
-
-async function sleep(time) {
-	return new Promise((resolve) => setTimeout(resolve, time));
-}
-
-while (true) {
-	let socket = new WebSocket("ws://android:3000");
-
-	socket.on("open", () => {
-		exit(0);
-	});
-	socket.on("error", () => {});
-	await sleep(200);
-}
diff --git a/package-lock.json b/package-lock.json
index ec5272d..9ef2514 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -6,6 +6,9 @@
     "": {
       "dependencies": {
         "zx": "^7.2.2"
+      },
+      "devDependencies": {
+        "socket.io-client": "^4.8.1"
       }
     },
     "node_modules/@nodelib/fs.scandir": {
@@ -43,6 +46,13 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@types/fs-extra": {
       "version": "11.0.4",
       "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz",
@@ -122,6 +132,24 @@
         "node": ">= 12"
       }
     },
+    "node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/dir-glob": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
@@ -140,6 +168,30 @@
       "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==",
       "license": "MIT"
     },
+    "node_modules/engine.io-client": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz",
+      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1",
+        "xmlhttprequest-ssl": "~2.1.1"
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/event-stream": {
       "version": "3.3.4",
       "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
@@ -386,6 +438,13 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/node-domexception": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/node-domexception/-/node-domexception-1.0.0.tgz",
@@ -536,6 +595,36 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/socket.io-client": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",
+      "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.6.1",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/split": {
       "version": "0.3.3",
       "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
@@ -623,6 +712,37 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xmlhttprequest-ssl": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz",
+      "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==",
+      "dev": true,
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/yaml": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
diff --git a/package.json b/package.json
index 762819c..debfbdf 100644
--- a/package.json
+++ b/package.json
@@ -3,8 +3,10 @@
     "start": "zx start.mjs up",
     "stop": "zx start.mjs down"
   },
-
   "dependencies": {
     "zx": "^7.2.2"
+  },
+  "devDependencies": {
+    "socket.io-client": "^4.8.1"
   }
 }
diff --git a/pre_android/Dockerfile b/pre_android/Dockerfile
index a74afaf..5520964 100644
--- a/pre_android/Dockerfile
+++ b/pre_android/Dockerfile
@@ -2,8 +2,8 @@ FROM runmymind/docker-android-sdk:ubuntu-standalone-20230511
 
 ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/android-sdk-linux/cmdline-tools/latest/bin:/opt/android-sdk-linux/cmdline-tools/tools/bin:/opt/android-sdk-linux/tools/bin:/opt/android-sdk-linux/build-tools/32.0.0:/opt/android-sdk-linux/platform-tools:/opt/android-sdk-linux/emulator:/opt/android-sdk-linux/bin
 
-RUN sdkmanager --channel=2 "system-images;android-30;google_apis;x86_64" \
-	&& echo no | avdmanager create avd -n virtual_dev -b google_apis/x86_64 -k "system-images;android-30;google_apis;x86_64" \
+RUN sdkmanager --channel=2 "system-images;android-35;google_apis;x86_64" \
+	&& echo no | avdmanager create avd -n virtual_dev -b google_apis/x86_64 -k "system-images;android-35;google_apis;x86_64" \
 	&& apt-get update && apt-get install -y iproute2 iputils-ping npm git libxml2-utils telnet
 
 CMD bash /preconf/docker-entrypoint.sh