diff --git a/index.html b/index.html
index f1ce767..51bb16e 100644
--- a/index.html
+++ b/index.html
@@ -11,4 +11,13 @@
     <div id="root"></div>
     <script type="module" src="/src/main.tsx"></script>
   </body>
+  <script>
+    (function() {
+      if (sessionStorage.getItem('redirect')) {
+        const redirectPath = sessionStorage.getItem('redirect');
+        sessionStorage.removeItem('redirect');
+        window.history.replaceState(null, null, '/' + redirectPath);
+      }
+    })();
+  </script>
 </html>
diff --git a/public/404.html b/public/404.html
new file mode 100644
index 0000000..348115a
--- /dev/null
+++ b/public/404.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>Page Not Found</title>
+  <script>
+    // Single Page Apps for GitHub Pages
+    // https://github.com/rafgraph/spa-github-pages
+    const pathSegmentsToKeep = 0; // Site is published at the root of custom domain soen357.ngrenier.com
+
+    const l = window.location;
+    // Save the URL path (minus the repo part)
+    const redirectPath = l.pathname.split('/').slice(pathSegmentsToKeep + 1).join('/') + 
+                        (l.search ? l.search : '') + (l.hash ? l.hash : '');
+                        
+    // Redirect to the index.html with the path as a query parameter
+    sessionStorage.setItem('redirect', redirectPath);
+    l.replace(
+      l.protocol + '//' + l.hostname + (l.port ? ':' + l.port : '') +
+      l.pathname.split('/').slice(0, pathSegmentsToKeep + 1).join('/') + '/?/' +
+      redirectPath
+    );
+  </script>
+</head>
+<body>
+  Redirecting...
+</body>
+</html>
\ No newline at end of file
diff --git a/src/main.tsx b/src/main.tsx
index 2e37d40..8d6332d 100644
--- a/src/main.tsx
+++ b/src/main.tsx
@@ -8,8 +8,11 @@ import { DefaultNotFoundRoute } from "./components/default-not-found-route";
 import { RouterProvider, createRouter } from "@tanstack/react-router";
 import { routeTree } from "./routeTree.gen";
 
+// const hashHistory = createHashHistory();
+
 const router = createRouter({
   routeTree,
+  // history: hashHistory,
   defaultNotFoundComponent: DefaultNotFoundRoute,
 });
 
