diff --git a/Mausritter - First Campaign/.obsidian/workspace.json b/Mausritter - First Campaign/.obsidian/workspace.json
index 115ee7d..775445b 100644
--- a/Mausritter - First Campaign/.obsidian/workspace.json	
+++ b/Mausritter - First Campaign/.obsidian/workspace.json	
@@ -13,15 +13,58 @@
             "state": {
               "type": "markdown",
               "state": {
-                "file": "Mapa/Dungeony/Pavoučí hnízdo/Pavoučí hnízdo.md",
+                "file": "Blatník Zelenkavý.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Blatník Zelenkavý"
+            }
+          },
+          {
+            "id": "fb44433fe3abe0e4",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "Mapa/Oblasti/Pařez.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Pařez"
+            }
+          },
+          {
+            "id": "288799c07fa25079",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "NPCs/Rasy/Myši.md",
                 "mode": "preview",
                 "source": false
               },
               "icon": "lucide-file",
-              "title": "Pavoučí hnízdo"
+              "title": "Myši"
+            }
+          },
+          {
+            "id": "e2c787b96da7c809",
+            "type": "leaf",
+            "state": {
+              "type": "markdown",
+              "state": {
+                "file": "NPCs/Frakce/Žabí armáda.md",
+                "mode": "source",
+                "source": false
+              },
+              "icon": "lucide-file",
+              "title": "Žabí armáda"
             }
           }
-        ]
+        ],
+        "currentTab": 2
       }
     ],
     "direction": "vertical"
@@ -94,7 +137,7 @@
             "state": {
               "type": "backlink",
               "state": {
-                "file": "Mapa/Dungeony/Pavoučí hnízdo/Pavoučí hnízdo.md",
+                "file": "NPCs/Rasy/Myši.md",
                 "collapseAll": false,
                 "extraContext": false,
                 "sortOrder": "alphabetical",
@@ -104,7 +147,7 @@
                 "unlinkedCollapsed": true
               },
               "icon": "links-coming-in",
-              "title": "Backlinks for Pavoučí hnízdo"
+              "title": "Backlinks for Myši"
             }
           },
           {
@@ -113,12 +156,12 @@
             "state": {
               "type": "outgoing-link",
               "state": {
-                "file": "Mapa/Dungeony/Pavoučí hnízdo/Pavoučí hnízdo.md",
+                "file": "NPCs/Rasy/Myši.md",
                 "linksCollapsed": false,
                 "unlinkedCollapsed": true
               },
               "icon": "links-going-out",
-              "title": "Outgoing links from Pavoučí hnízdo"
+              "title": "Outgoing links from Myši"
             }
           },
           {
@@ -142,13 +185,13 @@
             "state": {
               "type": "outline",
               "state": {
-                "file": "Mapa/Dungeony/Pavoučí hnízdo/Pavoučí hnízdo.md",
+                "file": "NPCs/Rasy/Myši.md",
                 "followCursor": false,
                 "showSearch": false,
                 "searchQuery": ""
               },
               "icon": "lucide-list",
-              "title": "Outline of Pavoučí hnízdo"
+              "title": "Outline of Myši"
             }
           },
           {
@@ -179,11 +222,17 @@
       "obsidian-excalidraw-plugin:New drawing": false
     }
   },
-  "active": "6fcbb32b1ce5f83f",
+  "active": "288799c07fa25079",
   "lastOpenFiles": [
+    "NPCs/!Přehled.md",
+    "NPCs/Frakce/Žabí armáda.md",
+    "_meta/templates/Faction template.md",
+    "Mapa/Oblasti/Pařez.md",
+    "Blatník Zelenkavý.md",
+    "NPCs/Čedar Trnka.md",
+    "Mapa/Dungeony/Pavoučí hnízdo/Pavoučí hnízdo.md",
     "Mapa/Dungeony/Pavoučí hnízdo/Místnosti/Pavoučí hnízdo - Zatopená místnost.md",
     "Mapa/Dungeony/Pavoučí hnízdo/Místnosti/Pavoučí hnízdo - Strmá chodba.md",
-    "Mapa/Dungeony/Pavoučí hnízdo/Pavoučí hnízdo.md",
     "Mapa/Dungeony/Pavoučí hnízdo/Místnosti/Pavoučí hnízdo - Starý sklad.md",
     "Mapa/Dungeony/Pavoučí hnízdo/Místnosti/Pavoučí hnízdo - Spodní vchod.md",
     "Mapa/Dungeony/Pavoučí hnízdo/Místnosti/Pavoučí hnízdo - Skladiště smoly.md",
@@ -199,18 +248,12 @@
     "Mapa/Dungeony/Pavoučí hnízdo",
     "Canvas/Pavoučí hnízdo - diagram.canvas",
     "Untitled 1.md",
-    "Untitled.md",
     "Excalidraw",
     "_meta/templates/Location template.md",
     "Mapa/Oblasti/Malý Pomyšlov.md",
     "NPCs/Rulík Čepička.md",
-    "NPCs/Čedar Trnka.md",
-    "Mapa/Oblasti/Pařez.md",
     "_meta/templates/POI template.md",
     "Mapa/Přehled.md",
-    "Mapa/Oblasti/Farma.md",
-    "Mapa/Oblasti/Východní pláně.md",
-    "Kampaň/Kapitola 1.md",
     "Canvas",
     "Kampaň",
     "Lore",
diff --git a/Mausritter - First Campaign/Blatník Zelenkavý.md b/Mausritter - First Campaign/Blatník Zelenkavý.md
new file mode 100644
index 0000000..4150998
--- /dev/null
+++ b/Mausritter - First Campaign/Blatník Zelenkavý.md	
@@ -0,0 +1,27 @@
+---
+Name: Blatník Zelenkavý
+Description: Pěšák žabí armády, kterého unesl Pavouk
+LocationId: 4
+Race: Žába
+Faction: Žabí armáda
+tags:
+  - NPC
+---
+## INFO
+### Funkce / Povolání / Postavení
+### Vzhled
+### Povaha
+### Vztahy
+| NPC | Vztah |
+| --- | ----- |
+|     |       |
+### Cíle
+___
+## Poznámky
+___
+## Stat block
+| HP  | STR | DEX | WILL |
+| --- | --- | --- | ---- |
+|     |     |     |      |
+### Útoky
+___
\ No newline at end of file
diff --git a/Mausritter - First Campaign/NPCs/!Přehled.md b/Mausritter - First Campaign/NPCs/!Přehled.md
new file mode 100644
index 0000000..e7da5e4
--- /dev/null
+++ b/Mausritter - First Campaign/NPCs/!Přehled.md	
@@ -0,0 +1,19 @@
+# NPC
+```dataview
+TABLE WITHOUT ID
+	("[[" + file.name + "|" + Name + "]]") As Jméno,
+	Race AS Rasa,
+	Faction AS Frakce,
+	Description AS Popis,
+	LocationId AS "ID lokace"
+FROM #NPC
+WHERE !contains(file.name, "template")
+```
+# Factions
+```dataview
+TABLE WITHOUT ID
+	("[[" + file.name + "|" + Name + "]]") As Název,
+	Name, Description
+FROM #faction
+WHERE !contains(file.name, "template")
+```
\ No newline at end of file
diff --git a/Mausritter - First Campaign/NPCs/Frakce/Žabí armáda.md b/Mausritter - First Campaign/NPCs/Frakce/Žabí armáda.md
new file mode 100644
index 0000000..ff11a26
--- /dev/null
+++ b/Mausritter - First Campaign/NPCs/Frakce/Žabí armáda.md	
@@ -0,0 +1,27 @@
+---
+Name: Žabí armáda
+Description: Invazní síly sousedního žabího království
+tags:
+  - faction
+---
+# Info
+## Název
+## Popis
+## Zdroje
+## Cíle
+___
+# NPCs
+```dataview
+TABLE without id 
+	file.link AS Soubory,
+	Name as Jméno,
+	Race AS Rasa,
+	Faction AS Frakce,
+	LocationId AS "ID lokace"
+FROM #NPC 
+WHERE Faction = this.Name
+SORT LocationId ASC
+```
+___
+# Poznámky
+___
\ No newline at end of file
diff --git a/Mausritter - First Campaign/_meta/templates/Faction template.md b/Mausritter - First Campaign/_meta/templates/Faction template.md
index 0c147ea..26b21e0 100644
--- a/Mausritter - First Campaign/_meta/templates/Faction template.md	
+++ b/Mausritter - First Campaign/_meta/templates/Faction template.md	
@@ -1,13 +1,16 @@
 ---
-Name:
+Name: 
+Description: 
+tags:
+  - faction
 ---
-## Info
-### Název
-### Popis
-### Zdroje
-### Cíle
+# Info
+## Název
+## Popis
+## Zdroje
+## Cíle
 ___
-## NPCs
+# NPCs
 ```dataview
 TABLE without id 
 	file.link AS Soubory,
@@ -20,5 +23,5 @@ WHERE Faction = this.Name
 SORT LocationId ASC
 ```
 ___
-## Poznámky
+# Poznámky
 ___
\ No newline at end of file