diff --git a/less/character-sheet.less b/less/character-sheet.less
index 3e9e91a..5476b26 100644
--- a/less/character-sheet.less
+++ b/less/character-sheet.less
@@ -340,7 +340,7 @@
         position: absolute;
         right: 0px;
         height: 5px;
-        bottom: 496px;
+        bottom: 511px;
         background-color: #5e0000;
     }
 
@@ -633,4 +633,9 @@
     .fairy {
         background-color: #D685AD;
     }
+
+    .charInfoBox {
+        display: flex;
+        flex-direction: column;
+    }
 }
diff --git a/modules/sheets/pokemonCharacterSheet.js b/modules/sheets/pokemonCharacterSheet.js
index 9c8c70a..2c08bb5 100644
--- a/modules/sheets/pokemonCharacterSheet.js
+++ b/modules/sheets/pokemonCharacterSheet.js
@@ -84,6 +84,8 @@ export default class pokemonCharacterSheet extends api.HandlebarsApplicationMixi
             context.system.spArmorClass += 2;
         }
 
+        context.defenses = ["1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1", "1"]
+
         context.system.speed = 30+5*context.system.stats.speed;
 
         return context;
diff --git a/pokemon.css b/pokemon.css
index 5e8dc8a..d43901c 100644
--- a/pokemon.css
+++ b/pokemon.css
@@ -290,7 +290,7 @@
   position: absolute;
   right: 0px;
   height: 5px;
-  bottom: 496px;
+  bottom: 511px;
   background-color: #5e0000;
 }
 .pokemon.sheet.characterSheet nav {
@@ -529,3 +529,7 @@
 .pokemon.sheet.characterSheet .fairy {
   background-color: #D685AD;
 }
+.pokemon.sheet.characterSheet .charInfoBox {
+  display: flex;
+  flex-direction: column;
+}
diff --git a/pokemon.js b/pokemon.js
index 07cda65..1b7da73 100644
--- a/pokemon.js
+++ b/pokemon.js
@@ -52,6 +52,8 @@ function preloadHandlebarsTemplates() {
 
 function registerHandlebarsHelpers() {
 
+    Handlebars.registerHelper("short", function(s1) {return s1.slice(0,3).toUpperCase()});
+
     Handlebars.registerHelper("equals", function(v1, v2) { console.log("v1: "+v1+"\nv2: "+v2); return (v1 === v2)});
 
     Handlebars.registerHelper("contains", function(element, search) { return (element.includes(search))});
diff --git a/system.json b/system.json
index 029b6c8..bfaa0d8 100644
--- a/system.json
+++ b/system.json
@@ -1,5 +1,5 @@
 {
-    "version": "0.1.6",
+    "version": "0.1.7",
     "id": "pokemon",
     "title": "Pokémon TTRPG",
     "description": "A Pokémon TTRPG",
diff --git a/system.zip b/system.zip
index 85b51d5..62e1ccd 100644
Binary files a/system.zip and b/system.zip differ
diff --git a/templates/partials/character-sheet-character.hbs b/templates/partials/character-sheet-character.hbs
index f690cbe..319821f 100644
--- a/templates/partials/character-sheet-character.hbs
+++ b/templates/partials/character-sheet-character.hbs
@@ -1,58 +1,74 @@
-<div class="statsBox">
-    <div class="row">
-        <div class="charHex statHex"><span class="charHexHead">Attack</span></br><input class="charHexValue invisibleInput" type="number" name="system.stats.attack" value="{{system.stats.attack}}"></div>
-        <div class="categorySelectBox">
-            <div class="row">
-                <label class="container">
-                    <input class="radioButton" type="radio" name="system.attackCategory" value="Physical"
-                            {{#if (equals system.attackCategory "Physical")}}checked{{/if}}>
-                    <span class="checkmark"></span>
-                    Physical
-                </label>
+<div class="charInfoBox">
+    <div class="statsBox">
+        <div class="row">
+            <div class="charHex statHex"><span class="charHexHead">Attack</span></br><input class="charHexValue invisibleInput" type="number" name="system.stats.attack" value="{{system.stats.attack}}"></div>
+            <div class="categorySelectBox">
+                <div class="row">
+                    <label class="container">
+                        <input class="radioButton" type="radio" name="system.attackCategory" value="Physical"
+                                {{#if (equals system.attackCategory "Physical")}}checked{{/if}}>
+                        <span class="checkmark"></span>
+                        Physical
+                    </label>
+                </div>
+                <div class="row">
+                    <label class="container">
+                        <input class="radioButton" type="radio" name="system.attackCategory" value="Special"
+                                {{#if (equals system.attackCategory "Special")}}checked{{/if}}>
+                        <span class="checkmark"></span>
+                        Special
+                    </label>
+                </div>
+                {{!-- <select name="system.attackCategory">
+                    <option value="Physical" {{#if (eq system.attackCategory "Physical")}}selected{{/if}}>Physical</option>
+                    <option value="Special" {{#if (eq system.attackCategory "Special")}}selected{{/if}}>Special</option>
+                </select> --}}
             </div>
-            <div class="row">
-                <label class="container">
-                    <input class="radioButton" type="radio" name="system.attackCategory" value="Special"
-                            {{#if (equals system.attackCategory "Special")}}checked{{/if}}>
-                    <span class="checkmark"></span>
-                    Special
-                </label>
-            </div>
-            {{!-- <select name="system.attackCategory">
-                <option value="Physical" {{#if (eq system.attackCategory "Physical")}}selected{{/if}}>Physical</option>
-                <option value="Special" {{#if (eq system.attackCategory "Special")}}selected{{/if}}>Special</option>
-            </select> --}}
         </div>
-    </div>
-    <div class="row">
-        <div class="charHex statHex"><span class="charHexHead">Defense</span></br><input class="charHexValue invisibleInput" type="number" name="system.stats.defense" value="{{system.stats.defense}}"></div>
-        <div class="categorySelectBox">
-            <div class="row">
-                <label class="container">
-                    <input class="radioButton" type="radio" name="system.defenseCategory" value="Physical"
-                            {{#if (equals system.defenseCategory "Physical")}}checked{{/if}}>
-                    <span class="checkmark"></span>
-                    Physical
-                </label>
+        <div class="row">
+            <div class="charHex statHex"><span class="charHexHead">Defense</span></br><input class="charHexValue invisibleInput" type="number" name="system.stats.defense" value="{{system.stats.defense}}"></div>
+            <div class="categorySelectBox">
+                <div class="row">
+                    <label class="container">
+                        <input class="radioButton" type="radio" name="system.defenseCategory" value="Physical"
+                                {{#if (equals system.defenseCategory "Physical")}}checked{{/if}}>
+                        <span class="checkmark"></span>
+                        Physical
+                    </label>
+                </div>
+                <div class="row">
+                    <label class="container">
+                        <input class="radioButton" type="radio" name="system.defenseCategory" value="Special"
+                                {{#if (equals system.defenseCategory "Special")}}checked{{/if}}>
+                        <span class="checkmark"></span>
+                        Special
+                    </label>
+                </div>
+                {{!-- <select name="system.defenseCategory">
+                    <option value="Physical" {{#if (eq system.defenseCategory "Physical")}}selected{{/if}}>Physical</option>
+                    <option value="Special" {{#if (eq system.defenseCategory "Special")}}selected{{/if}}>Special</option>
+                </select> --}}
             </div>
-            <div class="row">
-                <label class="container">
-                    <input class="radioButton" type="radio" name="system.defenseCategory" value="Special"
-                            {{#if (equals system.defenseCategory "Special")}}checked{{/if}}>
-                    <span class="checkmark"></span>
-                    Special
-                </label>
-            </div>
-            {{!-- <select name="system.defenseCategory">
-                <option value="Physical" {{#if (eq system.defenseCategory "Physical")}}selected{{/if}}>Physical</option>
-                <option value="Special" {{#if (eq system.defenseCategory "Special")}}selected{{/if}}>Special</option>
-            </select> --}}
         </div>
-    </div>
-    <div class="row">
-        <div class="charHex statHex"><span class="charHexHead">Speed</span></br><input class="charHexValue invisibleInput" type="number" name="system.stats.speed" value="{{system.stats.speed}}"></div>
-    </div>
-    <div class="row">
-        <div class="charHex statHex"><span class="charHexHead">HP</span></br><input class="charHexValue invisibleInput" type="number" name="system.stats.hp" value="{{system.stats.hp}}"></div>
+        <div class="row">
+            <div class="charHex statHex"><span class="charHexHead">Speed</span></br><input class="charHexValue invisibleInput" type="number" name="system.stats.speed" value="{{system.stats.speed}}"></div>
+        </div>
+        <div class="row">
+            <div class="charHex statHex"><span class="charHexHead">HP</span></br><input class="charHexValue invisibleInput" type="number" name="system.stats.hp" value="{{system.stats.hp}}"></div>
+        </div>
+        <div class="defenseBox">
+            <table class="defenseTable">
+                <tr>
+                    {{#each types}}
+                        <th>{{this}}</th>
+                    {{/each}}
+                </tr>
+                <tr>
+                    {{#each defenses}}
+                        <th>{{this}}</th>
+                    {{/each}}
+                </tr>
+            </table>
+        </div>
     </div>
 </div>
\ No newline at end of file