diff --git a/star-wars-icons.sty b/star-wars-icons.sty
index 0da3fb8..4c71f0e 100644
--- a/star-wars-icons.sty
+++ b/star-wars-icons.sty
@@ -48,4 +48,6 @@
 \newcommand{\darkforce}{\icon[black]{E908}}
 \newcommand{\forcepoint}{\icon[black]{E90A}}
 
+\newcommand{\easy}{Easy (\difficulty)}
+\newcommand{\average}{Average (\difficulty\difficulty)}
 \newcommand{\hard}{Hard (\difficulty\difficulty\difficulty)}
diff --git a/star-wars-talents.sty b/star-wars-talents.sty
index 86f26e6..099435e 100644
--- a/star-wars-talents.sty
+++ b/star-wars-talents.sty
@@ -47,7 +47,10 @@
     \swtalent{Adaptable}{When resolving a check that uses a skill in which they have no ranks, the character may spend one Destiny Point to remove \despair{} from the check or remove \threat{} equal to their ranks in Cool from the check.}{true}{true}
   },%
   {against all odds}:{
-    \swtalent{Against All Odds}{When incapacitated, perform Against All Odds action; making \hard Resilience check with \force{} equal to Force rating. Heal wounds equal to \success{}. Spend \forcepoint{} to add \success{}.}{true}{true}
+    \swtalent{Against All Odds}{When incapacitated, perform Against All Odds action; making \hard{} Resilience check with \force{} equal to Force rating. Heal wounds equal to \success{}. Spend \forcepoint{} to add \success{}.}{true}{true}
+  },%
+  {all-terrain driver}:{
+    \swtalent{All-Terrain Driver}{Do not suffer usual penalties for driving through difficult terrain when using Piloting (Planetary).}{}{}
   },%
   {anatomy lessons}:{
     \swtalent{Anatomy Lessons}{After making a successful attack, may spend 1 Destiny Point to add damage equal to Intellect to one hit.}{true}{}
@@ -74,13 +77,13 @@
     \swtalent{Ataru Technique}{When making a check using the Lightsaber skill, the character may use Agility instead of Brawn.}{}{true}
   },%
   {backroom deal}:{
-    \swtalent{Backroom Deal}{Once per encounter, make a \hard Negotiation check to reveal how previously unknown dealings have a meaningful impact on the current scene.}{true}{}
+    \swtalent{Backroom Deal}{Once per encounter, make a \hard{} Negotiation check to reveal how previously unknown dealings have a meaningful impact on the current scene.}{true}{}
   },%
   {bacta specialist}:{
     \swtalent{Bacta Specialist}{Patients regain 1 additional wound per rank of Bacta Specialist when they recover wounds from bacta tanks or long term}{}{}
   },%
   {bad motivator}:{
-    \swtalent{Bad Motivator}{Once per session, may take a Bad Motivator action: make a \hard Mechanics check to cause one targeted device to spontaneously fail.}{true}{}
+    \swtalent{Bad Motivator}{Once per session, may take a Bad Motivator action: make a \hard{} Mechanics check to cause one targeted device to spontaneously fail.}{true}{}
   },%
   {balance}:{
     \swtalent{Balance}{When the character recovers strain at the end of the encounter, he may add \force{} per Force rating. He recov ers additional strain equal to \forcepoint{} generated}{true}{true}
@@ -115,6 +118,9 @@
   {body guard - improved}:{
     \swtalent{Improved Body Guard}{Once per session, when an ally protected by the Body Guard maneuver suffers a hit, suffer the hit instead.}{true}{}
   },%
+  {bought info}:{
+    \swtalent{Bought Info}{Instead of making a Knowledge check, may take a Bought Info action; spend credits equal to 50 times the difficulty of the check to pass with one \success{}.}{true}{}
+  },%
   {brace}:{
     \swtalent{Brace}{Perform the Brace maneuver to remove \setback{} per rank of Brace from next Action. This may only remove \setback{} added by environmental circumstances}{true}{}
   },%
@@ -170,7 +176,7 @@
     \swtalent{Confidence}{May decrease difficulty of Discipline checks to avoid fear by 1 per rank of Confidence.}{}{}
   },%
   {consider our options}:{
-    \swtalent{Consider Our Options}{Take the Consider Our Options action: make a \hard Negotiation check. Until the character's next turn, a character who attacks them first suffers 2 strain, plus 1 strain per \success{}\success{} on the character's check.}{true}{}
+    \swtalent{Consider Our Options}{Take the Consider Our Options action: make a \hard{} Negotiation check. Until the character's next turn, a character who attacks them first suffers 2 strain, plus 1 strain per \success{}\success{} on the character's check.}{true}{}
   },%
   {consider our options - improved}:{
     \swtalent{Improved Consider Our Options}{Allies within short range may also benefit from Consider Our Options.}{true}{}
@@ -179,7 +185,7 @@
     \swtalent{Contingency Plan}{Spend 1 Destiny Point to recover strain equal to Cunning rating.}{true}{}
   },%
   {contraption}:{
-    \swtalent{Contraption}{Once per session, take Contraption action; make a \hard Mechanics check to fashion a device to solve a current problem using just the tools and parts on hand.}{true}{}
+    \swtalent{Contraption}{Once per session, take Contraption action; make a \hard{} Mechanics check to fashion a device to solve a current problem using just the tools and parts on hand.}{true}{}
   },%
   {convincing demeanor}:{
     \swtalent{Convincing Demeanor}{Remove \setback{} per rank of Convincing Demeanor from Deception or Skulduggery checks.}{}{}
@@ -205,11 +211,14 @@
   {deadly accuracy}:{
     \swtalent{Deadly Accuracy}{When acquired, choose 1 combat skill. Add damage equal to ranks in that skill to one hit of successful attack made using that skill}{}{}
   },%
+  {debilitating shot}:{
+    \swtalent{Debilitating Shot}{Upon a successful attack with a starship or vehicle weapon, may spend \advantage{}\advantage{} to reduce the maximum speed of the target by 1 until the end of the next round.}{true}{}
+  },%
   {dedication}:{
     \swtalent{Dedication}{Gain +1 to a single characteristic. This cannot bring a characteristic above 6.}{}{}
   },%
   {defensive circle}:{
-    \swtalent{Defensive Circle}{May take the Defensive Circle action, making a \hard Lightsaber (Intellect) check. The character, plus one ally within short range per \success{} gains X defense until the beginning of next turn. X equals 1, plus 1 per \advantage{}\advantage{}.}{true}{true}
+    \swtalent{Defensive Circle}{May take the Defensive Circle action, making a \hard{} Lightsaber (Intellect) check. The character, plus one ally within short range per \success{} gains X defense until the beginning of next turn. X equals 1, plus 1 per \advantage{}\advantage{}.}{true}{true}
   },%
   {defensive driving}:{
     \swtalent{Defensive Driving}{Increase defense of vehicle or starship being piloted by 1 per rank of Defensive Driving}{}{}
@@ -278,7 +287,7 @@
     \swtalent{Falling Avalanche}{Suffer 2 strain to add damage equal to Brawn to next Lightsaber combat check made that turn}{true}{true}
   },%
   {familiar suns}:{
-    \swtalent{Familiar Suns}{Once per session, may perform a Familiar Suns maneuver; make a \hard Knowledge (Outer Rim) or (Core Worlds) check to reveal the current type of plan environment and other useful information}{true}{}
+    \swtalent{Familiar Suns}{Once per session, may perform a Familiar Suns maneuver; make a \hard{} Knowledge (Outer Rim) or (Core Worlds) check to reveal the current type of plan environment and other useful information}{true}{}
   },%
   {fearsome}:{
     \swtalent{Fearsome}{When an adversary becomes engaged with the character, the character may force the adversary to make a fear check, with the difficulty equal to the character's ranks in Fearsome.}{}{}
@@ -298,11 +307,14 @@
   {fine tuning}:{
     \swtalent{Fine Tuning}{When repairing system strain on a starship or vehicle, repair 1 additional system strain per rank of Fine Tuning.}{}{}
   },%
+  {fire control}:{
+    \swtalent{Fire Control}{Take the Fire Control action; all combat checks made from the current starship or vehicle count their target's silhouette as one higher than normal until beginning of next turn. Does not stack.}{true}{}
+  },%
   {fire support}:{
     \swtalent{Fire Support}{After the character makes a successful combat check using a vehicle weapon, the next ally to make a check adds \boost{} equal to ranks of Fire Support.}{}{}
   },%
   {fire when ready}:{
-    \swtalent{Fire When Ready}{As an action, make a \hard Leadership check. Choose a number of crew equal to Presence, who downgrade the difficulty of their next Gunnery check once, plus once per additional \success{}\success{}}{true}{}
+    \swtalent{Fire When Ready}{As an action, make a \hard{} Leadership check. Choose a number of crew equal to Presence, who downgrade the difficulty of their next Gunnery check once, plus once per additional \success{}\success{}}{true}{}
   },%
   {first among brothers}:{
     \swtalent{First Among Brothers}{When the character makes a check that does not generate any \threat{}, the check gains \advantage{} equal to ranks in First among brothers. The character may only spend these additional \advantage{} to affect allied clones.}{}{}
@@ -328,11 +340,17 @@
   {forewarning}:{
     \swtalent{Forewarning}{Perform the Forewarning action. All allies within medium range increase defense by character's Force rating until they act in the encounter.}{true}{true}
   },%
+  {form on me}:{
+    \swtalent{Form on Me}{Allies equal to ranks in Leadership in close range gain the benefits of the Gain the Advantage action.}{}{}
+  },%
   {frenzied attack}:{
     \swtalent{Frenzied Attack}{When making a Melee or Brawl check, suffer a number of strain to upgrade the attack an equal number of times. The strain suffered may not exceed ranks in Frenzied Attack}{true}{}
   },%
+  {full stop}:{
+    \swtalent{Full Stop}{When piloting a ship or vehicle, take a Full Stop maneuver to reduce speed to zero and suffer system strain equal to the speed reduced.}{true}{}
+  },%
   {full throttle}:{
-    \swtalent{Full Throttle}{Take a Full Throttle action; make a \hard Piloting check to increase a vehicle's top speed by 1 for a number of rounds equal to Cunning.}{true}{}
+    \swtalent{Full Throttle}{Take a Full Throttle action; make a \hard{} Piloting check to increase a vehicle's top speed by 1 for a number of rounds equal to Cunning.}{true}{}
   },%
   {full throttle - improved}:{
     \swtalent{Improved Full Throttle}{Suffer 1 strain to attempt Full Throttle as a maneuver and decrease its difficulty to Average (\difficulty\difficulty)}{true}{}
@@ -346,6 +364,9 @@
   {gearhead}:{
     \swtalent{Gearhead}{Remove \setback{} per rank of Gearhead from Mechanics checks. Halve the credit cost to add mods to attachments.}{}{}
   },%
+  {greased palms}:{
+    \swtalent{Greased Palmes}{Before making a social check, may spend up to 50 credits per rank in Greased Palms to upgrade the ability of the check once for every 50 credits spent.}{true}{}
+  },%
   {grit}:{
     \swtalent{Grit}{Gain +1 strain threshold.}{}{}
   },%
@@ -391,6 +412,9 @@
   {imbue item}:{
     \swtalent{Imbue Item}{Take the Imbue Item maneuver; suffer 1 strain and commit \force{} to grant one weapon, piece of armor, or item an improvement while \force{} remains committed. Suffer 1 strain every round \force{} remains committed.}{true}{true}
   },%
+  {incite rebellion}:{
+    \swtalent{Incite Rebellion}{Once per session, may take an Incite Rebellion action; make a \hard{} Coercion check to cause a number of being up to ranks in Coercion to become rebellious until the end of the encounter.}{true}{}
+  },%
   {indistinguishable}:{
     \swtalent{Indistinguishable}{Upgrade difficulty of checks to identify character once per rank of Indistinguishable.}{}{}
   },%
@@ -461,7 +485,7 @@
     \swtalent{Knowledgeable Healing}{When healing an ally, spend 1 Destiny Point to heal additional wounds equal to ranks in Knowledge (Xenology).}{}{}
   },%
   {known schematic}:{
-    \swtalent{Known Schematic}{Once per session, may perform the Known Schematic maneuver; make a \hard Knowledge (Education) check. Success grants familiarity with a building or ship's design.}{true}{}
+    \swtalent{Known Schematic}{Once per session, may perform the Known Schematic maneuver; make a \hard{} Knowledge (Education) check. Success grants familiarity with a building or ship's design.}{true}{}
   },%
   {lateral thinking}:{
     \swtalent{Lateral Thinking}{Once per encounter, spend one Destiny Point to force an enemy to reroll a successful check targeting the character. Does not require a Destiny Point if the enemy is a droid.}{true}{}
@@ -488,11 +512,17 @@
     \swtalent{Makashi Technique}{When making a check using the Lightsaber skill, the character may use Presence instead of Brawn.}{}{true}
   },%
   {master artisan}:{
-    \swtalent{Master Artisan}{Once per round, may take the Master Artisan incidental; suffer 2 strain to decrease the difficulty of next Mechanics check by 1, to a minimum of Easy (\difficulty{})}{true}{}
+    \swtalent{Master Artisan}{Once per round, may take the Master Artisan incidental; suffer 2 strain to decrease the difficulty of next Mechanics check by 1, to a minimum of \easy{}}{true}{}
   },%
   {master doctor}:{
     \swtalent{Master Doctor}{Once per round, suffer 2 strain to decrease the difficulty of a Medicine check by 1}{true}{}
   },%
+  {master driver}:{
+    \swtalent{Master Driver}{Once per round when driving a vehicle, may suffer 2 strain to perform any action as a maneuver.}{true}{}
+  },%
+  {master leader}:{
+    \swtalent{Master Leader}{Once per round, suffer 2 strain to decrease difficulty of next Leadership check by one, to a minimum of \easy{}.}{true}{}
+  },%
   {master merchant}:{
     \swtalent{Master Merchant}{When buying or selling goods, or paying off or taking Obligation, may suffer 2 strain to sell for 25\% more, buy for 25\% less, pay off 1 more Obli gation, or take 1 less.}{true}{}
   },%
@@ -503,10 +533,10 @@
     \swtalent{Master Pilot}{Once per round, when piloting a stership, may suffer 2 strain to perform any action as a maneuver.}{true}{}
   },%
   {master slicer}:{
-    \swtalent{Master Slicer}{Once per round, may take a Master Slicer incidental to suffer 2 strain and decrease difficulty of Computers or other slicing checks by 1, to a minimum of Easy (\difficulty)}{true}{}
+    \swtalent{Master Slicer}{Once per round, may take a Master Slicer incidental to suffer 2 strain and decrease difficulty of Computers or other slicing checks by 1, to a minimum of \easy{}}{true}{}
   },%
   {master starhopper}:{
-    \swtalent{Master Starhopper}{Once per round, suffer 2 strain to decrease the difficulty of next Astrogation check by 1 to a minimum of Easy (\difficulty).}{true}{}
+    \swtalent{Master Starhopper}{Once per round, suffer 2 strain to decrease the difficulty of next Astrogation check by 1 to a minimum of \easy{}.}{true}{}
   },%
   {mental bond}:{
     \swtalent{Mental Bond}{May perform the Mental Bond action. Commit \force{} While committed, may communicate with bonded animal at long range and see and hear through its senses.}{true}{true}
@@ -535,6 +565,9 @@
   {natural doctor}:{
     \swtalent{Natural Doctor}{Once per session may re-roll any 1 Medicine check.}{true}{}
   },%
+  {natural driver}:{
+    \swtalent{Natural Driver}{Once per session, may reroll any 1 Piloting (Planetary) or Gunnery check.}{true}{}
+  },%
   {natural enforcer}:{
     \swtalent{Natural Enforcer}{Once per session may re-roll any 1 Coercion or Streetwise check.}{true}{}
   },%
@@ -584,10 +617,10 @@
     \swtalent{Nobody's Fool}{May upgrade difficulty of incoming Charm, Coercion, or Deception checks once per rank of Nobody's Fool.}{}{}
   },%
   {now you see me}:{
-    \swtalent{Now You See Me}{Once per session, take Now You See Me action. Make a \hard Deception check to make a number of NPCs equal to Cunning within medium range forget about character.}{true}{true}
+    \swtalent{Now You See Me}{Once per session, take Now You See Me action. Make a \hard{} Deception check to make a number of NPCs equal to Cunning within medium range forget about character.}{true}{true}
   },%
   {on my order}:{
-    \swtalent{On My Order}{As an action, make a \hard Leadership check. Choose a number of crew equal to Presence, who downgrade the difficulty of their next Gunnery check once, plus once per additional \success{}\success{}}{true}{}
+    \swtalent{On My Order}{As an action, make a \hard{} Leadership check. Choose a number of crew equal to Presence, who downgrade the difficulty of their next Gunnery check once, plus once per additional \success{}\success{}}{true}{}
   },%
   {one person's trash}:{
     \swtalent{One Person's Trash}{May make a Perception check in order to locate a particular item at no cost in a location with potential salvage. The difficulty of the check is determined by the item's rarity.}{true}{}
@@ -599,7 +632,10 @@
     \swtalent{Outdoorsman}{Remove \setback{} per rank of Outdoorsman from checks to move through terrain or manage environmental effects. Decrease overland travel times by half}{}{}
   },%
   {outmaneuver}:{
-    \swtalent{Outmaneuver}{As an action, make a \hard Knowledge (Warfare) check. Choose one ship or vehicle per \success{}. Until the end of the character's next turn, the chosen ships must perform one extra maneuver to move.}{true}{}
+    \swtalent{Outmaneuver}{As an action, make a \hard{} Knowledge (Warfare) check. Choose one ship or vehicle per \success{}. Until the end of the character's next turn, the chosen ships must perform one extra maneuver to move.}{true}{}
+  },%
+  {overwhelm defenses}:{
+    \swtalent{Overwhelm Defenses}{Upon unsuccessful attack with a starship or vehicle weapon, may spend \advantage{}\advantage{} per rank of Overwhelm Defenses. Reduce the defense in the targeted zone by 1 for every \advantage{}\advantage{} spent.}{true}{}
   },%
   {overwhelm emotions}:{
     \swtalent{Overwhelm Emotions}{May add \force{} per Force Rating to Charm, Coerce or Deceit checks. \lightforce{} and \darkforce{} add \success{} to some checks and \failure{}}{}{true}
@@ -659,7 +695,7 @@
     \swtalent{Ravage}{Once per encounter, the character may suffer 3 strain to add \force{} up to their force rating to a combat check targeting an engaged opponent. The character may spend \forcepoint{} to add \success{} or \advantage{} to the check results. Take 1 conflict at the start of each session.}{true}{true}
   },%
   {redundant systems}:{
-    \swtalent{Redundant Systems}{Once per session, may take a Redundant Systems action; make an Easy (\difficulty) Mechanics check to harvest components from a functioning device to repair a broken one without breaking the first device}{true}{}
+    \swtalent{Redundant Systems}{Once per session, may take a Redundant Systems action; make an \easy{} Mechanics check to harvest components from a functioning device to repair a broken one without breaking the first device}{true}{}
   },%
   {reflect}:{
     \swtalent{Reflect}{When hit by a ranged attack, suffer 3 strain to reduce damage by 2 plus ranks in Reflect.}{true}{true}
@@ -748,6 +784,9 @@
   {sincerest flattery}:{
     \swtalent{Sincerest Flatery}{Once per encounter when the character makes a check using a skill that another character has previously used during the encounter, they add \boost{}\boost{}.}{true}{}
   },%
+  {situational awareness}:{
+    \swtalent{Situational Awareness}{Allies within short range of the vehicle add \boost{} to their Perception and Vigilance checks. Allies within close range add \boost{}\boost{} instead.}{}{}
+  },%
   {sixth sense}:{
     \swtalent{Sixth Sense}{Gain + 1 ranged defense.}{}{}
   },%
@@ -761,7 +800,7 @@
     \swtalent{Sleight of Mind}{Add \boost{} to all Stealth checks unless the opposition is immune to Force powers.}{}{true}
   },%
   {slippery minded}:{
-    \swtalent{Slippery Minded}{If under the effects of a Force power, perform the Slippery Minded action; make a \hard Deception check to immediately end effects of power}{true}{true}
+    \swtalent{Slippery Minded}{If under the effects of a Force power, perform the Slippery Minded action; make a \hard{} Deception check to immediately end effects of power}{true}{true}
   },%
   {smooth talker}:{
     \swtalent{Smooth Talker}{When first acquired, choose 1 skill; Charm, Coercion, Deception, or Negotiation. When making checks with that skill, spend \triumph{} to gain additional \success{} equal to ranks in Smooth Talker.}{true}{}
@@ -784,6 +823,9 @@
   {sorry about the mess}:{
     \swtalent{Sorry About the Mess}{Decrease the Critical Rating of a weapon by 1 (to a minimum of 1) against targets that have not yet acted this encounter.}{}{}
   },%
+  {sound investments}:{
+    \swtalent{Sound Investments}{At the start of each session, gain 100 credits for each rank of Sound Investments.}{}{}
+  },%
   {spare clip}:{
     \swtalent{Spare Clip}{Cannot run out of ammo due to \despair{}. Items with Limited Ammo quality run out of ammo as normal.}{}{}
   },%
@@ -800,7 +842,7 @@
     \swtalent{Stim Application}{Take the Stim Application Action; make an Average (\difficulty\difficulty) Medicine check. If successful. 1 engaged ally increases 1 characteristic by 1 for the remainder of the encounter and suffers 4 strain.}{true}{}
   },%
   {stim application - improved}:{
-    \swtalent{Improved Stim Application}{When performing Stim Application Action, may increase difficulty of check to \hard, and target only suffers 1 strain.}{true}{}
+    \swtalent{Improved Stim Application}{When performing Stim Application Action, may increase difficulty of check to \hard{}, and target only suffers 1 strain.}{true}{}
   },%
   {stim application - supreme}:{
     \swtalent{Supreme Stim Application}{When performing the Stim Application Action. spend \triumph{} to increase an additional Characteristic by 1}{}{}
@@ -809,7 +851,7 @@
     \swtalent{Stimpack Specialization}{Stimpacks heal 1 additional wound per rank of Stimpack Specialization.}{}{}
   },%
   {strategic form}:{
-    \swtalent{Strategic Form}{May take the Strategic Form action, making a \hard Lightsaber (Intellect) check, rolling \force{} no greater than Force rating. If successful, 1 target within short range may only attack character for 1 round. Spend \forcepoint{} to extend effects for 1 target for 1 round.}{true}{true}
+    \swtalent{Strategic Form}{May take the Strategic Form action, making a \hard{} Lightsaber (Intellect) check, rolling \force{} no greater than Force rating. If successful, 1 target within short range may only attack character for 1 round. Spend \forcepoint{} to extend effects for 1 target for 1 round.}{true}{true}
   },%
   {street smarts}:{
     \swtalent{Street Smarts}{Remove \setback{} per rank of Street Smarts from Streetwise and Knowledge (Underworld) checks.}{}{}
@@ -860,7 +902,7 @@
     \swtalent{Temple Training}{Before making a Lightsaber skill check, the character may spend one Destiny Point to add damage to the attack equal to their ranks in Knowledge (Lore).}{true}{true}
   },%
   {terrify}:{
-    \swtalent{Terrify}{Take the Terrify action; make a \hard Coercion check, adding \force{} no greater than Force rating. Disorient one target within medium range per \success. Spend \advantage{}\advantage{} to extend duration and spend \forcepoint{} to immobilize affected target. Take 1 conflict at the start of each session.}{true}{true}
+    \swtalent{Terrify}{Take the Terrify action; make a \hard{} Coercion check, adding \force{} no greater than Force rating. Disorient one target within medium range per \success. Spend \advantage{}\advantage{} to extend duration and spend \forcepoint{} to immobilize affected target. Take 1 conflict at the start of each session.}{true}{true}
   },%
   {terrify - improved}:{
     \swtalent{Improved Terrify}{Reduce the difficulty of Terrify's check to Average (\difficulty\difficulty) and may spend to stagger an affected target.}{}{true}
@@ -921,5 +963,8 @@
   },%
   {will of the force}:{
     \swtalent{Will of the Force}{Once per round after failing a skill check, the character may convert one dark side Destiny Point to a light side Destiny Point.}{true}{true}
+  },%
+  {works like a charm}:{
+    \swtalent{Works Like a Charm}{Once per session, make one skill check using Presence rather than the characteristic linked to that skill}{true}{}
   }
 }
diff --git a/talent trees/ace.tex b/talent trees/ace.tex
new file mode 100644
index 0000000..36e827d
--- /dev/null
+++ b/talent trees/ace.tex	
@@ -0,0 +1,88 @@
+\setcareer{Ace}{Astrogation, Cool, Gunnery, Mechanics, Perception, Piloting (Planetary), Piloting (Space), Ranged (Light)}
+
+\begin{talenttree}{Driver}{Cool, Gunnery, Mechanics, Piloting (Planetary)}{Age of Rebellion p. 67}{}{}
+  \talent{full throttle}
+  \talent{all-terrain driver}
+  \talent{fine tuning}
+  \talent{gearhead}
+
+  \talent{grit}
+  \talent{skilled jockey}
+  \talent{rapid reaction}
+  \talent{grit}
+
+  \talent{full throttle - improved}
+  \talent{tricky target}
+  \talent{fine tuning}
+  \talent{toughened}
+
+  \talent{defensive driving}
+  \talent{skilled jockey}
+  \talent{natural driver}
+  \talent{gearhead}
+
+  \talent{full throttle - supreme}
+  \talent{full stop}
+  \talent{master driver}
+  \talent{dedication}
+
+  \talentlines{|..|/||.|/|..|/|..|}{---/..-/--./---}
+\end{talenttree}
+
+\begin{talenttree}{Gunner}{Discipline, Gunnery, Ranged (Heavy), Resilience}{Age of Rebellion p. 68}{}{}
+  \talent{durable}
+  \talent{grit}
+  \talent{overwhelm defenses}
+  \talent{debilitating shot}
+
+  \talent{toughened}
+  \talent{brace}
+  \talent{spare clip}
+  \talent{true aim}
+
+  \talent{durable}
+  \talent{enduring}
+  \talent{jury rigged}
+  \talent{overwhelm defenses}
+
+  \talent{toughened}
+  \talent{enduring}
+  \talent{brace}
+  \talent{exhaust port}
+
+  \talent{heroic fortitude}
+  \talent{jury rigged}
+  \talent{dedication}
+  \talent{true aim}
+
+  \talentlines{|.||/.|||/|.||/||.|}{--./-../--./---}
+\end{talenttree}
+
+\begin{talenttree}{Pilot}{Astrogation, Gunnery, Piloting (Planetary), Piloting (Space)}{Age of Rebellion p. 69}{}{}
+  \talent{full throttle}
+  \talent{skilled jockey}
+  \talent{galaxy mapper}
+  \talent{let's ride}
+
+  \talent{skilled jockey}
+  \talent{dead to rights}
+  \talent{galaxy mapper}
+  \talent{rapid recovery}
+
+  \talent{full throttle - improved}
+  \talent{dead to rights - improved}
+  \talent{grit}
+  \talent{natural pilot}
+
+  \talent{grit}
+  \talent{full throttle - supreme}
+  \talent{tricky target}
+  \talent{defensive driving}
+
+  \talent{master pilot}
+  \talent{dedication}
+  \talent{toughened}
+  \talent{brilliant evasion}
+
+  \talentlines{||||/||||/|.||/|.||}{-.-/..-/-../---}
+\end{talenttree}
diff --git a/talent trees/commander.tex b/talent trees/commander.tex
new file mode 100644
index 0000000..4b3b3a0
--- /dev/null
+++ b/talent trees/commander.tex	
@@ -0,0 +1,88 @@
+\setcareer{Commander}{Coercion, Cool, Discipline, Knowledge (Warfare), Leadership, Perception, Ranged (Light), Vigilance}
+
+\begin{talenttree}{Commodore}{Astrogation, Computers, Knowledge (Education), Knowledge (Outer Rim)}{Age of Rebellion p. 73}{}{}
+  \talent{solid repairs}
+  \talent{command}
+  \talent{rapid reaction}
+  \talent{galaxy mapper}
+
+  \talent{known schematic}
+  \talent{commanding presence}
+  \talent{grit}
+  \talent{familiar suns}
+
+  \talent{solid repairs}
+  \talent{command}
+  \talent{rapid reaction}
+  \talent{galaxy mapper}
+
+  \talent{hold together}
+  \talent{commanding presence}
+  \talent{grit}
+  \talent{master starhopper}
+
+  \talent{solid repairs}
+  \talent{fire control}
+  \talent{dedication}
+  \talent{galaxy mapper}
+
+  \talentlines{||||/||||/||||/||||}{.../.../.../---}
+\end{talenttree}
+
+\begin{talenttree}{Squadron Leader}{Gunnery, Mechanics, Piloting (Planetary), Piloting (Space)}{Age of Rebellion p. 74}{}{}
+  \talent{grit}
+  \talent{quick strike}
+  \talent{let's ride}
+  \talent{defensive driving}
+
+  \talent{field commander}
+  \talent{confidence}
+  \talent{quick strike}
+  \talent{situational awareness}
+
+  \talent{command}
+  \talent{grit}
+  \talent{full stop}
+  \talent{defensive driving}
+
+  \talent{field commander - improved}
+  \talent{command}
+  \talent{form on me}
+  \talent{tricky target}
+
+  \talent{master leader}
+  \talent{confidence}
+  \talent{dedication}
+  \talent{brilliant evasion}
+
+  \talentlines{|..|/|||·/||||/.|||}{-.-/.../.--/-..}
+\end{talenttree}
+
+\begin{talenttree}{Tactician}{Brawl, Discipline, Leadership, Ranged (Heavy)}{Age of Rebellion p. 75}{}{}
+  \talent{outdoorsman}
+  \talent{commanding presence}
+  \talent{toughened}
+  \talent{side step}
+
+  \talent{outdoorsman}
+  \talent{confidence}
+  \talent{quick draw}
+  \talent{swift}
+
+  \talent{natural outdoorsman}
+  \talent{toughened}
+  \talent{body guard}
+  \talent{body guard}
+
+  \talent{confidence}
+  \talent{commanding presence}
+  \talent{field commander}
+  \talent{side step}
+
+  \talent{coordinated assault}
+  \talent{natural leader}
+  \talent{field commander - improved}
+  \talent{dedication}
+
+  \talentlines{||.|/||.|/.|.|/.|||}{..-/.--/--./-..}
+\end{talenttree}
diff --git a/talent trees/diplomat.tex b/talent trees/diplomat.tex
new file mode 100644
index 0000000..3fc4a79
--- /dev/null
+++ b/talent trees/diplomat.tex	
@@ -0,0 +1,88 @@
+\setcareer{Diplomat}{Charm, Deception, Knowledge (Core Worlds), Knowledge (Lore), Knowledge (Outer Rim), Knowledge (Xenology), Leadership, Negotiation}
+
+\begin{talenttree}{Ambassador}{Charm, Discipline, Knowledge (Core Worlds), Negotiation}{Age of Rebellion p. 79}{}{}
+  \talent{indistinguishable}
+  \talent{kill with kindness}
+  \talent{nobody's fool}
+  \talent{confidence}
+
+  \talent{indistinguishable}
+  \talent{grit}
+  \talent{grit}
+  \talent{dodge}
+
+  \talent{kill with kindness}
+  \talent{inspiring rhetoric}
+  \talent{steely nerves}
+  \talent{confidence}
+
+  \talent{inspiring rhetoric - improved}
+  \talent{intense presence}
+  \talent{works like a charm}
+  \talent{dodge}
+
+  \talent{inspiring rhetoric - supreme}
+  \talent{natural charmer}
+  \talent{dedication}
+  \talent{sixth sense}
+
+  \talentlines{.|||/.|||/||.|/||.|}{-../---/.-./.--}
+\end{talenttree}
+
+\begin{talenttree}{Agitator}{Coercion, Deception, Knowledge (Underworld), Streetwise}{Age of Rebellion p. 80}{}{}
+  \talent{plausible deniability}
+  \talent{nobody's fool}
+  \talent{grit}
+  \talent{intimidating}
+
+  \talent{street smarts}
+  \talent{street smarts}
+  \talent{convincing demeanor}
+  \talent{intimidating}
+
+  \talent{convincing demeanor}
+  \talent{plausible deniability}
+  \talent{scathing tirade}
+  \talent{grit}
+
+  \talent{natural enforcer}
+  \talent{nobody's fool}
+  \talent{scathing tirade - improved}
+  \talent{intimidating}
+
+  \talent{intimidating}
+  \talent{dedication}
+  \talent{scathing tirade - supreme}
+  \talent{incite rebellion}
+
+  \talentlines{.||./||||/.||./||||}{.../---/-.-/...}
+\end{talenttree}
+
+\begin{talenttree}{Agitator}{Computers, Negotiation, Skulduggery, Vigilance}{Age of Rebellion p. 81}{}{}
+  \talent{know somebody}
+  \talent{smooth talker}
+  \talent{wheel and deal}
+  \talent{grit}
+
+  \talent{smooth talker}
+  \talent{greased palms}
+  \talent{master merchant}
+  \talent{toughened}
+
+  \talent{grit}
+  \talent{wheel and deal}
+  \talent{bought info}
+  \talent{grit}
+
+  \talent{know somebody}
+  \talent{sound investments}
+  \talent{sound investments}
+  \talent{intense focus}
+
+  \talent{dedication}
+  \talent{natural negotiator}
+  \talent{superior reflexes}
+  \talent{toughened}
+
+  \talentlines{|..|/||||/||||/|..|}{.-./.-./--./-.-}
+\end{talenttree}
diff --git a/talent trees/engineer.tex b/talent trees/engineer.tex
new file mode 100644
index 0000000..236f780
--- /dev/null
+++ b/talent trees/engineer.tex	
@@ -0,0 +1,30 @@
+\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. 89}{}{}
+  \talent{gearhead}
+  \talent{toughened}
+  \talent{fine tuning}
+  \talent{solid repairs}
+
+  \talent{redundant systems}
+  \talent{solid repairs}
+  \talent{gearhead}
+  \talent{grit}
+
+  \talent{solid repairs}
+  \talent{enduring}
+  \talent{bad motivator}
+  \talent{toughened}
+
+  \talent{contraption}
+  \talent{solid repairs}
+  \talent{fine tuning}
+  \talent{hard headed}
+
+  \talent{natural tinkerer}
+  \talent{hold together}
+  \talent{dedication}
+  \talent{hard headed - improved}
+
+  \talentlines{||||/||||/||||/||||}{---/---/--./...}
+\end{talenttree}
diff --git a/talent-trees.pdf b/talent-trees.pdf
index 71f0a66..b962e63 100644
Binary files a/talent-trees.pdf and b/talent-trees.pdf differ
diff --git a/talent-trees.tex b/talent-trees.tex
index 20d8df0..760a50e 100644
--- a/talent-trees.tex
+++ b/talent-trees.tex
@@ -2,21 +2,25 @@
 \input{star-wars-formatting.sty}
 
 \begin{document}
+  % \input{talent trees/ace.tex}
   % \input{talent trees/bounty hunter.tex}
   % \input{talent trees/clone soldier.tex}
   % \input{talent trees/colonist.tex}
+  % \input{talent trees/commander.tex}
   % \input{talent trees/consular.tex}
+  % \input{talent trees/diplomat.tex}
+  \input{talent trees/engineer.tex}
   % \input{talent trees/explorer.tex}
   % \input{talent trees/guardian.tex}
   % \input{talent trees/hired gun.tex}
-  \input{talent trees/jedi.tex}
+  % \input{talent trees/jedi.tex}
   % \input{talent trees/mystic.tex}
   % \input{talent trees/seeker.tex}
   % \input{talent trees/sentinel.tex}
   % \input{talent trees/smuggler.tex}
   % \input{talent trees/technician.tex}
   % \input{talent trees/warrior.tex}
-  \input{talent trees/universal.tex}
+  % \input{talent trees/universal.tex}
 
   \ifthenelse{\equal{\undeffed}{}}{}{
     \newpage%