diff --git a/CS.tex b/CS.tex
index d4eaef5998ab4366001e5893cc2913ede293a36d..a0100b13057d9a4cafaaac539aa342f301d7fda2 100644
--- a/CS.tex
+++ b/CS.tex
@@ -34,9 +34,6 @@
 
 \thispagestyle{empty}
 % reset damage so it calculates properly
-\setcounter{damage}{0}
-\setcounter{weaponBonus}{0}
-\setcounter{knacks}{0}
 
 %----
   \posterbox[
@@ -175,7 +172,7 @@ circle label/.style = {
       
     \iftoggle{examplecharacter}{
       \hline
-        \ifdefempty{\characterWeapon}{
+        \ifdefempty{\weaponName}{
           \\
           \\
         }{
@@ -197,7 +194,7 @@ circle label/.style = {
       \hiderowcolors
       \textbf{Armour} & \textbf{\Glsentrytext{dr}} & \textbf{Covering} & \textbf{Weight} \\
       \iftoggle{examplecharacter}{
-        \ifdefempty{\characterArmour}{}{
+        \ifdefempty{\armourName}{}{
           \sffamily\characterArmour\armourName & \sffamily\arabic{armourDR} & \sffamily\arabic{covering} & \sffamily\arabic{armourWeight} \\
         }
       }{
@@ -229,24 +226,18 @@ circle label/.style = {
       &
       \iftoggle{examplecharacter}%
       {%
-        \addtocounter{Speed}{3}%
-        \sffamily\arabic{Speed}%
+        \sffamily\arabic{ap}%
       }%
       {\underline{\hspace{2em}}}
       &
       \iftoggle{examplecharacter}{\sffamily}{}2D6%
       \iftoggle{examplecharacter}% Bonus
       {%
-      \addtocounter{Melee}{\value{Dexterity}}%
-      \addtocounter{Melee}{\value{weaponBonus}}%
-        \sffamily\absNum{Melee}%
+        \sffamily\absNum{att}%
       }%
       {\underline{\hspace{2em}}} &
       \iftoggle{examplecharacter}% Damage
       {%
-        \addtocounter{damage}{\value{Strength}}%
-        \addtocounter{damage}{\value{weaponDamage}}%
-        \addtocounter{damage}{4}%
         \sffamily\dmg{damage}%
       }%
       {
@@ -316,7 +307,7 @@ circle label/.style = {
   }{%
     \hint{\glsentrytext{tn} to remove: \weeline}
     \par
-    \iftoggle{examplecharacter}{\sffamily\characterEquipment\vspace{12em}}{%
+    \iftoggle{examplecharacter}{\sffamily\equipment\vspace{12em}}{%
       \vspace{1em}%
       \Repeat{5}{%
         {\noindent\Repeat{5}{\Square} \lineDots}%
@@ -357,9 +348,7 @@ circle label/.style = {
   rowspan=3}{%
   \setlength{\parskip}{0mm}%
     \iftoggle{examplecharacter}{
-      \sffamily\knackOne
-
-      \sffamily\knackTwo
+      \sffamily\Knacks
     }{%
       \vspace{2em}%
       \lineDots[4]
diff --git a/backpage.tex b/backpage.tex
index e1e2a97c7a97dec65d190532dd56f11aef2cdd5e..df4bae342143ae5617e83c93b9a3119f28b2b586 100644
--- a/backpage.tex
+++ b/backpage.tex
@@ -24,7 +24,17 @@
 
 
 \iftoggle{examplecharacter}{
-  \charSpellList
+  \ifdefempty{\charSpells}{}{
+    \subsubsection*{Spells}
+    
+    Roll \iftoggle{snapCaster}{Wits}{Charisma} + \textit{Skill} to cast.
+    Spells cost a number of \glsfmtlongpl{mp} equal to their level `Requirements', and a number of \glsfmtlongpl{ap} equal to their Cost\iftoggle{snapCaster}{}{ +1}.
+
+    \begin{multicols}{2}
+      \charSpells
+    \end{multicols}
+  }
+
 }{
   \vspace{1em}
   \lineDots[26]
diff --git a/csCommands.sty b/csCommands.sty
index 261d5c5615bc69199112e0bd3b92413ff05bd7c2..89164834a90fbf97ed8e0468029a10a380bca701 100644
--- a/csCommands.sty
+++ b/csCommands.sty
@@ -90,6 +90,7 @@
 \newcommand\knackTwo{}
 
 \newcommand\charSpellList{}
+\newcommand\charSpells{}
 
 
 %%%%% Show Dots Commands %%%%%
@@ -196,3 +197,25 @@
   \input{config/CS.tex}
   \input{config/backpage.tex}
 }
+
+\newenvironment{filledCS}[9]{
+  \resetCS
+  \settoggle{examplecharacter}{true}
+  \settoggle{allyCharacter}{true}
+  \renewcommand\name{#1}
+  \renewcommand\race{#2}
+  \renewcommand\concept{#3}
+  \renewcommand\code{#4}
+  \traits{}%
+    {#5}%
+    {#6}%
+    {%
+      #7
+    }%
+    {#8}% SKILLS
+    {#9}% KNACKS
+    {}% ABILITIES
+}{
+  \input{config/CS.tex}
+  \input{config/backpage.tex}
+}
diff --git a/layout.sty b/layout.sty
index c12e6f3e3c2ce9145f52260e06ee6182df6b975e..be410ffe18ea9ef276add97a0f1d4e2c35c145ab 100644
--- a/layout.sty
+++ b/layout.sty
@@ -831,7 +831,17 @@ bookmarks=true]%
 
     \newcounter{track}
     \setcounter{track}{18}
-    \newcommand{\tracker}{\center\noindent\iftoggle{examplecharacter}{\iftoggle{genExamples}{}{\ifnum\value{track}=\value{Speed}$\Rightarrow$ \fi}}{}\arabic{track}\addtocounter{track}{-1}\vspace{.54cm}
+    \newcommand{\tracker}{%
+    \center\noindent%
+      \iftoggle{examplecharacter}{%
+        \iftoggle{genExamples}{}{%
+          \ifnum\value{track}=\value{ap}%
+            $\Rightarrow$ %
+          \fi%
+        }}{}%
+        \arabic{track}%
+        \addtocounter{track}{-1}%
+        \vspace{.54cm}
 
     }