diff --git a/Cargo.lock b/Cargo.lock
index a9930d8..5d0759f 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4,18 +4,18 @@ version = 3
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
 dependencies = [
  "gimli",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "ahash"
@@ -41,9 +41,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.87"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"
+checksum = "4e1496f8fb1fbf272686b8d37f523dab3e4a7443300055e74cdaa449f3114356"
 
 [[package]]
 name = "async-recursion"
@@ -193,17 +193,17 @@ dependencies = [
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
  "addr2line",
- "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
  "object",
  "rustc-demangle",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -277,9 +277,9 @@ checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 
 [[package]]
 name = "cc"
-version = "1.1.16"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9d013ecb737093c0e86b151a7b837993cf9ec6c502946cfb44bedc392421e0b"
+checksum = "b62ac837cdb5cb22e10a256099b4fc502b1dfe560cb282963a974d7abd80e476"
 dependencies = [
  "shlex",
 ]
@@ -850,9 +850,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
 
 [[package]]
 name = "glob"
@@ -1178,9 +1178,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -1236,9 +1236,9 @@ checksum = "f958d3d68f4167080a18141e10381e7634563984a537f2a49a30fd8e53ac5767"
 
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
 
 [[package]]
 name = "itertools"
@@ -1281,9 +1281,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "leptos"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a15911b4e53bb6e1b033d717eadb39924418a4a288279128122e5a65c70ba3e6"
+checksum = "0cbb3237c274dadf00dcc27db96c52601b40375117178fb24a991cda073624f0"
 dependencies = [
  "cfg-if",
  "leptos_config",
@@ -1301,9 +1301,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_config"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc4d78fba18c1ccab48ffc9f3d35b39821f896b0a28bdd616a846b6241036c9"
+checksum = "62ed778611380ddea47568ac6ad6ec5158d39b5bd59e6c4dcd24efc15dc3dc0d"
 dependencies = [
  "config",
  "regex",
@@ -1314,9 +1314,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_dom"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ccb04d4763603bb665fa35cb9642d0bd75313117d10efda9b79243c023e69df"
+checksum = "8401c46c86c1f4c16dcb7881ed319fcdca9cda9b9e78a6088955cb423afcf119"
 dependencies = [
  "async-recursion",
  "cfg-if",
@@ -1344,9 +1344,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_hot_reload"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc61e5cce26761562cd3332630b3fbaddb1c4f77744e41474c7212ad279c5d9"
+checksum = "6cb53d4794240b684a2f4be224b84bee9e62d2abc498cf2bcd643cd565e01d96"
 dependencies = [
  "anyhow",
  "camino",
@@ -1362,9 +1362,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_macro"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90eaea005cabb879c091c84cfec604687ececfd540469e5a30a60c93489a2f23"
+checksum = "4b13bc3db70715cd8218c4535a5af3ae3c0e5fea6f018531fc339377b36bc0e0"
 dependencies = [
  "attribute-derive",
  "cfg-if",
@@ -1373,7 +1373,7 @@ dependencies = [
  "itertools 0.12.1",
  "leptos_hot_reload",
  "prettyplease",
- "proc-macro-error",
+ "proc-macro-error2",
  "proc-macro2",
  "quote",
  "rstml",
@@ -1385,9 +1385,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_reactive"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ef2f99f377472459b0d320b46e9a9516b0e68dee5ed8c9eeb7e8eb9fefec5d2"
+checksum = "e4161acbf80f59219d8d14182371f57302bc7ff81ee41aba8ba1ff7295727f23"
 dependencies = [
  "base64 0.22.1",
  "cfg-if",
@@ -1412,9 +1412,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_router"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5006e35b7c768905286dbea0d3525396cd39d961cb7b9fb664aa00b0c984ae6"
+checksum = "8d71dea7d42c0d29c40842750232d3425ed1cf10e313a1f898076d20871dad32"
 dependencies = [
  "cfg-if",
  "gloo-net 0.6.0",
@@ -1438,9 +1438,9 @@ dependencies = [
 
 [[package]]
 name = "leptos_server"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07be202a433baa8c50050de4f9c116efccffc57208bcda7bd1bb9b8e87dca9"
+checksum = "4a97eb90a13f71500b831c7119ddd3bdd0d7ae0a6b0487cade4fddeed3b8c03f"
 dependencies = [
  "inventory",
  "lazy_static",
@@ -1584,11 +1584,11 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
@@ -1968,6 +1968,27 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "proc-macro-error-attr2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+]
+
+[[package]]
+name = "proc-macro-error2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802"
+dependencies = [
+ "proc-macro-error-attr2",
+ "proc-macro2",
+ "quote",
+]
+
 [[package]]
 name = "proc-macro-utils"
 version = "0.8.0"
@@ -2116,9 +2137,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.3"
+version = "0.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
+checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -2296,9 +2317,9 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.36"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
  "bitflags 2.6.0",
  "errno",
@@ -2379,11 +2400,11 @@ dependencies = [
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2553,9 +2574,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "024b400db1aca5bd4188714f7bbbf7a2e1962b9a12a80b2a21e937e509086963"
+checksum = "4fae7a3038a32e5a34ba32c6c45eb4852f8affaf8b794ebfcd4b1099e2d62ebe"
 dependencies = [
  "bytes",
  "ciborium",
@@ -2582,9 +2603,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf0e6f71fc924df36e87f27dfbd447f0bedd092d365db3a5396878256d9f00c"
+checksum = "faaaf648c6967aef78177c0610478abb5a3455811f401f3c62d10ae9bd3901a1"
 dependencies = [
  "const_format",
  "convert_case 0.6.0",
@@ -2596,9 +2617,9 @@ dependencies = [
 
 [[package]]
 name = "server_fn_macro_default"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556e4fd51eb9ee3e7d9fb0febec6cef486dcbc8f7f427591dfcfebee1abe1ad4"
+checksum = "7f2aa8119b558a17992e0ac1fd07f080099564f24532858811ce04f742542440"
 dependencies = [
  "server_fn_macro",
  "syn",
@@ -3250,9 +3271,9 @@ checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
diff --git a/backend/src/analysis.rs b/backend/src/analysis.rs
index 369af50..38cead3 100644
--- a/backend/src/analysis.rs
+++ b/backend/src/analysis.rs
@@ -10,6 +10,7 @@ pub struct AnalysisInput {
 #[derive(Debug)]
 pub struct BaseInfo {
     pub map: String,
+    pub players: Vec<()>
 }
 
 #[tracing::instrument(skip(input))]
@@ -126,6 +127,7 @@ pub fn analyse_base(input: AnalysisInput) -> BaseInfo {
     }
 
     BaseInfo {
-        map: header.get("map_name").cloned().unwrap_or_default()
+        map: header.get("map_name").cloned().unwrap_or_default(),
+        players: Vec::new()
     }
 }
diff --git a/backend/src/api.rs b/backend/src/api.rs
index 0397a5d..777b4e1 100644
--- a/backend/src/api.rs
+++ b/backend/src/api.rs
@@ -1,88 +1,4 @@
-pub mod demos {
-    use crate::UserSession;
-    use diesel_async::RunQueryDsl;
-    use diesel::prelude::*;
-    use axum::extract::{State, Path};
-    use std::sync::Arc;
-
-    struct DemoState {
-        upload_folder: std::path::PathBuf,
-        base_analysis: tokio::sync::mpsc::UnboundedSender<crate::analysis::AnalysisInput>
-    }
-
-    pub fn router<P>(upload_folder: P, base_analysis: tokio::sync::mpsc::UnboundedSender<crate::analysis::AnalysisInput>) -> axum::Router where P: Into<std::path::PathBuf> {
-        axum::Router::new()
-            .route("/list", axum::routing::get(list))
-            .route("/upload", axum::routing::post(upload).layer(axum::extract::DefaultBodyLimit::max(500*1024*1024)))
-            .route("/:id/info", axum::routing::get(info))
-            .with_state(Arc::new(DemoState {
-                upload_folder: upload_folder.into(),
-                base_analysis,
-            }))
-    }
-
-    #[tracing::instrument(skip(session))]
-    async fn list(session: UserSession) -> Result<axum::response::Json<Vec<common::BaseDemoInfo>>, axum::http::StatusCode> {
-        let steam_id = session.data().steam_id.ok_or_else(|| axum::http::StatusCode::UNAUTHORIZED)?;
-        tracing::info!("SteamID: {:?}", steam_id);
-
-        let query = crate::schema::demos::dsl::demos.inner_join(crate::schema::demo_info::dsl::demo_info).select((crate::models::Demo::as_select(), crate::models::DemoInfo::as_select())).filter(crate::schema::demos::dsl::steam_id.eq(steam_id.to_string()));
-        let results: Vec<(crate::models::Demo, crate::models::DemoInfo)> = query.load(&mut crate::db_connection().await).await.unwrap();
-    
-        Ok(axum::response::Json(results.into_iter().map(|(demo, info)| common::BaseDemoInfo {
-            id: demo.demo_id,
-            map: info.map,
-        }).collect::<Vec<_>>()))
-    }
-
-    #[tracing::instrument(skip(state, session))]
-    async fn upload(State(state): State<Arc<DemoState>>, session: crate::UserSession, form: axum::extract::Multipart) -> Result<axum::response::Redirect, (axum::http::StatusCode, &'static str)> {
-        let steam_id = session.data().steam_id.ok_or_else(|| (axum::http::StatusCode::UNAUTHORIZED, "Not logged in"))?;
-
-        tracing::info!("Upload for Session: {:?}", steam_id);
-
-        let file_content = crate::get_demo_from_upload("demo", form).await.unwrap();
-
-        let user_folder = std::path::Path::new(&state.upload_folder).join(format!("{}/", steam_id));
-        if !tokio::fs::try_exists(&user_folder).await.unwrap_or(false) {
-            tokio::fs::create_dir_all(&user_folder).await.unwrap();
-        }
-
-        let timestamp_secs = std::time::SystemTime::now().duration_since(std::time::SystemTime::UNIX_EPOCH).unwrap().as_secs();
-        let demo_id = timestamp_secs as i64;
-        let demo_file_path = user_folder.join(format!("{}.dem", timestamp_secs));
-
-        tokio::fs::write(&demo_file_path, file_content).await.unwrap();
-
-        let mut db_con = crate::db_connection().await;
-
-        let query = diesel::dsl::insert_into(crate::schema::demos::dsl::demos).values(crate::models::Demo {
-            demo_id,
-            steam_id: steam_id.to_string(),
-        });
-        query.execute(&mut db_con).await.unwrap();
-
-        state.base_analysis.send(crate::analysis::AnalysisInput {
-            steamid: steam_id.to_string(),
-            demoid: demo_id,
-            path: demo_file_path,
-        });
-        let processing_query = diesel::dsl::insert_into(crate::schema::processing_status::dsl::processing_status).values(crate::models::ProcessingStatus {
-            demo_id,
-            info: 0,
-        });
-        processing_query.execute(&mut db_con).await.unwrap();
-
-        Ok(axum::response::Redirect::to("/"))
-    }
-
-    #[tracing::instrument(skip(session))]
-    async fn info(session: UserSession, Path(demo_id): Path<i64>) -> Result<(), axum::http::StatusCode> {
-        tracing::info!("Get info for Demo: {:?}", demo_id);
-
-        Ok(())
-    }
-}
+pub mod demos;
 
 pub mod steam {
     use axum::extract::State;
@@ -208,7 +124,7 @@ pub mod user {
 
 pub fn router(base_analysis: tokio::sync::mpsc::UnboundedSender<crate::analysis::AnalysisInput>) -> axum::Router {
     axum::Router::new()
-        .nest("/steam/", steam::router("http://localhost:3000", "/api/steam/callback"))
+        .nest("/steam/", steam::router("http://192.168.0.156:3000", "/api/steam/callback"))
         .nest("/demos/", demos::router("uploads/", base_analysis))
         .nest("/user/", user::router())
 }
diff --git a/backend/src/api/demos.rs b/backend/src/api/demos.rs
new file mode 100644
index 0000000..c2936b2
--- /dev/null
+++ b/backend/src/api/demos.rs
@@ -0,0 +1,96 @@
+use crate::UserSession;
+    use diesel_async::RunQueryDsl;
+    use diesel::prelude::*;
+    use axum::extract::{State, Path};
+    use std::sync::Arc;
+
+    struct DemoState {
+        upload_folder: std::path::PathBuf,
+        base_analysis: tokio::sync::mpsc::UnboundedSender<crate::analysis::AnalysisInput>
+    }
+
+    pub fn router<P>(upload_folder: P, base_analysis: tokio::sync::mpsc::UnboundedSender<crate::analysis::AnalysisInput>) -> axum::Router where P: Into<std::path::PathBuf> {
+        axum::Router::new()
+            .route("/list", axum::routing::get(list))
+            .route("/upload", axum::routing::post(upload).layer(axum::extract::DefaultBodyLimit::max(500*1024*1024)))
+            .route("/:id/info", axum::routing::get(info))
+            .with_state(Arc::new(DemoState {
+                upload_folder: upload_folder.into(),
+                base_analysis,
+            }))
+    }
+
+    #[tracing::instrument(skip(session))]
+    async fn list(session: UserSession) -> Result<axum::response::Json<Vec<common::BaseDemoInfo>>, axum::http::StatusCode> {
+        let steam_id = session.data().steam_id.ok_or_else(|| axum::http::StatusCode::UNAUTHORIZED)?;
+        tracing::info!("SteamID: {:?}", steam_id);
+
+        let query = crate::schema::demos::dsl::demos.inner_join(crate::schema::demo_info::dsl::demo_info).select((crate::models::Demo::as_select(), crate::models::DemoInfo::as_select())).filter(crate::schema::demos::dsl::steam_id.eq(steam_id.to_string()));
+        let results: Vec<(crate::models::Demo, crate::models::DemoInfo)> = query.load(&mut crate::db_connection().await).await.unwrap();
+    
+        Ok(axum::response::Json(results.into_iter().map(|(demo, info)| common::BaseDemoInfo {
+            id: demo.demo_id,
+            map: info.map,
+        }).collect::<Vec<_>>()))
+    }
+
+    #[tracing::instrument(skip(state, session))]
+    async fn upload(State(state): State<Arc<DemoState>>, session: crate::UserSession, form: axum::extract::Multipart) -> Result<axum::response::Redirect, (axum::http::StatusCode, &'static str)> {
+        let steam_id = session.data().steam_id.ok_or_else(|| (axum::http::StatusCode::UNAUTHORIZED, "Not logged in"))?;
+
+        tracing::info!("Upload for Session: {:?}", steam_id);
+
+        let file_content = crate::get_demo_from_upload("demo", form).await.unwrap();
+
+        let user_folder = std::path::Path::new(&state.upload_folder).join(format!("{}/", steam_id));
+        if !tokio::fs::try_exists(&user_folder).await.unwrap_or(false) {
+            tokio::fs::create_dir_all(&user_folder).await.unwrap();
+        }
+
+        let timestamp_secs = std::time::SystemTime::now().duration_since(std::time::SystemTime::UNIX_EPOCH).unwrap().as_secs();
+        let demo_id = timestamp_secs as i64;
+        let demo_file_path = user_folder.join(format!("{}.dem", timestamp_secs));
+
+        tokio::fs::write(&demo_file_path, file_content).await.unwrap();
+
+        let mut db_con = crate::db_connection().await;
+
+        let query = diesel::dsl::insert_into(crate::schema::demos::dsl::demos).values(crate::models::Demo {
+            demo_id,
+            steam_id: steam_id.to_string(),
+        });
+        query.execute(&mut db_con).await.unwrap();
+
+        state.base_analysis.send(crate::analysis::AnalysisInput {
+            steamid: steam_id.to_string(),
+            demoid: demo_id,
+            path: demo_file_path,
+        });
+        let processing_query = diesel::dsl::insert_into(crate::schema::processing_status::dsl::processing_status).values(crate::models::ProcessingStatus {
+            demo_id,
+            info: 0,
+        });
+        processing_query.execute(&mut db_con).await.unwrap();
+
+        Ok(axum::response::Redirect::to("/"))
+    }
+
+    #[tracing::instrument(skip(session))]
+    async fn info(session: UserSession, Path(demo_id): Path<i64>) -> Result<axum::response::Json<common::DemoInfo>, axum::http::StatusCode> {
+        tracing::info!("Get info for Demo: {:?}", demo_id);
+
+        let query = crate::schema::demo_info::dsl::demo_info.select(crate::models::DemoInfo::as_select()).filter(crate::schema::demo_info::dsl::demo_id.eq(demo_id));
+        let mut results: Vec<crate::models::DemoInfo> = query.load(&mut crate::db_connection().await).await.unwrap();
+
+        if results.len() != 1 {
+        tracing::error!("Expected only 1 match but got {} matches", results.len());
+        return Err(axum::http::StatusCode::INTERNAL_SERVER_ERROR);
+    }
+
+    let result = results.pop().unwrap();
+
+        Ok(axum::Json(common::DemoInfo {
+        id: result.demo_id,
+        map: result.map,
+    }))
+    }
diff --git a/backend/src/main.rs b/backend/src/main.rs
index c732b22..1e85413 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -68,7 +68,7 @@ async fn main() {
     let router = axum::Router::new()
         .nest("/api/", backend::api::router(base_analysis_tx))
         .layer(session_layer)
-        .nest_service("/", tower_http::services::ServeDir::new("frontend/dist/"));
+        .nest_service("/", tower_http::services::ServeDir::new("../frontend/dist/"));
 
     let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
     axum::serve(listener, router).await.unwrap();
diff --git a/common/src/lib.rs b/common/src/lib.rs
index 4154d27..e38be11 100644
--- a/common/src/lib.rs
+++ b/common/src/lib.rs
@@ -9,3 +9,9 @@ pub struct UserStatus {
     pub name: String,
     pub steamid: String,
 }
+
+#[derive(Debug, Clone, PartialEq, Eq, serde::Serialize, serde::Deserialize)]
+pub struct DemoInfo {
+    pub id: i64,
+    pub map: String,
+}
diff --git a/frontend/src/demo.rs b/frontend/src/demo.rs
index fbf3830..04a7138 100644
--- a/frontend/src/demo.rs
+++ b/frontend/src/demo.rs
@@ -1,5 +1,5 @@
 use leptos::*;
-use leptos_router::{Route, Routes, Outlet, A};
+use leptos_router::{Outlet, A};
 
 #[leptos::component]
 pub fn demo() -> impl leptos::IntoView {
@@ -8,16 +8,55 @@ pub fn demo() -> impl leptos::IntoView {
 
     let demo_info = create_resource(|| (), move |_| async move {
         let res = reqwasm::http::Request::get(&format!("/api/demos/{}/info", id())).send().await.unwrap();
-        dbg!(res.text().await);
-        0
+        res.json::<common::DemoInfo>().await.unwrap()
     });
 
-    view! {
-        <h2>Demo - { id }</h2>
+    let map = move || {
+        match demo_info.get() {
+            Some(v) => v.map.clone(),
+            None => String::new(),
+        }
+    };
 
-        <div>
-            <A href="">Scoreboard</A>
-            <A href="perround">Per Round</A>
+    let selected_tab = move || {
+        let loc = leptos_router::use_location();
+        let loc_path = loc.pathname.get();
+        let trailing = loc_path.split('/').last();
+        trailing.unwrap_or("/").to_owned()
+    };
+    
+    let style = stylers::style! {
+        "Demo",
+        .analysis_bar {
+            display: grid;
+            grid-template-columns: auto auto;
+            column-gap: 20px;
+
+            background-color: #2d2d2d;
+        }
+
+        .analysis_selector {
+            display: inline-block;
+        }
+
+        span {
+            display: inline-block;
+
+            padding: 1vw 1vh;
+            color: #d5d5d5;
+            background-color: #4d4d4d;
+        }
+        .current {
+            background-color: #5d5d5d;
+        }
+    };
+
+    view! {class = style,
+        <h2>Demo - { id } - { map }</h2>
+
+        <div class="analysis_bar">
+            <div class="analysis_selector" class:current=move || selected_tab() == "scoreboard"><A href="scoreboard"><span>Scoreboard</span></A></div>
+            <div class="analysis_selector" class:current=move || selected_tab() == "perround"><A href="perround"><span>Per Round</span></A></div>
         </div>
         <div>
             <Outlet/>
@@ -28,7 +67,25 @@ pub fn demo() -> impl leptos::IntoView {
 #[leptos::component]
 pub fn scoreboard() -> impl leptos::IntoView {
     view! {
-        <h3>Scoreboard</h3>
+        <h2>Scoreboard</h2>
+
+        <div>
+            <h3>Team 1</h3>
+            <table>
+                <tr>
+                    <th>Name</th>
+                </tr>
+            </table>
+        </div>
+
+        <div>
+            <h3>Team 2</h3>
+            <table>
+                <tr>
+                    <th>Name</th>
+                </tr>
+            </table>
+        </div>
     }
 }
 
diff --git a/frontend/src/lib.rs b/frontend/src/lib.rs
index bfcebf0..cfb0948 100644
--- a/frontend/src/lib.rs
+++ b/frontend/src/lib.rs
@@ -17,7 +17,9 @@ pub enum DemoUploadStatus {
 pub fn demo_list_entry(demo: common::BaseDemoInfo) -> impl leptos::IntoView {
     view! {
         <li>
-            <A href=format!("demo/{}", demo.id)>Demo: {demo.map} - {demo.id}</A>
+            <A href=format!("demo/{}/scoreboard", demo.id)>
+                <span>{demo.map} - {demo.id}</span>
+            </A>
         </li>
     }
 }
diff --git a/frontend/src/main.rs b/frontend/src/main.rs
index d78e987..807ab7a 100644
--- a/frontend/src/main.rs
+++ b/frontend/src/main.rs
@@ -29,6 +29,7 @@ fn main() {
                     <Route path="/" view=Homepage />
                     <Route path="/demo/:id" view=Demo>
                         <Route path="perround" view=frontend::demo::PerRound />
+                        <Route path="scoreboard" view=frontend::demo::Scoreboard />
                         <Route path="" view=frontend::demo::Scoreboard />
                     </Route>
                 </Routes>
diff --git a/frontend/src/navbar.rs b/frontend/src/navbar.rs
index 0de35c6..54ff517 100644
--- a/frontend/src/navbar.rs
+++ b/frontend/src/navbar.rs
@@ -57,6 +57,7 @@ pub fn top_bar(update_demo_visible: WriteSignal<DemoUploadStatus>) -> impl lepto
             font-size: 24px;
             padding: 0px;
             margin: 0px;
+            margin-left: 1vw;
         }
     };