diff --git a/core/http/Cargo.lock b/core/http/Cargo.lock
index 755ed5e2e91bae9e1ec061227b582833beedbce0..6cd2bca33ce4e9687d381cf2267bec2fb743560f 100644
--- a/core/http/Cargo.lock
+++ b/core/http/Cargo.lock
@@ -86,6 +86,7 @@ name = "http"
 version = "0.1.0"
 dependencies = [
  "ctrlc",
+ "mime",
  "quinn",
 ]
 
@@ -113,6 +114,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
 [[package]]
 name = "mio"
 version = "0.8.6"
diff --git a/core/http/Cargo.toml b/core/http/Cargo.toml
index 34a45069d25430abff764cf8c4aa660eb02da354..a5b887f3b7462137390fbcb1431ebca8757ad2a8 100644
--- a/core/http/Cargo.toml
+++ b/core/http/Cargo.toml
@@ -8,3 +8,4 @@ edition = "2021"
 [dependencies]
 quinn = "0.9.3"
 ctrlc = "3.2.5"
+mime = "0.3.17"
diff --git a/core/http/src/handlers.rs b/core/http/src/handlers.rs
index 944f60a8eb3650685a04c90f80731248cc0295ec..194eca327a3646db0763b3a0fcef2e2ec415d9ef 100644
--- a/core/http/src/handlers.rs
+++ b/core/http/src/handlers.rs
@@ -2,8 +2,11 @@ use std::{
     fs,
     io::{BufRead, BufReader, Write},
     net::TcpStream,
+    path::PathBuf,
 };
 
+use mime::Mime;
+
 pub fn handle_connection(mut stream: TcpStream) {
     let buf_reader = BufReader::new(&mut stream);
     let http_request: Vec<_> = buf_reader
@@ -12,23 +15,57 @@ pub fn handle_connection(mut stream: TcpStream) {
         .take_while(|line| !line.is_empty())
         .collect();
 
-    let path_elements = http_request[0]
+    let path = parse_request(&http_request[0]);
+
+    let status_line;
+    let mime_type;
+    let contents = if let Ok(file) = fs::read(&path) {
+        status_line = "HTTP/1.1 200 OK";
+        mime_type = find_mimetype(&path.to_str().unwrap().to_string());
+        file
+    } else {
+        status_line = "HTTP/1.1 404 NOT FOUND";
+        mime_type = find_mimetype(&"html".to_string());
+        fs::read("404.html").unwrap()
+    };
+
+    println!("{mime_type}");
+
+    let response = format!(
+        "{}\r\nContent-Length: {}\r\nContent-Type: {}\r\n\r\n",
+        status_line,
+        contents.len(),
+        mime_type
+    );
+
+    stream.write_all(response.as_bytes()).unwrap();
+    stream.write(&contents).unwrap();
+}
+
+fn parse_request(request: &str) -> PathBuf {
+    let path_elements = request
         .split(" ")
         .nth(1)
         .unwrap()
         .split("/")
         .filter(|&val| val != ".." && val != "")
         .collect::<Vec<&str>>();
-    let mut path = String::from("./");
-    path.push_str(&path_elements.join("/"));
-    println!("{:?}", path_elements);
-    println!("{:?}", path);
-
-    let status_line = "HTTP/1.1 200 OK";
-    let contents = fs::read_to_string(path).unwrap_or(fs::read_to_string("404.html").unwrap());
-    let length = contents.len();
+    PathBuf::from(format!("./{}", path_elements.join("/")))
+}
 
-    let response = format!("{status_line}\r\nContent-Length: {length}\r\n\r\n{contents}");
+fn find_mimetype(filename: &String) -> Mime {
+    let parts: Vec<&str> = filename.split('.').collect();
 
-    stream.write_all(response.as_bytes()).unwrap();
+    let res = match parts.last() {
+        Some(v) => match *v {
+            "png" => mime::IMAGE_PNG,
+            "jpg" => mime::IMAGE_JPEG,
+            "json" => mime::APPLICATION_JSON,
+            "html" => mime::TEXT_HTML,
+            "css" => mime::TEXT_CSS,
+            &_ => mime::TEXT_PLAIN,
+        },
+        None => mime::TEXT_PLAIN,
+    };
+    return res;
 }
diff --git a/core/http/src/routing.rs b/core/http/src/routing.rs
index aee6f8a0732c7840aa7f71a58d9a836ea91fac14..2c5f74eaaf47e16c39d0380709b5a5bb7116ac51 100644
--- a/core/http/src/routing.rs
+++ b/core/http/src/routing.rs
@@ -13,20 +13,19 @@ pub struct Route {
     // handler: fn(Request) -> Outcome,
     uri: &'static str,
     rank: isize,
-    format: Format,
+    format: Option<Format>,
 }
 
 impl Route {
     pub fn from(routeinfo: RoutInfo) -> Self {
         let rank = routeinfo.rank.unwrap_or(0);
-        let format = routeinfo.format.unwrap_or(Format::Plain);
         Route {
             name: routeinfo.name,
             method: routeinfo.method,
             // handler: routeinfo.handler,
             uri: routeinfo.path,
             rank,
-            format,
+            format: routeinfo.format,
         }
     }
 }
diff --git a/site/Cargo.lock b/site/Cargo.lock
index 498f9ed740e4e6ab47f8e073659538f232671b7f..75787656749323c53188beebe5d548b88e8d50f7 100644
--- a/site/Cargo.lock
+++ b/site/Cargo.lock
@@ -86,6 +86,7 @@ name = "http"
 version = "0.1.0"
 dependencies = [
  "ctrlc",
+ "mime",
  "quinn",
 ]
 
@@ -113,6 +114,12 @@ dependencies = [
  "cfg-if",
 ]
 
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
 [[package]]
 name = "mio"
 version = "0.8.6"
diff --git a/site/QLC-LS.jpg b/site/img.jpg
similarity index 100%
rename from site/QLC-LS.jpg
rename to site/img.jpg