diff --git a/star-wars-talents.sty b/star-wars-talents.sty
index 94e9cef..dfd2ed8 100644
--- a/star-wars-talents.sty
+++ b/star-wars-talents.sty
@@ -157,6 +157,9 @@
   {clanker killer}:{
     \swtalent{Clanker Killer}{Before rolling a combat check that targets a droid, remove \boost{} up to the character's rank in Clanker Killer from the pool and add an equal number of \success{} or \advantage{} to the results.}{true}{}
   },%
+  {clever solution}:{
+    \swtalent{Clever Solution}{Once per session, make one skill check using Cunning rather than the characteristic linked to that skill}{true}{}
+  },%
   {codebreaker}:{
     \swtalent{Codebreaker}{Remove \setback{} per rank of Codebreaker from checks to break codes or decrypt communications. Decrease difficulty of checks to break codes or decrypt communications by 1.}{}{}
   },%
@@ -457,6 +460,9 @@
   {invigorate}:{
     \swtalent{Invigorate}{Once per encounter, may add \force{} to a check using Brawn or Agility made by an ally in short range. \lightforce{} add \success{} and \darkforce{} add \threat{}.}{true}{true}
   },%
+  {it's not that bad}:{
+    \swtalent{It's Not That Bad}{Once per session when an ally would suffer a Critical Injury, may take an It's Not That Bad action; make a \hard{} Medicine check to stop the ally from gaining the Critical Injury.}{true}{}
+  },%
   {jump up}:{
     \swtalent{Jump Up}{Once per round, may stand from seated or prone as an incidental}{true}{}
   },%
@@ -685,6 +691,9 @@
   {quick draw}:{
     \swtalent{Quick Draw}{Once per round, draw or holster a weapon or accessible item as an incidental}{true}{}
   },%
+  {quick fix}:{
+    \swtalent{Quick Fix}{Once per session, make one skill check using Agility rather than the characteristic linked to that skill.}{true}{}
+  },%
   {quick movement}:{
     \swtalent{Quick Movement}{Suffer 2 strain to perform the Quick Movement incidental; add \force{} no greater than Force rating to next check. May spend \forcepoint{}\forcepoint{} to perform one additional Move maneuver after action.}{true}{true}
   },%
@@ -952,6 +961,9 @@
   {unity assault}:{
     \swtalent{Unity Assault}{If a missed combat check generates \triumph{} or \advantage{}\advantage{}\advantage{} may spend to perform Force power targeting allies as a maneuver.}{true}{true}
   },%
+  {unstoppable}:{
+    \swtalent{Unstoppable}{If a Critical Injury roll is 1 or reduced to 1, do not receive the critical injury.}{}{}
+  },%
   {utility belt}:{
     \swtalent{Utility Belt}{Spend 1 Destiny Point to perform a Utility Belt incidental; produce a previously undocumented item or weapon (with restrictions) from a tool belt or a satchel}{true}{}
   },%
diff --git a/talent trees/engineer.tex b/talent trees/engineer.tex
index bc54336..caa2014 100644
--- a/talent trees/engineer.tex	
+++ b/talent trees/engineer.tex	
@@ -1,6 +1,6 @@
 \setcareer{Engineer}{Athletics, Computers, Knowledge (Education), Mechanics, Perception, Piloting (Space), Ranged (Light), Vigilance}
 
-\begin{talenttree}{Mechanic}{Brawl, Mechanics, Piloting (Space), Skulduggery}{Edge of the Empire p. 85}{}{}
+\begin{talenttree}{Mechanic}{Brawl, Mechanics, Piloting (Space), Skulduggery}{Age of Rebellion p. 85}{}{}
   \talent{gearhead}
   \talent{toughened}
   \talent{fine tuning}
@@ -29,7 +29,7 @@
   \talentlines{||||/||||/||||/||||}{---/---/--./...}
 \end{talenttree}
 
-\begin{talenttree}{Saboteur}{Coordination, Mechanics, Skulduggery, Stealth}{Edge of the Empire p. 86}{}{}
+\begin{talenttree}{Saboteur}{Coordination, Mechanics, Skulduggery, Stealth}{Age of Rebellion p. 86}{}{}
   \talent{resolve}
   \talent{second wind}
   \talent{grit}
@@ -58,7 +58,7 @@
   \talentlines{|..|/.||./||.|/.|||}{---/-.-/.-./-..}
 \end{talenttree}
 
-\begin{talenttree}{Scientist}{Computers, Knowledge (Education), Knowledge (Lore), Medicine}{Edge of the Empire p. 87}{}{}
+\begin{talenttree}{Scientist}{Computers, Knowledge (Education), Knowledge (Lore), Medicine}{Age of Rebellion p. 87}{}{}
   \talent{knowledge specialization}
   \talent{respected scholar}
   \talent{researcher}
diff --git a/talent trees/soldier.tex b/talent trees/soldier.tex
new file mode 100644
index 0000000..8b47190
--- /dev/null
+++ b/talent trees/soldier.tex	
@@ -0,0 +1,88 @@
+\setcareer{Soldier}{Athletics, Brawl, Knowledge (Warfare), Medicine, Melee, Ranged (Light), Ranged (Heavy), Survival}
+
+\begin{talenttree}{Commando}{Brawl, Melee, Resilience, Survival}{Age of Rebellion p. 91}{}{}
+  \talent{physical training}
+  \talent{grit}
+  \talent{toughened}
+  \talent{point blank}
+
+  \talent{toughened}
+  \talent{durable}
+  \talent{physical training}
+  \talent{strong arm}
+
+  \talent{blooded}
+  \talent{armor master}
+  \talent{natural outdoorsman}
+  \talent{feral strength}
+
+  \talent{toughened}
+  \talent{heroic fortitude}
+  \talent{durable}
+  \talent{knockdown}
+
+  \talent{armor master - improved}
+  \talent{dedication}
+  \talent{unstoppable}
+  \talent{feral strength}
+
+  \talentlines{|.||/.|||/||.|/||||}{---/-../--./...}
+\end{talenttree}
+
+\begin{talenttree}{Medic}{Knowledge (Xenology), Medicine, Resilience, Vigilance}{Age of Rebellion p. 92}{}{}
+  \talent{forager}
+  \talent{stimpack specialization}
+  \talent{grit}
+  \talent{surgeon}
+
+  \talent{toughened}
+  \talent{surgeon}
+  \talent{stimpack specialization}
+  \talent{bacta specialist}
+
+  \talent{well rounded}
+  \talent{grit}
+  \talent{stim application}
+  \talent{master doctor}
+
+  \talent{dodge}
+  \talent{natural doctor}
+  \talent{stim application - improved}
+  \talent{stimpack specialization}
+
+  \talent{anatomy lessons}
+  \talent{dedication}
+  \talent{it's not that bad}
+  \talent{stim application - supreme}
+
+  \talentlines{|..|/|||./|||./||||}{.--/.--/..-/.-.}
+\end{talenttree}
+
+\begin{talenttree}{Sharpshooter}{Cool, Perception, Ranged (Light), Ranged (Heavy)}{Age of Rebellion p. 93}{}{}
+  \talent{expert tracker}
+  \talent{sniper shot}
+  \talent{brace}
+  \talent{grit}
+
+  \talent{grit}
+  \talent{true aim}
+  \talent{deadly accuracy}
+  \talent{lethal blows}
+
+  \talent{brace}
+  \talent{lethal blows}
+  \talent{sniper shot}
+  \talent{true aim}
+
+  \talent{expert tracker}
+  \talent{deadly accuracy}
+  \talent{toughened}
+  \talent{crippling blow}
+
+  \talent{quick fix}
+  \talent{natural marksman}
+  \talent{dedication}
+  \talent{targeted blow}
+
+  \talentlines{||.|/||||/||.|/||||}{.../.--/.-./-..}
+\end{talenttree}
diff --git a/talent trees/spy.tex b/talent trees/spy.tex
new file mode 100644
index 0000000..8c70ac2
--- /dev/null
+++ b/talent trees/spy.tex	
@@ -0,0 +1,88 @@
+\setcareer{Spy}{Computers, Cool, Coordination, Deception, Knowledge (Warfare), Perception, Skulduggery, Stealth}
+
+\begin{talenttree}{Infiltrator}{Deception, Melee, Skulduggery, Streetwise}{Age of Rebellion p. 97}{}{}
+  \talent{grit}
+  \talent{dodge}
+  \talent{frenzied attack}
+  \talent{defensive stance}
+
+  \talent{stunning blow}
+  \talent{grit}
+  \talent{soft spot}
+  \talent{jump up}
+
+  \talent{knockdown}
+  \talent{frenzied attack}
+  \talent{grit}
+  \talent{dodge}
+
+  \talent{natural brawler}
+  \talent{toughened}
+  \talent{stunning blow - improved}
+  \talent{defensive stance}
+
+  \talent{dedication}
+  \talent{clever solution}
+  \talent{master of shadows}
+  \talent{natural rogue}
+
+  \talentlines{..||/|..|/..||/|..|}{--./--./--./---}
+\end{talenttree}
+
+\begin{talenttree}{Scout}{Athletics, Medicine, Piloting (Planetary), Survival}{Age of Rebellion p. 98}{}{}
+  \talent{rapid recovery}
+  \talent{stalker}
+  \talent{grit}
+  \talent{shortcut}
+
+  \talent{forager}
+  \talent{quick strike}
+  \talent{let's ride}
+  \talent{disorient}
+
+  \talent{rapid recovery}
+  \talent{natural hunter}
+  \talent{familiar suns}
+  \talent{shortcut}
+
+  \talent{grit}
+  \talent{heightened awareness}
+  \talent{toughened}
+  \talent{quick strike}
+
+  \talent{utility belt}
+  \talent{dedication}
+  \talent{stalker}
+  \talent{disorient}
+
+  \talentlines{||||/||||/||||/|.||}{---/.../.../--.}
+\end{talenttree}
+
+\begin{talenttree}{Slicer}{Computers, Knowledge (Education), Knowledge (Underworld), Stealth}{Age of Rebellion p. 99}{}{}
+  \talent{codebreaker}
+  \talent{grit}
+  \talent{technical aptitude}
+  \talent{bypass security}
+
+  \talent{defensive slicing}
+  \talent{technical aptitude}
+  \talent{grit}
+  \talent{bypass security}
+
+  \talent{natural programmer}
+  \talent{bypass security}
+  \talent{defensive slicing}
+  \talent{grit}
+
+  \talent{defensive slicing}
+  \talent{defensive slicing - improved}
+  \talent{codebreaker}
+  \talent{resolve}
+
+  \talent{skilled slicer}
+  \talent{master slicer}
+  \talent{mental fortress}
+  \talent{dedication}
+
+  \talentlines{|.../||||/||||/||||}{.--/.--/---/---}
+\end{talenttree}
diff --git a/talent-trees.pdf b/talent-trees.pdf
index b6b737b..293ae74 100644
Binary files a/talent-trees.pdf and b/talent-trees.pdf differ
diff --git a/talent-trees.tex b/talent-trees.tex
index 760a50e..df9a4cd 100644
--- a/talent-trees.tex
+++ b/talent-trees.tex
@@ -9,7 +9,7 @@
   % \input{talent trees/commander.tex}
   % \input{talent trees/consular.tex}
   % \input{talent trees/diplomat.tex}
-  \input{talent trees/engineer.tex}
+  % \input{talent trees/engineer.tex}
   % \input{talent trees/explorer.tex}
   % \input{talent trees/guardian.tex}
   % \input{talent trees/hired gun.tex}
@@ -18,6 +18,8 @@
   % \input{talent trees/seeker.tex}
   % \input{talent trees/sentinel.tex}
   % \input{talent trees/smuggler.tex}
+  % \input{talent trees/soldier.tex}
+  \input{talent trees/spy.tex}
   % \input{talent trees/technician.tex}
   % \input{talent trees/warrior.tex}
   % \input{talent trees/universal.tex}