diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/AbilityResultContext.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/AbilityResultContext.java
index 0d149fc..638065b 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/AbilityResultContext.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/AbilityResultContext.java
@@ -6,6 +6,7 @@ public class AbilityResultContext {
 	
 	public List<EffectRedirect> EffectRedirects;
 	public EAbilityHitResult HitResult;
+	public int InterruptionStep;
 	public List<ArmorMitigationResults> MultiTargetArmorMitigation;
 	public List<EffectResults> MultiTargetEffectResults;
 	public List<OverriddenEffectsByType> MultiTargetEffectsOverrides;
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/EffectRedirect.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/EffectRedirect.java
index e1fef70..96d2b71 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/EffectRedirect.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/EffectRedirect.java
@@ -1,5 +1,15 @@
 package com.github.rcd47.x2data.lib.unreal.mappings.base;
 
-public class EffectRedirect {
+import com.github.rcd47.x2data.lib.unreal.mapper.ref.IXComStateObjectReference;
+import com.github.rcd47.x2data.lib.unreal.mappings.UnrealName;
 
+public class EffectRedirect {
+	
+	// the target refs can definitely be Units
+	// theoretically, I think they could be other things too, like an InteractiveObject
+	public IXComStateObjectReference<XComGameState_BaseObject> OriginalTargetRef;
+	public IXComStateObjectReference<XComGameState_BaseObject> RedirectedToTargetRef;
+	public UnrealName RedirectReason;
+	public EffectResults RedirectResults;
+	
 }
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/PathingInputData.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/PathingInputData.java
index 6538771..a992912 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/PathingInputData.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/PathingInputData.java
@@ -2,12 +2,15 @@
 
 import java.util.List;
 
+import com.github.rcd47.x2data.lib.unreal.mapper.ref.IXComStateObjectReference;
+
 public class PathingInputData {
 	
 	public List<Integer> CostIncreases;
 	public List<Integer> Destructibles;
 	public List<PathPoint> MovementData;
 	public List<TTile> MovementTiles;
+	public IXComStateObjectReference<XComGameState_Unit> MovingUnitRef;
 	public List<TTile> WaypointTiles;
 	
 }
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/SoldierClassAbilityType.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/SoldierClassAbilityType.java
index d7c8d7e..e974c32 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/SoldierClassAbilityType.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/SoldierClassAbilityType.java
@@ -1,9 +1,9 @@
 package com.github.rcd47.x2data.lib.unreal.mappings.base;
 
-import com.github.rcd47.x2data.lib.unreal.mappings.UnrealName;
+import com.github.rcd47.x2data.lib.unreal.mapper.ref.IXComNameObjectReference;
 
 public class SoldierClassAbilityType {
 	
-	public UnrealName AbilityName;
+	public IXComNameObjectReference<X2AbilityTemplate> AbilityName;
 	
 }
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2AbilityTemplate.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2AbilityTemplate.java
index 9f5fc37..7daa0f6 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2AbilityTemplate.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2AbilityTemplate.java
@@ -7,6 +7,7 @@ public class X2AbilityTemplate extends X2DataTemplate {
 	public IXComNameObjectReference<Void> AbilityTargetStyle;
 	public IXComNameObjectReference<Void> AbilityToHitCalc;
 	public EAbilityHostility Hostility;
+	public String IconImage;
 	public String LocFriendlyName;
 	
 }
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2CharacterTemplate.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2CharacterTemplate.java
index 69c5433..c68454b 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2CharacterTemplate.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2CharacterTemplate.java
@@ -2,8 +2,11 @@
 
 public class X2CharacterTemplate extends X2DataTemplate {
 	
-	public boolean bIsScientist;
+	public boolean bIsCivilian;
+	public boolean bIsCosmetic;
 	public boolean bIsEngineer;
+	public boolean bIsScientist;
 	public String strCharacterName;
+	public String strTargetIconImage;
 	
 }
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2EffectTemplateRef.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2EffectTemplateRef.java
index b6858b8..fe7eb7f 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2EffectTemplateRef.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2EffectTemplateRef.java
@@ -1,5 +1,12 @@
 package com.github.rcd47.x2data.lib.unreal.mappings.base;
 
-public class X2EffectTemplateRef {
+import com.github.rcd47.x2data.lib.unreal.mappings.UnrealName;
 
+public class X2EffectTemplateRef {
+	
+	public int ApplyOnTickIndex;
+	public EffectTemplateLookupType LookupType;
+	public UnrealName SourceTemplateName;
+	public int TemplateEffectLookupArrayIndex;
+	
 }
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2SoldierClassTemplate.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2SoldierClassTemplate.java
index 7f9955a..9259e54 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2SoldierClassTemplate.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/X2SoldierClassTemplate.java
@@ -4,6 +4,7 @@
 
 public class X2SoldierClassTemplate extends X2DataTemplate {
 	
+	public List<String> AbilityTreeTitles;
 	public String DisplayName;
 	public String IconImage;
 	public List<String> RankIcons;
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext.java
index acef17b..4d39542 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext.java
@@ -8,6 +8,8 @@
 public class XComGameStateContext {
 	
 	public EInterruptionStatus InterruptionStatus;
+	public int InterruptionHistoryIndex; // If this game state is resuming from an interruption, this index points back to the game state that are resuming from
+	public int ResumeHistoryIndex; // If this game state has been interrupted, this index points forward to the game state that will resume
 	public List<@UnrealDataTypeHint(UnrealDataType.delegateproperty) Integer> PostBuildVisualizationFn;
 	public List<@UnrealDataTypeHint(UnrealDataType.delegateproperty) Integer> PreBuildVisualizationFn;
 	
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_ApplyWorldEffects.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_ApplyWorldEffects.java
new file mode 100644
index 0000000..9ac50b9
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_ApplyWorldEffects.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameStateContext_ApplyWorldEffects extends XComGameStateContext {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_AreaDamage.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_AreaDamage.java
new file mode 100644
index 0000000..7a951a6
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_AreaDamage.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameStateContext_AreaDamage extends XComGameStateContext {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_ChangeContainer.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_ChangeContainer.java
index 398a441..5ab3fc5 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_ChangeContainer.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_ChangeContainer.java
@@ -1,5 +1,7 @@
 package com.github.rcd47.x2data.lib.unreal.mappings.base;
 
 public class XComGameStateContext_ChangeContainer extends XComGameStateContext {
-
+	
+	public String ChangeInfo;
+	
 }
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_CinematicSpawn.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_CinematicSpawn.java
new file mode 100644
index 0000000..b4055ae
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_CinematicSpawn.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameStateContext_CinematicSpawn extends XComGameStateContext {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_Falling.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_Falling.java
new file mode 100644
index 0000000..ce39547
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_Falling.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameStateContext_Falling extends XComGameStateContext {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_TutorialBox.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_TutorialBox.java
new file mode 100644
index 0000000..f2e70f6
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameStateContext_TutorialBox.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameStateContext_TutorialBox extends XComGameStateContext {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_AIReinforcementSpawner.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_AIReinforcementSpawner.java
new file mode 100644
index 0000000..451cd33
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_AIReinforcementSpawner.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_AIReinforcementSpawner extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Ability_CH.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Ability_CH.java
new file mode 100644
index 0000000..b59657e
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Ability_CH.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Ability_CH extends XComGameState_Ability {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_BlackMarket.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_BlackMarket.java
new file mode 100644
index 0000000..3dbf791
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_BlackMarket.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_BlackMarket extends XComGameState_ScanningSite {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Cheats.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Cheats.java
new file mode 100644
index 0000000..7919630
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Cheats.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Cheats extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ChosenAction.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ChosenAction.java
new file mode 100644
index 0000000..8e0a4d8
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ChosenAction.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_ChosenAction extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_City.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_City.java
new file mode 100644
index 0000000..4d0309b
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_City.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_City extends XComGameState_GeoscapeEntity {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DLC_Day60AchievementData.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DLC_Day60AchievementData.java
new file mode 100644
index 0000000..89c35c4
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DLC_Day60AchievementData.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_DLC_Day60AchievementData extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DLC_Day90AchievementData.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DLC_Day90AchievementData.java
new file mode 100644
index 0000000..a7a58f6
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DLC_Day90AchievementData.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_DLC_Day90AchievementData extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DarkEvent.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DarkEvent.java
new file mode 100644
index 0000000..881dc8b
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_DarkEvent.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_DarkEvent extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Effect_PaleHorse.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Effect_PaleHorse.java
new file mode 100644
index 0000000..bdedd21
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Effect_PaleHorse.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Effect_PaleHorse extends XComGameState_Effect {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_EvacZone.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_EvacZone.java
new file mode 100644
index 0000000..8320d86
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_EvacZone.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_EvacZone extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_FacilityUpgrade.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_FacilityUpgrade.java
new file mode 100644
index 0000000..22dc1f7
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_FacilityUpgrade.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_FacilityUpgrade extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Falling.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Falling.java
new file mode 100644
index 0000000..c98629e
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Falling.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Falling extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_GameTime.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_GameTime.java
new file mode 100644
index 0000000..76d33c1
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_GameTime.java
@@ -0,0 +1,7 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_GameTime extends XComGameState_BaseObject {
+	
+	public TDateTime CurrentTime;
+	
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Haven.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Haven.java
new file mode 100644
index 0000000..67da94a
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Haven.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Haven extends XComGameState_ScanningSite {
+	
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProject.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProject.java
new file mode 100644
index 0000000..2d07d70
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProject.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProject extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectBondSoldiers.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectBondSoldiers.java
new file mode 100644
index 0000000..1d7d8cc
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectBondSoldiers.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectBondSoldiers extends XComGameState_HeadquartersProject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectBuildFacility.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectBuildFacility.java
new file mode 100644
index 0000000..a415eb6
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectBuildFacility.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectBuildFacility extends XComGameState_HeadquartersProject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectClearRoom.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectClearRoom.java
new file mode 100644
index 0000000..25b3cfe
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectClearRoom.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectClearRoom extends XComGameState_HeadquartersProject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectHealSoldier.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectHealSoldier.java
new file mode 100644
index 0000000..1d930de
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectHealSoldier.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectHealSoldier extends XComGameState_HeadquartersProject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectHealSpark.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectHealSpark.java
new file mode 100644
index 0000000..896e083
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectHealSpark.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectHealSpark extends XComGameState_HeadquartersProjectHealSoldier {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectProvingGround.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectProvingGround.java
new file mode 100644
index 0000000..f4d11f1
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectProvingGround.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectProvingGround extends XComGameState_HeadquartersProjectResearch {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectRecoverWill.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectRecoverWill.java
new file mode 100644
index 0000000..4c3e8e4
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectRecoverWill.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectRecoverWill extends XComGameState_HeadquartersProject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectRemoveTraits.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectRemoveTraits.java
new file mode 100644
index 0000000..c89c59f
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectRemoveTraits.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectRemoveTraits extends XComGameState_HeadquartersProject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectResearch.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectResearch.java
new file mode 100644
index 0000000..a6fd5b0
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectResearch.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectResearch extends XComGameState_HeadquartersProject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectTrainRookie.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectTrainRookie.java
new file mode 100644
index 0000000..a9c2b0b
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersProjectTrainRookie.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HeadquartersProjectTrainRookie extends XComGameState_HeadquartersProject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersXCom.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersXCom.java
index 086c843..3100206 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersXCom.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HeadquartersXCom.java
@@ -13,6 +13,7 @@ public class XComGameState_HeadquartersXCom extends XComGameState_Airship {
 	public List<GeneratedMissionData> arrGeneratedMissionData;
 	public List<IXComStateObjectReference<XComGameState_Unit>> Crew;
 	public List<HQOrder> CurrentOrders;
+	public List<IXComStateObjectReference<XComGameState_Unit>> DeadCrew;
 	public List<Integer> EverAcquiredInventoryCounts;
 	public List<UnrealName> EverAcquiredInventoryTypes;
 	public List<UnrealName> ExtraUpgradeWeaponCats;
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HuntersLodgeManager.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HuntersLodgeManager.java
new file mode 100644
index 0000000..d8afdfd
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_HuntersLodgeManager.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_HuntersLodgeManager extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_IndicatorArrow.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_IndicatorArrow.java
new file mode 100644
index 0000000..f3447cf
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_IndicatorArrow.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_IndicatorArrow extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_LineOfPlayAnchor.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_LineOfPlayAnchor.java
new file mode 100644
index 0000000..c6ee28e
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_LineOfPlayAnchor.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_LineOfPlayAnchor extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MaterialSwaps.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MaterialSwaps.java
new file mode 100644
index 0000000..bac02dc
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MaterialSwaps.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MaterialSwaps extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAlienNest.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAlienNest.java
new file mode 100644
index 0000000..55c73c8
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAlienNest.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MissionSiteAlienNest extends XComGameState_MissionSiteOutsideRegions {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAvengerAttack.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAvengerAttack.java
new file mode 100644
index 0000000..d88a382
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAvengerAttack.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MissionSiteAvengerAttack extends XComGameState_MissionSite {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAvengerDefense.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAvengerDefense.java
new file mode 100644
index 0000000..2cb1c90
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteAvengerDefense.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MissionSiteAvengerDefense extends XComGameState_MissionSiteAvengerAttack {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteChosenAmbush.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteChosenAmbush.java
new file mode 100644
index 0000000..880141e
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteChosenAmbush.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MissionSiteChosenAmbush extends XComGameState_MissionSite {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteLostTowers.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteLostTowers.java
new file mode 100644
index 0000000..be69606
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_MissionSiteLostTowers.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_MissionSiteLostTowers extends XComGameState_MissionSiteOutsideRegions {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ObjectiveInfo.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ObjectiveInfo.java
new file mode 100644
index 0000000..28fe716
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ObjectiveInfo.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_ObjectiveInfo extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ResourceCache.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ResourceCache.java
new file mode 100644
index 0000000..a2d51eb
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_ResourceCache.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_ResourceCache extends XComGameState_ScanningSite {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Reward.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Reward.java
new file mode 100644
index 0000000..210d6a4
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Reward.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Reward extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SparkManager.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SparkManager.java
new file mode 100644
index 0000000..9f96c37
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SparkManager.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_SparkManager extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SquadViewer.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SquadViewer.java
new file mode 100644
index 0000000..89d6cbb
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SquadViewer.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_SquadViewer extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SquadVisiblePoint.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SquadVisiblePoint.java
new file mode 100644
index 0000000..c4977a7
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_SquadVisiblePoint.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_SquadVisiblePoint extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_StaffSlot.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_StaffSlot.java
new file mode 100644
index 0000000..6a0f305
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_StaffSlot.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_StaffSlot extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_StrategyCard.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_StrategyCard.java
new file mode 100644
index 0000000..4c00fc1
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_StrategyCard.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_StrategyCard extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Tech.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Tech.java
new file mode 100644
index 0000000..8b9273c
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Tech.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_Tech extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_UFO.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_UFO.java
new file mode 100644
index 0000000..9e15a61
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_UFO.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_UFO extends XComGameState_Airship {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_UITimer.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_UITimer.java
new file mode 100644
index 0000000..0f8ae32
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_UITimer.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_UITimer extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Unit.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Unit.java
index 7e2688e..1343260 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Unit.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_Unit.java
@@ -22,6 +22,7 @@ public class XComGameState_Unit extends XComGameState_BaseObject {
 	public List<UnrealName> AppliedEffectNames;
 	public List<IXComStateObjectReference<XComGameState_Effect>> AppliedEffects;
 	public List<ClassAgnosticAbility> AWCAbilities;
+	public boolean bCaptured;
 	public boolean bIsSpecial;
 	public Map<ECharStatType, CharacterStat> CharacterStats;
 	public IXComStateObjectReference<XComGameState_AdventChosen> ChosenRef;
@@ -34,7 +35,9 @@ public class XComGameState_Unit extends XComGameState_BaseObject {
 	public List<UnrealName> HackRewards;
 	public List<Integer> HackRollMods;
 	public List<IXComStateObjectReference<XComGameState_Item>> InventoryItems;
+	public List<IXComStateObjectReference<XComGameState_Unit>> KillAssists;
 	public List<UnrealName> KilledByDamageTypes;
+	public List<IXComStateObjectReference<XComGameState_Unit>> KilledUnits;
 	public IXComNameObjectReference<X2SoldierClassTemplate> m_SoldierClassTemplateName;
 	public List<SCATProgression> m_SoldierProgressionAbilties;
 	public int m_SoldierRank;
@@ -42,7 +45,7 @@ public class XComGameState_Unit extends XComGameState_BaseObject {
 	public IXComNameObjectReference<X2CharacterTemplate> m_TemplateName;
 	public EMentalState MentalState = EMentalState.eMentalState_Ready; // set in defaultproperties
 	public List<NegativeTraitRecoveryInfo> NegativeTraits;
-	public UnrealName nmCountry;
+	public IXComNameObjectReference<X2CountryTemplate> nmCountry;
 	public List<EquipmentInfo> OldInventoryItems;
 	public List<UnrealName> PendingTraits;
 	public List<SCATProgression> PsiAbilities;
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_WorldNarrativeActor.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_WorldNarrativeActor.java
new file mode 100644
index 0000000..48f01a9
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_WorldNarrativeActor.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_WorldNarrativeActor extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_WorldNarrativeTracker.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_WorldNarrativeTracker.java
new file mode 100644
index 0000000..867c8ac
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/base/XComGameState_WorldNarrativeTracker.java
@@ -0,0 +1,5 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.base;
+
+public class XComGameState_WorldNarrativeTracker extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/evacall/XComGameState_EvacAllUnitList.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/evacall/XComGameState_EvacAllUnitList.java
new file mode 100644
index 0000000..690c46f
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/evacall/XComGameState_EvacAllUnitList.java
@@ -0,0 +1,7 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.evacall;
+
+import com.github.rcd47.x2data.lib.unreal.mappings.base.XComGameState_BaseObject;
+
+public class XComGameState_EvacAllUnitList extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/lebportrait/XComGameState_LEBPortrait.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/lebportrait/XComGameState_LEBPortrait.java
new file mode 100644
index 0000000..cbc5e24
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/lebportrait/XComGameState_LEBPortrait.java
@@ -0,0 +1,7 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.lebportrait;
+
+import com.github.rcd47.x2data.lib.unreal.mappings.base.XComGameState_BaseObject;
+
+public class XComGameState_LEBPortrait extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/lym/XComGameState_LootDrop_Override.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/lym/XComGameState_LootDrop_Override.java
new file mode 100644
index 0000000..92bc997
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/lym/XComGameState_LootDrop_Override.java
@@ -0,0 +1,7 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.lym;
+
+import com.github.rcd47.x2data.lib.unreal.mappings.base.XComGameState_LootDrop;
+
+public class XComGameState_LootDrop_Override extends XComGameState_LootDrop {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/wotcalienpack/XComGameState_Effect_EffectCounter.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/wotcalienpack/XComGameState_Effect_EffectCounter.java
new file mode 100644
index 0000000..8f24a95
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/wotcalienpack/XComGameState_Effect_EffectCounter.java
@@ -0,0 +1,7 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.wotcalienpack;
+
+import com.github.rcd47.x2data.lib.unreal.mappings.base.XComGameState_BaseObject;
+
+public class XComGameState_Effect_EffectCounter extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/wotcalienpack/XComGameState_Unit_AlienCustomization.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/wotcalienpack/XComGameState_Unit_AlienCustomization.java
new file mode 100644
index 0000000..520c628
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/wotcalienpack/XComGameState_Unit_AlienCustomization.java
@@ -0,0 +1,7 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.wotcalienpack;
+
+import com.github.rcd47.x2data.lib.unreal.mappings.base.XComGameState_BaseObject;
+
+public class XComGameState_Unit_AlienCustomization extends XComGameState_BaseObject {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/wotcga/XComGameState_IndicatorArrow_GA.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/wotcga/XComGameState_IndicatorArrow_GA.java
new file mode 100644
index 0000000..faf057a
--- /dev/null
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/mappings/wotcga/XComGameState_IndicatorArrow_GA.java
@@ -0,0 +1,7 @@
+package com.github.rcd47.x2data.lib.unreal.mappings.wotcga;
+
+import com.github.rcd47.x2data.lib.unreal.mappings.base.XComGameState_IndicatorArrow;
+
+public class XComGameState_IndicatorArrow_GA extends XComGameState_IndicatorArrow {
+
+}
diff --git a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/typings/UnrealTypingsBuilder.java b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/typings/UnrealTypingsBuilder.java
index 661497c..5af9b4b 100644
--- a/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/typings/UnrealTypingsBuilder.java
+++ b/x2-data-lib/src/main/java/com/github/rcd47/x2data/lib/unreal/typings/UnrealTypingsBuilder.java
@@ -41,8 +41,13 @@ public class UnrealTypingsBuilder {
 	private static final Map<UnrealName, String> DLC_PACKAGES = Map.ofEntries(
 			Map.entry(new UnrealName("CovertInfiltration"), "covertinf"),
 			Map.entry(new UnrealName("DarkXCOMRedux"), "mocx"),
+			Map.entry(new UnrealName("EvacAll_WotC"), "evacall"),
 			Map.entry(new UnrealName("GrimHorizonFix"), "ghfix"),
+			Map.entry(new UnrealName("LEBPortrait"), "lebportrait"),
+			Map.entry(new UnrealName("LootYouMissed"), "lym"),
 			Map.entry(new UnrealName("PauseWorldTime"), "pauseworldtime"),
+			Map.entry(new UnrealName("WOTC_AlienPack"), "wotcalienpack"),
+			Map.entry(new UnrealName("WOTCGotchaAgain"), "wotcga"),
 			Map.entry(new UnrealName("X2Statistics"), "x2stats"));
 	
 	public Map<UnrealName, UnrealTypeInformer> buildBasicSaveObjects() {
diff --git a/x2-data-lib/src/test/java/com/github/rcd47/x2data/lib/unreal/mapper/UnrealObjectMapperTest.java b/x2-data-lib/src/test/java/com/github/rcd47/x2data/lib/unreal/mapper/UnrealObjectMapperTest.java
index 02efebe..411ff80 100644
--- a/x2-data-lib/src/test/java/com/github/rcd47/x2data/lib/unreal/mapper/UnrealObjectMapperTest.java
+++ b/x2-data-lib/src/test/java/com/github/rcd47/x2data/lib/unreal/mapper/UnrealObjectMapperTest.java
@@ -64,9 +64,9 @@ public void testUnitTemplar() throws Exception {
 		
 		assertThat(unit.AbilityTree).hasSize(7);
 		assertThat(unit.AbilityTree.get(0).Abilities).isNotEmpty();
-		assertThat(unit.AbilityTree.get(0).Abilities.get(0).AbilityName).isEqualTo(new UnrealName("Rend"));
+		assertThat(unit.AbilityTree.get(0).Abilities.get(0).AbilityName.name()).isEqualTo(new UnrealName("Rend"));
 		assertThat(unit.AbilityTree.get(3).Abilities.get(1)).isNotNull();
-		assertThat(unit.AbilityTree.get(3).Abilities.get(1).AbilityName).isEqualTo(UnrealName.EMPTY);
+		assertThat(unit.AbilityTree.get(3).Abilities.get(1).AbilityName).isNull();
 		
 		assertThat(unit.strFirstName).isEqualTo("April");
 		
@@ -80,7 +80,7 @@ public void testUnitTemplar() throws Exception {
 				+ "\n"
 				+ "Geist believes April is one of the more naturally gifted among her many followers. Long before encountering the Templars, April was already manipulating her surroundings with the power of Psionic energy.");
 		
-		assertThat(unit.nmCountry).isEqualTo(new UnrealName("Country_Templar"));
+		assertThat(unit.nmCountry.name()).isEqualTo(new UnrealName("Country_Templar"));
 		
 		assertThat(unit.UnitValues).containsOnlyKeys(new UnrealName("CH_StartMissionWill"));
 		assertThat(unit.UnitValues.get(new UnrealName("CH_StartMissionWill")).eCleanup).isEqualTo(EUnitValueCleanup.eCleanup_Never);