diff --git a/requirements.txt b/requirements.txt
index c8cbd80..6b5ceca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,4 +2,5 @@ gpiozero
 luma.led_matrix
 fastapi
 uvicorn
-fastapi-cors
\ No newline at end of file
+fastapi-cors
+Adafruit_DHT
\ No newline at end of file
diff --git a/src/climate.py b/src/climate.py
new file mode 100644
index 0000000..e950eec
--- /dev/null
+++ b/src/climate.py
@@ -0,0 +1,13 @@
+import Adafruit_DHT
+
+class Dht22Sensor:
+    def __init__(self, pin):
+        self.sensor = Adafruit_DHT.DHT22
+        self.pin = pin
+
+    def read(self):
+        humidity, temperature = Adafruit_DHT.read_retry(self.sensor, self.pin)
+        if humidity is not None and temperature is not None:
+            return {'temperature': temperature, 'humidity': humidity}
+        else:
+            return None
\ No newline at end of file
diff --git a/src/index.html b/src/index.html
index 2885f91..6505814 100644
--- a/src/index.html
+++ b/src/index.html
@@ -20,7 +20,9 @@
         <button type="button" onclick="flash()">Flash</button>
     </form>
     <button type="button" onclick="displayTime()">Display Time</button>
-    <button type="button" onclick="off()">Turn Off</button>
+    <button type="button" onclick="generic('off')">Turn Off</button>
+    <button type="button" onclick="generic('temperature')">Display Temperature</button>
+    <button type="button" onclick="generic('humidity')">Display Humidity</button>
     <script>
         const targetHost = "http://192.168.178.54:8000";
 
@@ -50,8 +52,8 @@
                 .catch((error) => console.error(error));
         }
 
-        function off() {
-            const url = targetHost + "/off";
+            function generic(endpoint) {
+                const url = targetHost + "/" + endpoint;
             fetch(url, {
                 method: "POST",
                 headers: { "Content-Type": "application/json" },
diff --git a/src/main.py b/src/main.py
index 4bcf876..df849ca 100644
--- a/src/main.py
+++ b/src/main.py
@@ -4,6 +4,7 @@ import requests
 from matrix import MatrixDisplay
 from fastapi.middleware.cors import CORSMiddleware
 import asyncio
+from climate import Dht22Sensor
 
 app = FastAPI()
 
@@ -22,8 +23,11 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-matrix_display = MatrixDisplay()
 should_run_time_loop = True
+dht22_pin = 27
+
+matrix_display = MatrixDisplay()
+dht22_sensor = Dht22Sensor(dht22_pin)
 
 
 async def display_time():
@@ -61,6 +65,49 @@ async def turn_off():
     return {"message": "Display turned off"}
 
 
+
+@app.post("/temperature")
+async def temperature():
+    measurements = dht22_sensor.read()
+    if measurements is None:
+        return {"message": "Failed to read temperature"}
+    
+    
+    global should_run_time_loop
+    was_clock_runnign = should_run_time_loop
+    should_run_time_loop = False
+    
+    
+    matrix_display.show_text(measurements["temperature"] + "°C")
+    
+    if was_clock_runnign:
+        should_run_time_loop = True
+        asyncio.create_task(display_time())
+        
+    return measurements
+
+
+@app.post("/humidity")
+async def humidity():
+    measurements = dht22_sensor.read()
+    if measurements is None:
+        return {"message": "Failed to read humidity"}
+    
+    
+    global should_run_time_loop
+    was_clock_runnign = should_run_time_loop
+    should_run_time_loop = False
+    
+    
+    matrix_display.show_text(measurements["humidity"] + "%")
+    
+    if was_clock_runnign:
+        should_run_time_loop = True
+        asyncio.create_task(display_time())
+        
+    return measurements
+
+
 @app.post("/flash")
 async def flash(count: int = 1):
     global should_run_time_loop