diff --git a/api/favicon.ico/default.php b/api/favicon.ico/default.php
new file mode 100644
index 0000000..ddb5056
--- /dev/null
+++ b/api/favicon.ico/default.php
@@ -0,0 +1,4 @@
+<?php
+
+	header("Header: image/x-icon");
+	echo file_get_contents("icon.ico");
\ No newline at end of file
diff --git a/api/favicon.ico/icon.ico b/api/favicon.ico/icon.ico
new file mode 100644
index 0000000..70c3a37
Binary files /dev/null and b/api/favicon.ico/icon.ico differ
diff --git a/api/index.php b/api/index.php
deleted file mode 100644
index e69de29..0000000
diff --git a/api/ping/default.php b/api/ping/default.php
new file mode 100644
index 0000000..6f28027
--- /dev/null
+++ b/api/ping/default.php
@@ -0,0 +1,4 @@
+<?php
+
+	echo "Pong";
+	header("Content-Type: text/plain");
\ No newline at end of file
diff --git a/api/router.php b/api/router.php
index bf89329..14df724 100644
--- a/api/router.php
+++ b/api/router.php
@@ -1,5 +1,29 @@
 <?php
 
-	http_response_code("503 Service Unavailable");
-	header("Content-Type: text/plain");
-	echo "Not available yet";
\ No newline at end of file
+	try {
+		$file = $_SERVER["REQUEST_URI"].".php";
+
+		if(file_exists($file)) {
+			require $file;
+			return;
+		}
+
+		$api_root = explode("/",$_SERVER["REQUEST_URI"])[1];
+
+		if(is_dir($api_root) && file_exists($api_root."/default.php")) {
+			require $api_root."/default.php";
+			return;
+		}
+
+		throw new Exception("Invalid API");
+	} catch(Exception $error) {
+		http_response_code("400");
+		header("Content-Type: application/json");
+
+		$output = [
+			"status" => "error",
+			"message" => $error->getMessage()
+		];
+
+		echo json_encode($output);
+	}
\ No newline at end of file
diff --git a/server.conf b/server.conf
index 0494394..512a4f8 100644
--- a/server.conf
+++ b/server.conf
@@ -1,4 +1,4 @@
-# == victorwesterlund.com ==
+# -- victorwesterlund.com --
 
 server {
         listen 80;
@@ -37,7 +37,7 @@ server {
         }
 }
 
-# == api.victorwesterlund.com ==
+# -- api.victorwesterlund.com --
 
 server {
         listen 80;
@@ -59,8 +59,8 @@ server {
 
         root /var/www/github_victorwesterlund_victorwesterlund.com/api;
 
-        location \* {
-                try_files /router.php$request_uri =404;
+        location / {
+                try_files /router.php =404;
                 add_header Access-Control-Allow-Origin *;
                 include snippets/fastcgi-php-router.conf;
                 fastcgi_pass unix:/run/php/php7.3-fpm.sock;