diff --git a/app/rdn_application.cpp b/app/rdn_application.cpp
index ad48e2b..c6be9bc 100644
--- a/app/rdn_application.cpp
+++ b/app/rdn_application.cpp
@@ -1,16 +1,14 @@
 #include "rdn_application.h"
 
-#include "core/request.h"
-
 #include <iostream>
+#include <string>
 
+#include "core/request.h"
 #include "core/file_cache.h"
-
 #include "core/handler_instance.h"
-
 #include "core/database_manager.h"
-
 #include "core/html_builder.h"
+#include "core/query_result.h"
 
 void RDNApplication::index(Object *instance, Request *request) {
 	if (FileCache::get_singleton()->wwwroot_has_file("/index.html")) {
@@ -24,10 +22,44 @@ void RDNApplication::index(Object *instance, Request *request) {
 	request->send_error(404);
 }
 
+void RDNApplication::get_sensor_data(Object *instance, Request *request) {
+	std::string sql = "SELECT * FROM sensor_data;";
+
+	QueryResult *res = DatabaseManager::get_singleton()->ddb->query(sql);
+
+	std::string json;
+
+	json += "[";
+
+	bool first = true;
+	while (res->next_row()) {
+		if (first) {
+			first = false;
+		} else {
+			json += ",";
+		}
+
+		json += "{";
+
+		json += "\"id\":" + std::string(res->get_cell(0)) + ",";
+		json += "\"client_id\":\"" + std::string(res->get_cell(1)) + "\",";
+		json += "\"measurement\":" + std::string(res->get_cell(2));
+
+		json += "}";
+	}
+
+	json += "]";
+
+	request->response->setBody(json);
+	request->send();
+}
+
 void RDNApplication::setup_routes() {
 	Application::setup_routes();
 
 	index_func = HandlerInstance(index);
+
+	main_route_map["sensor_data"] = HandlerInstance(get_sensor_data);
 }
 
 void RDNApplication::setup_middleware() {
@@ -37,10 +69,35 @@ void RDNApplication::setup_middleware() {
 }
 
 void RDNApplication::migrate() {
+	std::string sql = "CREATE TABLE sensor_data("  \
+						"id  INTEGER  PRIMARY KEY  AUTOINCREMENT," \
+						"client_id  TEXT  NOT NULL," \
+						"measurement  REAL);";
+
+	DatabaseManager::get_singleton()->ddb->query_run(sql);
 }
 
 void RDNApplication::mqtt_sensor_callback(const std::string &client_id, const std::vector<uint8_t> &data) {
-	printf("%s\n", client_id.c_str());
+	if (client_id != "1") {
+		return;
+	}
+
+	if (data.size() == 0) {
+		return;
+	}
+
+	std::string d;
+	d.reserve(data.size());
+
+	for (int i = 0; i < data.size(); ++i) {
+		d += data[i];
+	}
+
+	//IMPORTANT: SQL INJECTION WILL WORK ON THIS, IF YOU DON"T FILTER THE CLINET IDS!!!! No prepared statement support yet! :(
+	std::string sql = "INSERT INTO sensor_data (client_id, measurement)" \
+						"VALUES ('" + client_id + "'," + d + ");";
+
+	DatabaseManager::get_singleton()->ddb->query_run(sql);
 }
 
 RDNApplication::RDNApplication() :
diff --git a/app/rdn_application.h b/app/rdn_application.h
index 0f7b08c..ba286e5 100644
--- a/app/rdn_application.h
+++ b/app/rdn_application.h
@@ -13,6 +13,7 @@
 class RDNApplication : public Application {
 public:
     static void index(Object *instance, Request *request);
+    static void get_sensor_data(Object *instance, Request *request);
 
     virtual void setup_routes();
     virtual void setup_middleware();