diff --git a/nnb_main/data/nnb_main/function/tp_markers.mcfunction b/nnb_main/data/nnb_main/function/tp_markers.mcfunction
new file mode 100644
index 0000000..a89df54
--- /dev/null
+++ b/nnb_main/data/nnb_main/function/tp_markers.mcfunction
@@ -0,0 +1 @@
+$execute at @e[tag=$(Mapname)] run tp @e[tag=player_spawn,limit=1,sort=random] @e[tag=$(Mapname),limit=1,sort=random]
\ No newline at end of file
diff --git a/nnb_main/main.jmc b/nnb_main/main.jmc
index 2a434eb..aac02b9 100644
--- a/nnb_main/main.jmc
+++ b/nnb_main/main.jmc
@@ -187,7 +187,7 @@ function round_manager() {
     }}
 
 
-            // Load map
+            // Start Round
     if (nn_lobby:phase = 4) {
         if (nn_lobby:min < numbers:0) {
             scoreboard players set phase nn_lobby 5;
@@ -197,6 +197,12 @@ function round_manager() {
             // Since that doesn't work we need to use good old command blocks in the world - mvload @e[tag=sel];
             execute at @e[tag=load_maps] run setblock ~ ~ ~ minecraft:redstone_block;
 
+
+            // Important stuff
+            // /scoreboard players set started nn_lobby 0/1 - Starts the round
+            // /scoreboard players set disable nn_spawn 0/1 - Enables the spawner
+            // /scoreboard players set prepare nn_lobby 0/1 - Prepare phase
+
             scoreboard players set start_timer nn_lobby 0; // Stop the timer
     }}
 
@@ -206,6 +212,7 @@ function round_manager() {
 
 
 
+
 // 🔄️ No Votes - Reset Round
 function reset_round() {
     Text.tellraw(@a, "&<yellow> ⚠ | No Votes - Restarting");
@@ -374,7 +381,10 @@ function reset_stuff() {
 
 
 
-
+// 🪑 Setup chair
+function tp_markers() {
+    $execute at @e[tag=$(Mapname)] run tp @e[tag=player_spawn,limit=1,sort=random] @e[tag=$(Mapname),limit=1,sort=random];
+}
 
 
 // Simple function to create marker