diff --git a/WorldDawnSimpleTest/.obsidian/workspace.json b/WorldDawnSimpleTest/.obsidian/workspace.json
index 07d6c04..608fa4b 100644
--- a/WorldDawnSimpleTest/.obsidian/workspace.json
+++ b/WorldDawnSimpleTest/.obsidian/workspace.json
@@ -11,13 +11,14 @@
             "id": "8b8db8934e706fc6",
             "type": "leaf",
             "state": {
-              "type": "bases",
+              "type": "markdown",
               "state": {
-                "file": "wiki/weapons/Items.base",
-                "viewName": "Weapons"
+                "file": "wiki/weapons/Sword.md",
+                "mode": "source",
+                "source": false
               },
-              "icon": "lucide-table",
-              "title": "Items"
+              "icon": "lucide-file",
+              "title": "Sword"
             }
           }
         ]
@@ -184,11 +185,10 @@
   },
   "active": "8b8db8934e706fc6",
   "lastOpenFiles": [
-    "wiki/weapons/Axt.md",
     "wiki/weapons/Spear.md",
+    "wiki/weapons/Items.base",
+    "wiki/weapons/Axt.md",
     "wiki/weapons/Sword.md",
-    "wiki/weapons/Items.base",
-    "wiki/weapons/Items.base",
     "wiki/costtables/Attribute A.md",
     "wiki/costtables/CostTable.base",
     "wiki/races/Races.base",
diff --git a/WorldDawnSimpleTest/wiki/weapons/Spear.md b/WorldDawnSimpleTest/wiki/weapons/Spear.md
index 80648ca..fc8ac3e 100644
--- a/WorldDawnSimpleTest/wiki/weapons/Spear.md
+++ b/WorldDawnSimpleTest/wiki/weapons/Spear.md
@@ -4,6 +4,9 @@ weapon: true
 item.cost: "500"
 weapon.damage: 3W4 + 1
 item.slots: 3
+weapon.technique: Lanzen
+weapon.at: "+1"
+weapon.pa: "-2"
 ---
 
 # Spear
diff --git a/WorldDawnSimpleTest/wiki/weapons/Sword.md b/WorldDawnSimpleTest/wiki/weapons/Sword.md
index 1715bc7..ec6459a 100644
--- a/WorldDawnSimpleTest/wiki/weapons/Sword.md
+++ b/WorldDawnSimpleTest/wiki/weapons/Sword.md
@@ -4,6 +4,9 @@ weapon: true
 weapon.damage: 2W6 + 2 + QS
 item.cost: "750"
 item.slots: 2
+weapon.technique: Schwerter
+weapon.at: "+2"
+weapon.pa: "+1"
 ---
 
 # Sword
diff --git a/tools/charactercreation/characterdata.xml b/tools/charactercreation/characterdata.xml
index b946b2c..2541ff7 100644
--- a/tools/charactercreation/characterdata.xml
+++ b/tools/charactercreation/characterdata.xml
@@ -190,6 +190,10 @@
                         <String Name="name"/>
                         <Int Name="cost"/>
                         <String Name="damage"/>
+                        <Int Name="qs"/>
+                        <String Name="fighttechnique"/>
+                        <String Name="at"/>
+                        <String Name="pa"/>
                     </Variables>
                 </List>
             </Variables>
diff --git a/tools/charactercreation/characterpdf.xml b/tools/charactercreation/characterpdf.xml
index 34b57f6..699a6a9 100644
--- a/tools/charactercreation/characterpdf.xml
+++ b/tools/charactercreation/characterpdf.xml
@@ -3930,6 +3930,67 @@
                                 </TableLayout>
                             </Content>
                         </TableLayout>
+                        <TableLayout>
+                            <Columns>8</Columns>
+                            <Content>
+
+                                <Label Styles="TalentTableHeader">
+                                    <Text>"Name"</Text>
+                                </Label>
+                                <Label Styles="TalentTableHeader">
+                                    <Text>"QS M"</Text>
+                                </Label>
+                                <Label Styles="TalentTableHeader">
+                                    <Text>"QS A"</Text>
+                                </Label>
+                                <Label Styles="TalentTableHeader">
+                                    <Text>"Kampftechnik"</Text>
+                                </Label>
+                                <Label Styles="TalentTableHeader">
+                                    <Text>"Schaden"</Text>
+                                </Label>
+                                <Label Styles="TalentTableHeader">
+                                    <Text>"AT"</Text>
+                                </Label>
+                                <Label Styles="TalentTableHeader">
+                                    <Text>"PA"</Text>
+                                </Label>
+                                <Label Styles="TalentTableHeader">
+                                    <Text>"Preis"</Text>
+                                </Label>
+
+                                <Foreach>
+                                    <List>[data.character.items.melee]</List>
+                                    <Content>
+                                        <Label>
+                                            <Text>[name]</Text>
+                                        </Label>
+                                        <Label>
+                                            <Text>[qs]</Text>
+                                        </Label>
+                                        <Label>
+                                            <Text>""</Text>
+                                        </Label>
+                                        <Label>
+                                            <Text>[fighttechnique]</Text>
+                                        </Label>
+                                        <Label>
+                                            <Text>[damage]</Text>
+                                        </Label>
+                                        <Label>
+                                            <Text>[at]</Text>
+                                        </Label>
+                                        <Label>
+                                            <Text>[pa]</Text>
+                                        </Label>
+                                        <Label>
+                                            <Text>[cost]</Text>
+                                        </Label>
+                                    </Content>
+                                </Foreach>
+
+                            </Content>
+                        </TableLayout>
                     </Content>
                 </ColumnLayout>
             </Body>
diff --git a/tools/charactercreation/charactertool.xml b/tools/charactercreation/charactertool.xml
index c2129b9..15ecce9 100644
--- a/tools/charactercreation/charactertool.xml
+++ b/tools/charactercreation/charactertool.xml
@@ -4240,6 +4240,10 @@
                             <Name>"Name"</Name>
                             <Value>[name]</Value>
                         </NameValueDisplay>
+                        <NameValueDisplay>
+                            <Name>"QS"</Name>
+                            <Value>[qs]</Value>
+                        </NameValueDisplay>
                         <NameValueDisplay>
                             <Name>"Kosten"</Name>
                             <Value>[cost]</Value>
@@ -4257,30 +4261,40 @@
                             <Text>"+QS"</Text>
                             <OnClick>
                                 <Action>
-                                    <If>[cost] &lt; 10000</If>
+                                    <If>[qs] &lt; 6</If>
                                     <Do>[data.character.control.coins] - [cost]</Do>
                                     <Output>[data.character.control.coins]</Output>
                                 </Action>
                                 <Action>
-                                    <If>[cost] &lt; 10000</If>
+                                    <If>[qs] &lt; 6</If>
                                     <Do>[cost] * 2</Do>
                                     <Output>[cost]</Output>
                                 </Action>
+                                <Action>
+                                    <If>[qs] &lt; 6</If>
+                                    <Do>[qs] + 1</Do>
+                                    <Output>[qs]</Output>
+                                </Action>
                             </OnClick>
                         </Button>
                         <Button>
                             <Text>"-QS"</Text>
                             <OnClick>
                                 <Action>
-                                    <If>[cost] &gt; 1</If>
+                                    <If>[qs] &gt; 0</If>
                                     <Do>[cost] / 2</Do>
                                     <Output>[cost]</Output>
                                 </Action>
                                 <Action>
-                                    <If>[cost] &gt; 1</If>
+                                    <If>[qs] &gt; 0</If>
                                     <Do>[data.character.control.coins] + [cost]</Do>
                                     <Output>[data.character.control.coins]</Output>
                                 </Action>
+                                <Action>
+                                    <If>[qs] &lt; 0</If>
+                                    <Do>[qs] - 1</Do>
+                                    <Output>[qs]</Output>
+                                </Action>
                             </OnClick>
                         </Button>
                     </Buttons>
@@ -4300,6 +4314,22 @@
                             <Property>[weapon.damage]</Property>
                             <Output>[damage]</Output>
                         </PropertyOutput>
+                        <PropertyOutput>
+                            <Property>1</Property>
+                            <Output>[qs]</Output>
+                        </PropertyOutput>
+                        <PropertyOutput>
+                            <Property>[weapon.technique]</Property>
+                            <Output>[fighttechnique]</Output>
+                        </PropertyOutput>
+                        <PropertyOutput>
+                            <Property>[weapon.at]</Property>
+                            <Output>[at]</Output>
+                        </PropertyOutput>
+                        <PropertyOutput>
+                            <Property>[weapon.pa]</Property>
+                            <Output>[pa]</Output>
+                        </PropertyOutput>
                     </PropertyOutputs>
                     <Columns>
                         <NameValueDisplay>