diff --git a/stats.sty b/stats.sty
index 6078e1e815d1a11125008419fc628fa49ab0499f..72bcdf81ee4b367342a00e86464b269b6e017336 100644
--- a/stats.sty
+++ b/stats.sty
@@ -59,32 +59,6 @@
 % |_.__/|_|\___/ \___|_|\_\___/
 %                              
 %
-% This file makes stat blocks for monsters.
-% 
-% The writer feeds in something like this:
-% 
-% \npc{\M}{Patrick the Pyromanacer}
-% 
-% \person{0}% STRENGTH
-% {0}% DEXTERITY 
-% {0}% SPEED
-% {{0}% INTELLIGENCE
-% {0}% WITS
-% {0}}% CHARISMA
-% {0}% DR
-% {0}% COMBAT
-% {}% SKILLS
-% {Nothing}% EQUIPMENT
-% {}
-% 
-% The \person command takes various stats, and
-% inside that 'SKILLS' variable (variable no. 8),
-% we can add additional things, like
-% \knacks{\adrenalinesurge}.
-% 
-% Most of the rest of the commands deal with
-% properly calculating derived stats, like the TN
-% to hit the creature.
 
 
 \newtoggle{mind}
@@ -574,161 +548,6 @@
 \settoggle{snapCaster}{true}
 %
 
-%%%%%%%%%%% Person
-%
-\newcommand{\person}[9]{
-  \settoggle{creatureBox}{true}
-  \settoggle{mind}{true}
-  \clean
-
-  \setcounter{Strength}{#1}
-	\setcounter{hp}{#1}
-  \setcounter{Dexterity}{#2}
-  \setcounter{Speed}{#3}
-  \mind#4
-  \setcounter{att}{#6}
-  \setcounter{Combat}{#6}
-  \renewcommand{\skills}{#7}
-  \renewcommand{\equipment}{#8}
-
-  \iftoggle{verbose}{
-    \begin{tcolorbox}[
-      title={\npcsymbol\ \name},
-      before upper={\parindent0pt},
-      ornamented,
-      fontupper=\small,
-      halign=flush left,
-      left=5pt,
-      right=5pt,
-      top=0pt,
-      bottom=0pt,
-      ]
-
-    #9
-
-    \creaturestats
-
-    \computeStats
-
-    \skillsEtc
-
-    \derivedstats
-
-    \end{tcolorbox}
-
-  }{
-    \vspace{2em}
-    \noindent
-    \begin{minipage}{\linewidth}
-    \hrulefill\hspace{-0.15em}\raisebox{-1em}{\huge\npcsymbol}
-
-    \begin{center}\textbf{\large\name}\end{center}
-    #9%
-    \hphantom{\equipment}%
-    \vspace{-2em}
-    \derivedstats
-
-    \skillsEtc
-
-    \hrulefill
-    \end{minipage}
-  }
-
-
-  \iftoggle{personality}{
-    \begin{multicols}{2}
-    \raggedright
-    \textbf{Mannerism:}~\mannerism
-    \par
-    \textbf{Description:}~\NPCdescription
-    \par\pagebreak[3]
-    \textbf{Wants:}~\npcGoal
-    \ifdefempty{\npcQuote}{}{\par
-      \textbf{Quote:}~\textit{``\npcQuote''}
-    }
-    \end{multicols}
-
-    \settoggle{personality}{false}}%
-	{}
-  \settoggle{creatureBox}{false}
-  \setcounter{noAppearing}{1}
-  \setcounter{wounds}{0}
-  \renewcommand\abilities{}
-  \global\togglefalse{perfectArmour}
-  \renewcommand\npcQuote{}
-}
-
-\newcommand{\animal}[9]{
-  \settoggle{creatureBox}{true}
-	\settoggle{mind}{false}
-	\clean
-
-	\setcounter{Strength}{#1}
-	\setcounter{hp}{#1}
-	\setcounter{Dexterity}{#2}
-	\setcounter{Speed}{#3}
-	\setcounter{Wits}{#4}
-	\setcounter{dr}{#5}
-	\setcounter{Brawl}{#6}
-	\renewcommand{\skills}{#7}
-	\renewcommand{\abilities}{#8}
-
-  \iftoggle{verbose}{
-    \begin{tcolorbox}[
-      title={\npcsymbol\ \name},
-      before upper={\parindent0pt},
-      ornamented,
-      fontupper=\small,
-      halign=flush left,
-      left=5pt,
-      right=5pt,
-      top=0pt,
-      bottom=0pt,
-      ]
-
-    \iftoggle{personality}{
-
-    \begin{minipage}{\linewidth}
-    \textbf{Description:} \NPCdescription
-
-    \textbf{Mannerism:} \mannerism
-    \end{minipage}
-
-    \vspace{1em}
-
-    \settoggle{personality}{false}}%
-    
-    \creaturestats
-
-    #9
-
-    \computeStats
-    \skillsEtc%
-    \derivedstats%
-    \end{tcolorbox}%
-  }{
-    \vspace{2em}
-    \noindent
-    \begin{minipage}{\linewidth}
-    \hrulefill\hspace{-0.15em}\raisebox{-1em}{\huge\npcsymbol}
-
-    \begin{center}\textbf{\large\name}\end{center}
-    #9%
-    \hphantom{\abilities}%
-    \vspace{-2em}
-    \derivedstats
-    \skillsEtc
-
-    \hrulefill
-    \end{minipage}
-  }
-
-  \settoggle{creatureBox}{false}
-  \renewcommand\abilities{}
-  \global\togglefalse{perfectArmour}
-  \setcounter{wounds}{0}
-}
-
 \newcommand{\clean}{%
   \global\togglefalse{snapCaster}%
   \knacks{}%
@@ -765,45 +584,6 @@
   \end{tabularx}
 }
 
-\newcommand\skillsEtc{
-  \foreach \s in {Air,Earth,Fate,Fire,Water}%
-    {\ifnum\value{\s}>0 \addtocounter{mp}{3}\fi}
-
-\begin{tabular}{p{.18\textwidth}>{\raggedright\arraybackslash}p{.75\textwidth}}
-  \hiderowcolors
-
-  \iftoggle{verbose}{
-    \ent{Skills} &
-    \showSkills
-      \skills \\
-  }{}
-
-  \ifdefempty{\showKnacks}{}{
-    \ent{Knacks} & \showKnacks \\
-  }
-
-  \ifnum\value{mp}>0
-    \ent{Spheres} &
-    \foreach \s in {Air,Earth,Fate,Fire,Water}%
-      {\ifnum\value{\s}>0 \s~\arabic{\s}, \fi}
-    \\
-  \fi
-
-	\iftoggle{mind}%
-    {%
-    \ifdefempty{\equipment}{}
-    {
-      \setcounter{attackXPtotal}{\value{Charisma}}% Must store Charisma while talisman shows spells
-      \ent{Equipment} & \equipment, \weaponName, \armourName \\
-    }
-    }%
-    {}
-
-  \ifdefempty{\abilities}{}%
-    {\ent{Abilities} & \abilities}
-	\mods
-\end{tabular}
-}
 
 %%
 %%
diff --git a/test.tex b/test.tex
index 7251d9ff34f03e0e66787323115c08417a1d22f2..cef51bb1ce80860e52007c2b9ec17fc53adeef3d 100644
--- a/test.tex
+++ b/test.tex
@@ -21,21 +21,20 @@ This is a test document, to make sure new code works before sticking it in a pro
 Current day should equal \arabic{r4b}.
 That means the season in Fenestra is \showSeason, which means it's \showTemperature.
 
-\npc{\M}{Random Guy}
-\person{1}% STRENGTH
-{1}% DEXTERITY 
-{1}% SPEED
-{{-2}% INTELLIGENCE
-{-1}% WITS
-{0}}% CHARISMA
-{0}% DR
-{1}% COMBAT
-{Academics 1, Wyldcrafting 1
-}% SKILLS
-{\Dagger, pieces of string}% EQUIPMENT
-{
-  \setcounter{Fate}{2}
-}
+\Person{\npc{\M\Hu}{Random Guy}}%
+  {{1}{1}{0}}% BODY
+  {{-1}{0}{-1}}% MIND
+  {%
+    \set{Caving}{r2c}
+    \set{Combat}{2}
+    \set{Crafts}{r2c}
+    \set{Tactics}{1}
+    \spear
+    \partialchain
+  }% SKILLS
+  {}% KNACKS
+  {\lootMedium}% EQUIPMENT
+  {}% ABILITIES
 
 \input{spells/Air1.tex}