diff --git a/data/actions/IfritNormal.json b/data/actions/IfritNormal.json
index a2a9e90c0..a85519d06 100644
--- a/data/actions/IfritNormal.json
+++ b/data/actions/IfritNormal.json
@@ -9,7 +9,7 @@
     "curePotency": 0,
     "restorePercentage": 0,
     "nextCombo": [],
-    "targetFilter": 0,
+    "targetFilter": 1,
     "aggroModifier": 1.0,
     "statuses": {
       "caster": [],
@@ -26,7 +26,24 @@
     "curePotency": 0,
     "restorePercentage": 0,
     "nextCombo": [],
-    "targetFilter": 0,
+    "targetFilter": 1,
+    "aggroModifier": 1.0,
+    "statuses": {
+      "caster": [],
+      "target": []
+    }
+  },
+  "455": {
+    "name": "Eruption",
+    "potency": 1,
+    "comboPotency": 0,
+    "flankPotency": 0,
+    "frontPotency": 0,
+    "rearPotency": 0,
+    "curePotency": 0,
+    "restorePercentage": 0,
+    "nextCombo": [],
+    "targetFilter": 1,
     "aggroModifier": 1.0,
     "statuses": {
       "caster": [],
@@ -42,7 +59,7 @@
     "rearPotency": 0,
     "curePotency": 0,
     "restorePercentage": 0,
-    "targetFilter": 0,
+    "targetFilter": 1,
     "nextCombo": [],
     "aggroModifier": 1.0,
     "statuses": {
@@ -59,22 +76,11 @@
     "rearPotency": 0,
     "curePotency": 0,
     "restorePercentage": 0,
-    "targetFilter": 0,
+    "targetFilter": 1,
     "nextCombo": [],
     "aggroModifier": 1.0,
     "statuses": {
-      "caster": [
-        {
-          "id": 394,
-          "duration": 8000,
-          "modifiers": [
-            {
-              "modifier": "DamageTakenPercent",
-              "value": -100
-            }
-          ]
-        }
-      ],
+      "caster": [],
       "target": []
     }
   },
@@ -87,7 +93,7 @@
     "rearPotency": 0,
     "curePotency": 0,
     "restorePercentage": 0,
-    "targetFilter": 0,
+    "targetFilter": 1,
     "nextCombo": [],
     "aggroModifier": 1.0,
     "statuses": {
@@ -104,7 +110,7 @@
     "rearPotency": 0,
     "curePotency": 0,
     "restorePercentage": 0,
-    "targetFilter": 0,
+    "targetFilter": 1,
     "nextCombo": [],
     "aggroModifier": 1.0,
     "statuses": {
diff --git a/data/EncounterTimelines/IfritNormal.json b/data/encounterTimelines/IfritNormal.json
similarity index 83%
rename from data/EncounterTimelines/IfritNormal.json
rename to data/encounterTimelines/IfritNormal.json
index 41e1bc283..4bdf9dc73 100644
--- a/data/EncounterTimelines/IfritNormal.json
+++ b/data/encounterTimelines/IfritNormal.json
@@ -126,6 +126,15 @@
               "startTime": 0,
               "type": "castAction"
             },
+            {
+              "data": {
+                "selectorName": "Eruption",
+                "sourceActor": "Ifrit"
+              },
+              "description": "Eruption snapshot",
+              "startTime": 8000,
+              "type": "snapshot"
+            },
             {
               "data": {
                 "actionId": 455,
@@ -136,19 +145,10 @@
                 "sourceActor": "Ifrit",
                 "targetType": "self"
               },
-              "description": "Eruption",
+              "description": "Eruption precast",
               "startTime": 8000,
               "type": "castAction"
             },
-            {
-              "data": {
-                "selectorName": "Eruption",
-                "sourceActor": "Ifrit"
-              },
-              "description": "Eruption snapshot",
-              "startTime": 10000,
-              "type": "snapshot"
-            },
             {
               "data": {
                 "conditionId": 9,
@@ -290,34 +290,34 @@
               "startTime": 0,
               "type": "bNpcFlags"
             },
+            {
+              "data": {
+                "actionTimelineId": 140,
+                "actorName": "Ifrit"
+              },
+              "description": "",
+              "startTime": 2000,
+              "type": "actionTimeline"
+            },
             {
               "data": {
                 "actorName": "Ifrit",
                 "pos": [
-                  0,
-                  0,
-                  0
+                  0.0,
+                  0.0,
+                  0.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
                 "targetType": "self"
               },
               "description": "",
-              "startTime": 0,
+              "startTime": 2500,
               "type": "setPos"
             },
-            {
-              "data": {
-                "actionTimelineId": 140,
-                "actorName": "Ifrit"
-              },
-              "description": "",
-              "startTime": 2000,
-              "type": "actionTimeline"
-            },
             {
               "data": {
                 "actionTimelineId": 141,
@@ -327,15 +327,6 @@
               "startTime": 6000,
               "type": "actionTimeline"
             },
-            {
-              "data": {
-                "flags": 16,
-                "targetActor": ""
-              },
-              "description": "",
-              "startTime": 7000,
-              "type": "bNpcFlags"
-            },
             {
               "data": {
                 "actionId": 458,
@@ -359,6 +350,15 @@
               "description": "enable final phase",
               "startTime": 12000,
               "type": "setCondition"
+            },
+            {
+              "data": {
+                "flags": 16,
+                "targetActor": ""
+              },
+              "description": "",
+              "startTime": 15000,
+              "type": "bNpcFlags"
             }
           ]
         },
@@ -373,7 +373,7 @@
                 "opc": "set",
                 "val": 1
               },
-              "description": "",
+              "description": "set directorvar success",
               "startTime": 0,
               "type": "directorVar"
             },
@@ -400,7 +400,7 @@
                 "opc": "set",
                 "val": 2
               },
-              "description": "",
+              "description": "set directorvar fail",
               "startTime": 0,
               "type": "directorVar"
             },
@@ -431,29 +431,38 @@
           "timepoints": [
             {
               "data": {
-                "actionId": 455,
+                "actionId": 453,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "snapshot": false,
                 "snapshotTime": 0,
                 "sourceActor": "Ifrit",
-                "targetType": "self"
+                "targetType": "target"
               },
-              "description": "",
+              "description": "Incinerate",
               "startTime": 0,
               "type": "castAction"
             },
+            {
+              "data": {
+                "selectorName": "Eruption",
+                "sourceActor": "Ifrit"
+              },
+              "description": "Eruption snapshot",
+              "startTime": 8000,
+              "type": "snapshot"
+            },
             {
               "data": {
                 "actionId": 455,
                 "selectorIndex": 0,
-                "selectorName": "<unset>",
+                "selectorName": "Eruption",
                 "snapshot": false,
                 "snapshotTime": 0,
                 "sourceActor": "Ifrit",
-                "targetType": "target"
+                "targetType": "self"
               },
-              "description": "",
+              "description": "Eruption precast",
               "startTime": 8000,
               "type": "castAction"
             },
@@ -546,6 +555,25 @@
           "id": 1,
           "name": "Eruption",
           "timepoints": [
+            {
+              "data": {
+                "actorName": "Ifrit Control <subactor 1>",
+                "pos": [
+                  0.0,
+                  0.0,
+                  0.0
+                ],
+                "positionType": "absolute",
+                "rot": 0.0,
+                "selectorIndex": 0,
+                "selectorName": "Eruption",
+                "targetActor": "<unknown>",
+                "targetType": "selectorPos"
+              },
+              "description": "setPos to selector",
+              "startTime": 0,
+              "type": "setPos"
+            },
             {
               "data": {
                 "actionId": 733,
@@ -554,11 +582,17 @@
                 "snapshot": false,
                 "snapshotTime": 0,
                 "sourceActor": "Ifrit Control <subactor 1>",
-                "targetType": "selector"
+                "targetType": "selectorPos"
               },
               "description": "",
               "startTime": 100,
               "type": "castAction"
+            },
+            {
+              "data": {},
+              "description": "",
+              "startTime": 8000,
+              "type": "idle"
             }
           ]
         },
@@ -571,12 +605,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 1>",
                 "pos": [
-                  -5,
-                  0,
-                  5
+                  -5.0,
+                  0.0,
+                  5.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -590,12 +624,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 2>",
                 "pos": [
-                  -5,
-                  0,
-                  -5
+                  -5.0,
+                  0.0,
+                  -5.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -609,12 +643,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 3>",
                 "pos": [
-                  5,
-                  0,
-                  5
+                  5.0,
+                  0.0,
+                  5.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -628,12 +662,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 4>",
                 "pos": [
-                  5,
-                  0,
-                  -5
+                  5.0,
+                  0.0,
+                  -5.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -720,12 +754,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 1>",
                 "pos": [
-                  0,
-                  0,
-                  -20
+                  0.0,
+                  0.0,
+                  -20.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -739,12 +773,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 2>",
                 "pos": [
-                  0,
-                  0,
-                  20
+                  0.0,
+                  0.0,
+                  20.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -758,12 +792,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 3>",
                 "pos": [
-                  -20,
-                  0,
-                  0
+                  -20.0,
+                  0.0,
+                  0.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -777,12 +811,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 4>",
                 "pos": [
-                  20,
-                  0,
-                  0
+                  20.0,
+                  0.0,
+                  0.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -796,12 +830,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 5>",
                 "pos": [
-                  -15,
-                  0,
-                  15
+                  -15.0,
+                  0.0,
+                  15.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -815,12 +849,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 6>",
                 "pos": [
-                  -15,
-                  0,
-                  -15
+                  -15.0,
+                  0.0,
+                  -15.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -834,12 +868,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 7>",
                 "pos": [
-                  15,
-                  0,
-                  -15
+                  15.0,
+                  0.0,
+                  -15.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -853,12 +887,12 @@
               "data": {
                 "actorName": "Ifrit Control <subactor 8>",
                 "pos": [
-                  15,
-                  0,
-                  15
+                  15.0,
+                  0.0,
+                  15.0
                 ],
                 "positionType": "absolute",
-                "rot": 0,
+                "rot": 0.0,
                 "selectorIndex": 0,
                 "selectorName": "<unset>",
                 "targetActor": "<unknown>",
@@ -991,6 +1025,113 @@
               "type": "setCondition"
             }
           ]
+        },
+        {
+          "description": "",
+          "id": 4,
+          "name": "Interrupt Eruption",
+          "timepoints": [
+            {
+              "data": {
+                "actionId": 733,
+                "sourceActor": "Ifrit Control <subactor 1>"
+              },
+              "description": "Interrupted Action 455 -> interrupt subactor 1 Action 733",
+              "startTime": 0,
+              "type": "interruptAction"
+            },
+            {
+              "data": {},
+              "description": "",
+              "startTime": 8000,
+              "type": "idle"
+            }
+          ]
+        },
+        {
+          "description": "",
+          "id": 5,
+          "name": "Interrupt Plumes",
+          "timepoints": [
+            {
+              "data": {
+                "actionId": 734,
+                "sourceActor": "Ifrit Control <subactor 1>"
+              },
+              "description": "Interrupt Plumes Action 456 -> Interrupt Subactor 1 Action 734",
+              "startTime": 0,
+              "type": "interruptAction"
+            },
+            {
+              "data": {
+                "actionId": 734,
+                "sourceActor": "Ifrit Control <subactor 2>"
+              },
+              "description": "",
+              "startTime": 0,
+              "type": "interruptAction"
+            },
+            {
+              "data": {
+                "actionId": 734,
+                "sourceActor": "Ifrit Control <subactor 3>"
+              },
+              "description": "",
+              "startTime": 0,
+              "type": "interruptAction"
+            },
+            {
+              "data": {
+                "actionId": 734,
+                "sourceActor": "Ifrit Control <subactor 4>"
+              },
+              "description": "",
+              "startTime": 0,
+              "type": "interruptAction"
+            },
+            {
+              "data": {
+                "actionId": 734,
+                "sourceActor": "Ifrit Control <subactor 5>"
+              },
+              "description": "",
+              "startTime": 0,
+              "type": "interruptAction"
+            },
+            {
+              "data": {
+                "actionId": 734,
+                "sourceActor": "Ifrit Control <subactor 6>"
+              },
+              "description": "",
+              "startTime": 0,
+              "type": "interruptAction"
+            },
+            {
+              "data": {
+                "actionId": 734,
+                "sourceActor": "Ifrit Control <subactor 7>"
+              },
+              "description": "",
+              "startTime": 0,
+              "type": "interruptAction"
+            },
+            {
+              "data": {
+                "actionId": 734,
+                "sourceActor": "Ifrit Control <subactor 8>"
+              },
+              "description": "",
+              "startTime": 0,
+              "type": "interruptAction"
+            },
+            {
+              "data": {},
+              "description": "",
+              "startTime": 4000,
+              "type": "idle"
+            }
+          ]
         }
       ],
       "subactors": [
@@ -1024,7 +1165,7 @@
       "loop": true,
       "paramData": {
         "hpMax": 100,
-        "hpMin": 70,
+        "hpMin": 69,
         "sourceActor": "Ifrit"
       },
       "targetActor": "Ifrit",
@@ -1038,7 +1179,7 @@
       "loop": false,
       "paramData": {
         "hpMax": 71,
-        "hpMin": 50,
+        "hpMin": 49,
         "sourceActor": "Ifrit"
       },
       "targetActor": "Ifrit",
@@ -1051,8 +1192,8 @@
       "id": 2,
       "loop": true,
       "paramData": {
-        "hpMax": 70,
-        "hpMin": 50,
+        "hpMax": 71,
+        "hpMin": 49,
         "sourceActor": "Ifrit"
       },
       "targetActor": "Ifrit",
@@ -1065,7 +1206,7 @@
       "id": 6,
       "loop": false,
       "paramData": {
-        "hpMax": 50,
+        "hpMax": 51,
         "hpMin": 0,
         "sourceActor": "Ifrit"
       },
@@ -1201,6 +1342,32 @@
       },
       "targetActor": "Ifrit",
       "targetSchedule": "Reset"
+    },
+    {
+      "condition": "interruptedAction",
+      "description": "",
+      "enabled": true,
+      "id": 15,
+      "loop": true,
+      "paramData": {
+        "actionId": 455,
+        "sourceActor": "Ifrit"
+      },
+      "targetActor": "Ifrit Control",
+      "targetSchedule": "Interrupt Eruption"
+    },
+    {
+      "condition": "interruptedAction",
+      "description": "",
+      "enabled": true,
+      "id": 16,
+      "loop": true,
+      "paramData": {
+        "actionId": 456,
+        "sourceActor": "Ifrit"
+      },
+      "targetActor": "Ifrit Control",
+      "targetSchedule": "Interrupt Plumes"
     }
   ],
   "name": "Brand new timeline",
@@ -1228,5 +1395,5 @@
       "name": "Eruption"
     }
   ],
-  "version": 10
+  "version": 12
 }
\ No newline at end of file
diff --git a/src/common/Navi/NaviProvider.cpp b/src/common/Navi/NaviProvider.cpp
index 5f769152a..121551b40 100644
--- a/src/common/Navi/NaviProvider.cpp
+++ b/src/common/Navi/NaviProvider.cpp
@@ -612,7 +612,7 @@ int32_t Sapphire::Common::Navi::NaviProvider::addAgent( const Common::FFXIVARR_P
   dtCrowdAgentParams params{};
   std::memset( &params, 0, sizeof( params ) );
   params.height = 3.f;
-  params.maxAcceleration = 10.f;
+  params.maxAcceleration = 40.f;
   params.maxSpeed = speed;
   params.radius = radius;
   params.collisionQueryRange = speed * 0.5f;
@@ -622,7 +622,7 @@ int32_t Sapphire::Common::Navi::NaviProvider::addAgent( const Common::FFXIVARR_P
                     DT_CROWD_OPTIMIZE_VIS |
                     DT_CROWD_OPTIMIZE_TOPO |
                     DT_CROWD_OBSTACLE_AVOIDANCE;
-  params.separationWeight = 2.0f;
+  params.separationWeight = 100.0f;
   params.obstacleAvoidanceType = 3;
 
 
@@ -637,7 +637,7 @@ void Sapphire::Common::Navi::NaviProvider::updateAgentParameters( int32_t naviAg
   dtCrowdAgentParams params{};
   std::memset( &params, 0, sizeof( params ) );
   params.height = 3.f;
-  params.maxAcceleration = 10.f;
+  params.maxAcceleration = 40.f;
   params.maxSpeed = speed;
   params.radius = radius;
   params.collisionQueryRange = speed * 0.5f;
@@ -647,7 +647,7 @@ void Sapphire::Common::Navi::NaviProvider::updateAgentParameters( int32_t naviAg
                     DT_CROWD_OPTIMIZE_VIS |
                     DT_CROWD_OPTIMIZE_TOPO |
                     DT_CROWD_OBSTACLE_AVOIDANCE;
-  params.separationWeight = 2.0f;
+  params.separationWeight = 100.0f;
   params.obstacleAvoidanceType = 3;
   m_pCrowd->updateAgentParameters( naviAgentId, &params );
 }
diff --git a/src/scripts/action/mobs/family/Ifrit/ActionHellfire.cpp b/src/scripts/action/mobs/family/Ifrit/ActionHellfire.cpp
index 113d036a4..f101032a3 100644
--- a/src/scripts/action/mobs/family/Ifrit/ActionHellfire.cpp
+++ b/src/scripts/action/mobs/family/Ifrit/ActionHellfire.cpp
@@ -23,6 +23,22 @@ class ActionHellfire : public Sapphire::ScriptAPI::ActionScript
 
   static constexpr auto Potency = 300;
 
+  virtual void onStart( Sapphire::World::Action::Action& action ) override
+  {
+    auto pChara = action.getSourceChara();
+
+    // todo: should just put the modifier in the status script?
+    std::vector< World::Action::StatusModifier > modifiers = {
+      { { Common::ParamModifier::DamageTakenPercent, -100 } }
+    };
+    
+    auto pEffect = std::make_shared< Sapphire::StatusEffect::StatusEffect >(
+            325, pChara, pChara, 8000, modifiers, 0, 3000
+    );
+
+    pChara->addStatusEffect( pEffect );
+  }
+
   void onExecute( Sapphire::World::Action::Action& action ) override
   {
     auto pSource = action.getSourceChara();
diff --git a/src/scripts/action/mobs/family/Ifrit/ActionVulcanBurst.cpp b/src/scripts/action/mobs/family/Ifrit/ActionVulcanBurst.cpp
index a074cdd62..776098dac 100644
--- a/src/scripts/action/mobs/family/Ifrit/ActionVulcanBurst.cpp
+++ b/src/scripts/action/mobs/family/Ifrit/ActionVulcanBurst.cpp
@@ -30,21 +30,25 @@ class ActionVulcanBurst : public Sapphire::ScriptAPI::ActionScript
     if( !pActionBuilder )
       return;
 
+    const auto& originPos = pSource->getPos();
     for( auto& pActor : pSource->getInRangeActors() )
     {
       if( !pActor->isPlayer() )
         continue;
 
       auto pTarget = pActor->getAsChara();
-      auto distance = Common::Util::distance( pSource->getPos(), pActor->getPos() );
+      auto distance = Common::Util::distance( originPos, pActor->getPos() );
       if( distance > 20.f )
         continue;
 
+      // todo: this can probably be made generic
       auto dmg = action.calcDamage( Potency );
+      if( dmg.first > 0 )
+      {
+        pTarget->knockback( originPos, 20.f - distance );
+        pActionBuilder->knockback( pTarget, 1, distance );
+      }
       pActionBuilder->damage( pSource, pTarget, dmg.first, dmg.second );
-
-    if( dmg.first > 0 )
-      pTarget->knockback( pSource->getPos(), 20.f );
     }
   }
 };
diff --git a/src/scripts/statuseffect/buffs/StatusEffectInvincibility.cpp b/src/scripts/statuseffect/buffs/StatusEffectInvincibility.cpp
new file mode 100644
index 000000000..d325d18ff
--- /dev/null
+++ b/src/scripts/statuseffect/buffs/StatusEffectInvincibility.cpp
@@ -0,0 +1,31 @@
+#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
+#include "StatusEffect/StatusEffect.h"
+
+#include <Action/CommonAction.h>
+#include <Actor/Chara.h>
+
+#include "Common.h"
+
+using namespace Sapphire;
+using namespace Sapphire::World::Action;
+
+class StatusEffectInvincibility : public Sapphire::ScriptAPI::StatusEffectScript
+{
+public:
+  StatusEffectInvincibility() : Sapphire::ScriptAPI::StatusEffectScript( 325 )
+  {
+  }
+
+  void onApply( Entity::Chara& actor ) override
+  {
+    actor.setInvincibilityType( Common::InvincibilityIgnoreDamage );
+  }
+
+  void onExpire( Entity::Chara& actor ) override
+  {
+    actor.setInvincibilityType( Common::InvincibilityNone );
+  }
+};
+
+EXPOSE_SCRIPT( StatusEffectInvincibility );
\ No newline at end of file
diff --git a/src/world/AI/Fsm/StateCombat.cpp b/src/world/AI/Fsm/StateCombat.cpp
index adeca622b..106729c45 100644
--- a/src/world/AI/Fsm/StateCombat.cpp
+++ b/src/world/AI/Fsm/StateCombat.cpp
@@ -20,7 +20,10 @@ void AI::Fsm::StateCombat::onUpdate( Entity::BNpc& bnpc, uint64_t tickCount )
     return;
   }
   auto pNaviProvider = pZone->getNaviProvider();
-  bool hasQueuedAction = bnpc.checkAction();
+  bool hasQueuedAction = bnpc.hasAction();
+
+  if( hasQueuedAction )
+    return;
 
   auto pHatedActor = bnpc.hateListGetHighest();
   if( !pHatedActor )
@@ -37,7 +40,7 @@ void AI::Fsm::StateCombat::onUpdate( Entity::BNpc& bnpc, uint64_t tickCount )
 
   if( !pHatedActor->isAlive() || bnpc.getTerritoryId() != pHatedActor->getTerritoryId() )
   {
-    bnpc.hateListRemove( pHatedActor );
+    bnpc.deaggro( pHatedActor );
     pHatedActor = bnpc.hateListGetHighest();
   }
 
@@ -47,6 +50,7 @@ void AI::Fsm::StateCombat::onUpdate( Entity::BNpc& bnpc, uint64_t tickCount )
   auto distance = Common::Util::distance( bnpc.getPos(), pHatedActor->getPos() );
 
   // All possibilities to automatically lose aggro go here
+  // todo: use status flags here instead of bnpc flags?
   if( !bnpc.hasFlag( Entity::NoDeaggro ) )
   {
     if( bnpc.hasFlag( Entity::Immobile ) && distance > 40.0f )
@@ -71,7 +75,7 @@ void AI::Fsm::StateCombat::onUpdate( Entity::BNpc& bnpc, uint64_t tickCount )
   }
   else
   {
-    if( !bnpc.hasFlag( Entity::TurningDisabled ) )
+    if( !bnpc.hasFlag( Entity::TurningDisabled ) && !bnpc.isFacingTarget( *pHatedActor, 1.0f ) )
     {
       bnpc.face( pHatedActor->getPos() );
       bnpc.sendPositionUpdate( tickCount );
@@ -81,13 +85,11 @@ void AI::Fsm::StateCombat::onUpdate( Entity::BNpc& bnpc, uint64_t tickCount )
   if( bnpc.getAgentId() != -1 )
   {
     auto pos = pNaviProvider->getAgentPos( bnpc.getAgentId() );
-    if( pos.x != bnpc.getPos().x || pos.y != bnpc.getPos().y || pos.z != bnpc.getPos().z )
-      bnpc.setPos( pos );
+    if( ( pos.x != bnpc.getPos().x || pos.y != bnpc.getPos().y || pos.z != bnpc.getPos().z ) && Common::Util::distance( bnpc.getPos(), pos ) > bnpc.getNaviTargetReachedDistance() )
+        bnpc.setPos( pos );
   }
 
-
-
-  if( !hasQueuedAction && distance < ( bnpc.getNaviTargetReachedDistance() + pHatedActor->getRadius() ) )
+  if( !hasQueuedAction && distance < ( bnpc.getNaviTargetReachedDistance() + pHatedActor->getRadius() + 1.0f ) )
   {
     bnpc.processGambits( tickCount );
 
diff --git a/src/world/AI/Fsm/StateIdle.cpp b/src/world/AI/Fsm/StateIdle.cpp
index 0536cd299..e8c6b6049 100644
--- a/src/world/AI/Fsm/StateIdle.cpp
+++ b/src/world/AI/Fsm/StateIdle.cpp
@@ -6,7 +6,7 @@ using namespace Sapphire::World;
 
 void AI::Fsm::StateIdle::onUpdate( Entity::BNpc& bnpc, uint64_t tickCount )
 {
-  bool hasQueuedAction = bnpc.checkAction();
+  bool hasQueuedAction = bnpc.hasAction();
 }
 
 void AI::Fsm::StateIdle::onEnter( Entity::BNpc& bnpc )
diff --git a/src/world/AI/TargetHelper.cpp b/src/world/AI/TargetHelper.cpp
index c6a1801f0..bb11c1e6a 100644
--- a/src/world/AI/TargetHelper.cpp
+++ b/src/world/AI/TargetHelper.cpp
@@ -2,6 +2,7 @@
 
 #include <algorithm>
 
+#include <Actor/GameObject.h>
 #include <Actor/BNpc.h>
 #include <Actor/Chara.h>
 #include <Actor/Player.h>
@@ -201,7 +202,7 @@ namespace Sapphire::World::AI
     return m_negate ? !ret : ret;
   }
 
-  void Snapshot::createSnapshot( Entity::CharaPtr pSrc, const std::set< Entity::GameObjectPtr >& inRange,
+  void Snapshot::createSnapshot( Entity::Chara& src, const std::set< Entity::GameObjectPtr >& inRange,
                                  uint32_t count, bool fillWithRandom,
                                  const std::vector< TargetSelectFilterPtr >& filters,
                                  const std::vector< uint32_t >& exclude )
@@ -209,6 +210,8 @@ namespace Sapphire::World::AI
     m_results.clear();
     m_targetIds.clear();
 
+    auto pSrc = src.getAsChara();
+
     auto& RNGMgr = Common::Service< Common::Random::RNGMgr >::ref();
     for( const auto& pActor : inRange )
     {
diff --git a/src/world/AI/TargetHelper.h b/src/world/AI/TargetHelper.h
index 122d7dd39..0176b69ae 100644
--- a/src/world/AI/TargetHelper.h
+++ b/src/world/AI/TargetHelper.h
@@ -268,7 +268,7 @@ namespace Sapphire::World::AI
   public:
     Snapshot() {}
 
-    void createSnapshot( Entity::CharaPtr pSrc, const std::set< Entity::GameObjectPtr >& inRange,
+    void createSnapshot( Entity::Chara& src, const std::set< Entity::GameObjectPtr >& inRange,
                          uint32_t count, bool fillWithRandom,
                          const std::vector< TargetSelectFilterPtr >& filters,
                          const std::vector< uint32_t >& exclude = {} );
diff --git a/src/world/Action/Action.cpp b/src/world/Action/Action.cpp
index 382a98bda..02398a217 100644
--- a/src/world/Action/Action.cpp
+++ b/src/world/Action/Action.cpp
@@ -96,7 +96,7 @@ bool Action::Action::init()
 
     m_actionData = actionData;
   }
-  auto teriMgr = Common::Service< Manager::TerritoryMgr >::ref();
+  auto& teriMgr = Common::Service< Manager::TerritoryMgr >::ref();
   auto zone = teriMgr.getTerritoryByGuId( m_pSource->getTerritoryId() );
   m_resultId = zone->getNextActionResultId();
 
@@ -216,6 +216,16 @@ bool Action::Action::isInterrupted() const
   return m_interruptType != Common::ActionInterruptType::None;
 }
 
+int Action::Action::getInterruptTickCount() const
+{
+  return m_interruptTickCount;
+}
+
+void Action::Action::addInterruptTickCount()
+{
+  m_interruptTickCount++;
+}
+
 Common::ActionInterruptType Action::Action::getInterruptType() const
 {
   return m_interruptType;
@@ -289,7 +299,7 @@ bool Action::Action::update()
     }
 
     player->setLastActionTick( tickCount );
-    uint64_t delayMs = 100 - lastTickMs;
+    uint64_t delayMs = 100ull - lastTickMs;
     castTime = ( m_castTimeMs + delayMs );
     m_castTimeRestMs = static_cast< uint64_t >( m_castTimeMs ) - static_cast< uint64_t >( std::difftime( tickCount, startTime ) );
   }
@@ -423,7 +433,7 @@ void Action::Action::interrupt()
   }
 
   onInterrupt();
-
+  addInterruptTickCount();
 }
 
 void Action::Action::onInterrupt()
@@ -982,15 +992,14 @@ void Action::Action::addDefaultActorFilters()
 {
   switch( m_castType )
   {
-    // todo: figure these out and remove 5/RectangularAOE to own handler
-    case( Common::CastType ) 5:
     case Common::CastType::SingleTarget:
     {
       auto filter = std::make_shared< World::Util::ActorFilterSingleTarget >( static_cast< uint32_t >( m_targetId ) );
       addActorFilter( filter );
       break;
     }
-
+    // todo: what is this CastType::Unknown (5)? seems to be another circular aoe?
+    case Common::CastType::Unknown:
     case Common::CastType::Circle:
     {
       auto filter = std::make_shared< World::Util::ActorFilterInRange >( m_pos, m_effectRange );
@@ -1005,6 +1014,7 @@ void Action::Action::addDefaultActorFilters()
     }
     case Common::CastType::Cone:
     {
+      // todo: account for Caster radius and Target radius
       ConeEntry shapeEntry = { 0, 0 };
       if( ActionShapeLut::validConeEntryExists( static_cast< uint16_t >( getId() ) ) )
       {
@@ -1040,7 +1050,7 @@ bool Action::Action::preFilterActor( Entity::GameObject& actor ) const
     return true;
 
   auto kind = actor.getObjKind();
-  auto chara = actor.getAsChara();
+  auto pChara = actor.getAsChara();
 
   // todo: are there any server side eobjs that players can hit?
   if( kind != ObjKind::BattleNpc && kind != ObjKind::Player )
@@ -1056,6 +1066,7 @@ bool Action::Action::preFilterActor( Entity::GameObject& actor ) const
     }
     case Common::TargetFilter::Players:
     {
+      // todo: handle pets (use TargetHelper::OwnBattalionFilter maybe?)
       actorApplicable = kind == ObjKind::Player;
       break;
     }
@@ -1093,10 +1104,10 @@ bool Action::Action::preFilterActor( Entity::GameObject& actor ) const
     }
   }
   
-  if( chara->isAlive() && ( m_lutEntry.curePotency > 0 || m_canTargetFriendly ) && m_pSource->isFriendly( *chara ) )
+  if( pChara->isAlive() && ( m_lutEntry.curePotency > 0 || m_canTargetFriendly ) && m_pSource->isFriendly( *pChara ) )
     return actorApplicable;
 
-  if( chara->isAlive() && ( m_lutEntry.potency > 0 || m_canTargetHostile ) && m_pSource->isHostile( *chara ) )
+  if( pChara->isAlive() && ( m_lutEntry.potency > 0 || m_canTargetHostile ) && m_pSource->isHostile( *pChara ) )
     return actorApplicable;
 
   return false;
diff --git a/src/world/Action/Action.h b/src/world/Action/Action.h
index e1a4b0900..93979910d 100644
--- a/src/world/Action/Action.h
+++ b/src/world/Action/Action.h
@@ -39,6 +39,10 @@ namespace Sapphire::World::Action
     Entity::CharaPtr getSourceChara() const;
 
     bool isInterrupted() const;
+
+    int getInterruptTickCount() const;
+    void addInterruptTickCount();
+
     Common::ActionInterruptType getInterruptType() const;
     void setInterrupted( Common::ActionInterruptType type );
 
@@ -218,6 +222,7 @@ namespace Sapphire::World::Action
     bool m_enableGenericHandler{};
 
     Common::ActionInterruptType m_interruptType;
+    int m_interruptTickCount{ -1 };
 
     std::shared_ptr< Excel::ExcelStruct< Excel::Action > > m_actionData;
 
diff --git a/src/world/Action/ActionResult.cpp b/src/world/Action/ActionResult.cpp
index 67f66d214..b5a1a9637 100644
--- a/src/world/Action/ActionResult.cpp
+++ b/src/world/Action/ActionResult.cpp
@@ -69,6 +69,13 @@ void ActionResult::startCombo( uint16_t actionId )
   m_result.Type = CalcResultType::TypeCombo;
 }
 
+void ActionResult::knockback( uint32_t kbExdKey, float offset )
+{
+  m_result.Arg0 = offset;
+  m_result.Value = kbExdKey;
+  m_result.Type = CalcResultType::TypeKnockBack;
+}
+
 void ActionResult::comboSucceed()
 {
   // no EffectOnSource flag on this
diff --git a/src/world/Action/ActionResult.h b/src/world/Action/ActionResult.h
index d9e781182..d1d55f61b 100644
--- a/src/world/Action/ActionResult.h
+++ b/src/world/Action/ActionResult.h
@@ -19,6 +19,8 @@ namespace Sapphire::World::Action
     void heal( uint32_t amount, Common::CalcResultType hitType, uint8_t hitEffect, Common::ActionResultFlag flag = Common::ActionResultFlag::None, float aggroModifier = 1.0f );
     void restoreMP( uint32_t amount, Common::ActionResultFlag flag = Common::ActionResultFlag::None );
     void startCombo( uint16_t actionId );
+    void knockback( uint32_t kbExdKey, float offset );
+
     void comboSucceed();
     void applyStatusEffect( uint32_t id, int32_t duration, Entity::Chara& source, uint8_t param, bool applyAggro, bool shouldOverride );
     void applyStatusEffect( uint32_t id, int32_t duration, Entity::Chara& source, uint8_t param, const std::vector< World::Action::StatusModifier >& modifiers,
diff --git a/src/world/Action/ActionResultBuilder.cpp b/src/world/Action/ActionResultBuilder.cpp
index 494d94650..93930f822 100644
--- a/src/world/Action/ActionResultBuilder.cpp
+++ b/src/world/Action/ActionResultBuilder.cpp
@@ -87,6 +87,13 @@ void ActionResultBuilder::startCombo( Entity::CharaPtr& target, uint16_t actionI
   addResultToActor( target, nextResult );
 }
 
+void ActionResultBuilder::knockback( Entity::CharaPtr& target, uint32_t kbExdKey, float offset )
+{
+  ActionResultPtr nextResult = make_ActionResult( m_sourceChara, target );
+  nextResult->knockback( kbExdKey, offset );
+  addResultToActor( target, nextResult );
+}
+
 void ActionResultBuilder::comboSucceed( Entity::CharaPtr& target )
 {
   ActionResultPtr nextResult = make_ActionResult( m_sourceChara, target );
@@ -149,15 +156,29 @@ void ActionResultBuilder::mount( Entity::CharaPtr& target, uint16_t mountId )
 
 void ActionResultBuilder::sendActionResults( const std::vector< Entity::CharaPtr >& targetList )
 {
-  //Logger::debug( "EffectBuilder result: " );
-  //Logger::debug( "Targets afflicted: {}", targetList.size() );
+  auto inRange = m_sourceChara->getInRangePlayerIds( true );
 
-  do // we want to send at least one packet even nothing is hit so other players can see
+  // we want to send at least one packet even nothing is hit so other players can see
+  if( targetList.empty() )
   {
-    auto packet = createActionResultPacket( targetList );
-    server().queueForPlayers( m_sourceChara->getInRangePlayerIds( true ), packet );
+    std::vector< Entity::CharaPtr > emptyChunk;
+    auto packet = createActionResultPacket( emptyChunk );
+    server().queueForPlayers( inRange, packet );
+    return;
+  }
+
+  // split into multiple packets if > 16 targets
+  // todo: test this actually works
+  for( size_t i = 0; i < targetList.size(); i += 16 )
+  {
+    auto begin = targetList.begin() + i;
+    auto end = targetList.begin() + std::min( targetList.size(), i + 16 );
+
+    std::vector< Entity::CharaPtr > chunk( begin, end );
+
+    auto packet = createActionResultPacket( chunk );
+    server().queueForPlayers( inRange, packet );
   }
-  while( !m_actorResultsMap.empty() );
 }
 
 std::shared_ptr< FFXIVPacketBase > ActionResultBuilder::createActionResultPacket( const std::vector< Entity::CharaPtr >& targetList )
@@ -196,7 +217,7 @@ std::shared_ptr< FFXIVPacketBase > ActionResultBuilder::createActionResultPacket
 
       for( auto& result : actorResultList )
       {
-        auto effect = result->getCalcResultParam();
+        const auto& effect = result->getCalcResultParam();
         if( result->getTarget() == m_sourceChara )
           actionResult->addSourceEffect( effect );
         else
@@ -226,7 +247,7 @@ std::shared_ptr< FFXIVPacketBase > ActionResultBuilder::createActionResultPacket
 
       for( auto& result : actorResultList )
       {
-        auto effect = result->getCalcResultParam();
+        const auto& effect = result->getCalcResultParam();
         if( result->getTarget() == m_sourceChara &&
             result->getCalcResultParam().Type != Common::CalcResultType::TypeSetStatusMe )
           actionResult->addSourceEffect( effect );
diff --git a/src/world/Action/ActionResultBuilder.h b/src/world/Action/ActionResultBuilder.h
index 58593332f..667b423d1 100644
--- a/src/world/Action/ActionResultBuilder.h
+++ b/src/world/Action/ActionResultBuilder.h
@@ -24,6 +24,8 @@ namespace Sapphire::World::Action
 
     void startCombo( Entity::CharaPtr& target, uint16_t actionId );
 
+    void knockback( Entity::CharaPtr& target, uint32_t kbExdKey, float offset );
+
     void comboSucceed( Entity::CharaPtr& target );
 
     void applyStatusEffect( Entity::CharaPtr& target, uint16_t statusId, uint32_t duration, uint8_t param, bool shouldOverride = false );
diff --git a/src/world/Actor/BNpc.cpp b/src/world/Actor/BNpc.cpp
index 2d510db51..3a4194bdb 100644
--- a/src/world/Actor/BNpc.cpp
+++ b/src/world/Actor/BNpc.cpp
@@ -405,7 +405,7 @@ bool BNpc::moveTo( const FFXIVARR_POSITION3& pos )
   auto pos1 = pNaviProvider->getAgentPos( getAgentId() );
   auto distance = Common::Util::distance( pos1, pos );
 
-  if( distance < getNaviTargetReachedDistance() )
+  if( distance <= getNaviTargetReachedDistance() )
   {
     // Reached destination
     face( pos );
@@ -427,38 +427,7 @@ bool BNpc::moveTo( const FFXIVARR_POSITION3& pos )
 
 bool BNpc::moveTo( const Chara& targetChara )
 {
-  auto& teriMgr = Common::Service< World::Manager::TerritoryMgr >::ref();
-  auto pZone = teriMgr.getTerritoryByGuId( getTerritoryId() );
-
-  auto pNaviProvider = pZone->getNaviProvider();
-
-  if( !pNaviProvider )
-  {
-    Logger::error( "No NaviProvider for zone#{0} - {1}", pZone->getGuId(), pZone->getInternalName() );
-    return false;
-  }
-
-  auto pos1 = pNaviProvider->getAgentPos( getAgentId() );
-  auto distance = Common::Util::distance( pos1, targetChara.getPos() );
-
-  if( distance <= ( getNaviTargetReachedDistance() + targetChara.getRadius() ) )
-  {
-    // Reached destination
-    face( targetChara.getPos() );
-    setPos( pos1 );
-    pNaviProvider->resetMoveTarget( getAgentId() );
-    auto newAgentId = pNaviProvider->updateAgentPosition( getAgentId(), pos1, getRadius(), getCurrentSpeed() );
-    setAgentId( newAgentId );
-    return true;
-  }
-
-  pZone->updateActorPosition( *this );
-  if( distance > 2.0f )
-    face( { ( pos1.x - getPos().x ) + pos1.x, 1.0f, ( pos1.z - getPos().z ) + pos1.z } );
-  else
-    face( targetChara.getPos() );
-  setPos( pos1 );
-  return false;
+  return moveTo( targetChara.getPos() );
 }
 
 float mapSpeedToRange( float speed, float minSpeed = 0.0f, float maxSpeed = 18.0f )
@@ -768,7 +737,7 @@ void BNpc::notifyPlayerDeaggro( const CharaPtr& pChara )
   if( getTriggerOwnerId() == pChara->getId() )
   {
     auto& scriptMgr = Common::Service< Scripting::ScriptMgr >::ref();
-    auto bnpc = *getAsBNpc();
+    auto& bnpc = *getAsBNpc();
     scriptMgr.onTriggerOwnerDeaggro( *tmpPlayer, bnpc );
   }
 }
diff --git a/src/world/Actor/Chara.cpp b/src/world/Actor/Chara.cpp
index 5137f8e28..fdb9ef637 100644
--- a/src/world/Actor/Chara.cpp
+++ b/src/world/Actor/Chara.cpp
@@ -18,6 +18,8 @@
 
 #include "Network/Util/PacketUtil.h"
 
+#include "AI/TargetHelper.h"
+
 #include "Action/Action.h"
 #include "WorldServer.h"
 #include "Session.h"
@@ -355,23 +357,36 @@ void Chara::setStance( Stance stance )
 /*!
 Check if an action is queued for execution, if so update it
 and if fully performed, clean up again.
-
-\return true if a queued action has been updated
 */
-bool Chara::checkAction()
+void Chara::processActions()
 {
   if( m_pCurrentAction == nullptr )
-    return false;
+    return;
 
-  if( m_pCurrentAction->update() )
+  // delay removing action for 3 tick after interrupting
+  // todo: why does this need to be held for 3 ticks for TimelinePack to pick this up?
+  if( m_pCurrentAction->isInterrupted() && m_pCurrentAction->getInterruptTickCount() < 3 )
+  {
+    if( m_pCurrentAction->getInterruptTickCount() == -1 )
+      m_pCurrentAction->update();
+    else
+      m_pCurrentAction->addInterruptTickCount();
+  }
+  else if( m_pCurrentAction->update() )
+  {
     m_pCurrentAction.reset();
+  }
+}
 
-  return true;
+bool Chara::hasAction() const
+{
+  return m_pCurrentAction != nullptr;
 }
 
 void Chara::update( uint64_t tickCount )
 {
   updateStatusEffects();
+  processActions();
 
   if( std::difftime( static_cast< time_t >( tickCount ), m_lastTickTime ) > 3000 )
   {
@@ -417,6 +432,9 @@ void Chara::takeDamage( uint32_t damage, bool broadcastUpdate )
   if( m_status == ActorStatus::Dead )
     return;
 
+  if( m_invincibilityType == InvincibilityIgnoreDamage )
+    damage = 0;
+
   if( damage >= m_hp )
   {
     switch( m_invincibilityType )
@@ -546,6 +564,10 @@ void Chara::addStatusEffect( StatusEffect::StatusEffectPtr pEffect )
   pEffect->setSlot( nextSlot );
   m_statusEffectMap[ nextSlot ] = pEffect;
   pEffect->applyStatus();
+
+  Network::Util::Packet::sendActorControl( getInRangePlayerIds( isPlayer() ), getId(), StatusEffectGain,
+                                           pEffect->getId() );
+  Network::Util::Packet::sendHudParam( *this );
 }
 
 /*! \param StatusEffectPtr to be applied to the actor */
@@ -594,13 +616,13 @@ void Chara::replaceSingleStatusEffect( uint32_t slotId, StatusEffect::StatusEffe
   pStatus->applyStatus();
 }
 
-void Chara::replaceSingleStatusEffectById( uint32_t id )
+void Chara::replaceSingleStatusEffectById( uint32_t id, StatusEffect::StatusEffectPtr pStatus )
 {
   for( const auto& effectIt : m_statusEffectMap )
   {
     if( effectIt.second->getId() == id )
     {
-      removeStatusEffect( effectIt.first, false );
+      replaceSingleStatusEffect( effectIt.first, pStatus );
       break;
     }
   }
@@ -797,6 +819,17 @@ bool Chara::hasStatusEffect( uint32_t id )
   return false;
 }
 
+bool Chara::hasStatusEffectByFlag( Common::StatusEffectFlag flag )
+{
+  auto uflag = static_cast< uint32_t >( flag );
+  for( const auto& [ key, pEffect ] : m_statusEffectMap )
+  {
+    if( ( pEffect->getFlag() & uflag ) != 0 )
+      return true;
+  }
+  return false;
+}
+
 int64_t Chara::getLastUpdateTime() const
 {
   return m_lastUpdate;
@@ -976,14 +1009,24 @@ bool Chara::isFacingTarget( const Chara& other, float threshold )
   return dot >= threshold;
 }
 
-bool Sapphire::Entity::Chara::isHostile( const Chara& chara )
+bool Sapphire::Entity::Chara::isHostile( Chara& chara )
 {
-  return m_objKind != chara.getObjKind();
+  static auto pBattalionFilter = std::make_shared< AI::OwnBattalionFilter >();
+
+  auto pTarget = chara.getAsChara();
+  auto pSrc = getAsChara();
+
+  return !pBattalionFilter->isApplicable( pSrc, pTarget );
 }
 
-bool Sapphire::Entity::Chara::isFriendly( const Chara& chara )
+bool Sapphire::Entity::Chara::isFriendly( Chara& chara )
 {
-  return m_objKind == chara.getObjKind();
+  static auto pBattalionFilter = std::make_shared< AI::OwnBattalionFilter >();
+
+  auto pTarget = chara.getAsChara();
+  auto pSrc = getAsChara();
+
+  return pBattalionFilter->isApplicable( pSrc, pTarget );
 }
 
 void Chara::onTick()
@@ -1050,16 +1093,25 @@ void Chara::knockback( const FFXIVARR_POSITION3& origin, float distance, bool ig
     }
     setPos( navPos );
     // speed needs to be reset properly here
-    pNav->updateAgentPosition( getAgentId(), getPos(), getRadius(), 1 );
+    setAgentId( pNav->updateAgentPosition( getAgentId(), getPos(), getRadius(), pNav->getAgentSpeed( getAgentId() ) ) );
   }
   else
   {
     setPos( kbPos );
   }
   pTeri->updateActorPosition( *this );
+
+  auto pTransferPacket = makeZonePacket< FFXIVIpcTransfer >( getId() );
+  pTransferPacket->data().dir = Common::Util::floatToUInt16Rot( getRot() );
+  pTransferPacket->data().pos[ 0 ] = Common::Util::floatToUInt16( kbPos.x );
+  pTransferPacket->data().pos[ 1 ] = Common::Util::floatToUInt16( kbPos.y );
+  pTransferPacket->data().pos[ 2 ] = Common::Util::floatToUInt16( kbPos.z );
+  pTransferPacket->data().duration = 1.0f;
+
   // todo: send the correct knockback packet to player
   server().queueForPlayers( getInRangePlayerIds(),
-                            std::make_shared< MoveActorPacket >( *this, getRotUInt8(), 2, 0, 0, 0x5A / 4 ) );
+                            pTransferPacket );
+
 }
 
 void Chara::createAreaObject( uint32_t actionId, uint32_t actionPotency, uint32_t vfxId, float scale,
diff --git a/src/world/Actor/Chara.h b/src/world/Actor/Chara.h
index e39edfc46..1bf3aa7c1 100644
--- a/src/world/Actor/Chara.h
+++ b/src/world/Actor/Chara.h
@@ -146,7 +146,7 @@ namespace Sapphire::Entity
 
     void replaceSingleStatusEffect( uint32_t slotId, StatusEffect::StatusEffectPtr pStatus );
 
-    void replaceSingleStatusEffectById( uint32_t id );
+    void replaceSingleStatusEffectById( uint32_t id, StatusEffect::StatusEffectPtr pStatus );
 
     void removeSingleStatusEffectById( uint32_t id );
 
@@ -160,6 +160,8 @@ namespace Sapphire::Entity
 
     bool hasStatusEffect( uint32_t id );
 
+    bool hasStatusEffectByFlag( Common::StatusEffectFlag flag );
+
     int8_t getStatusEffectFreeSlot();
 
     void statusEffectFreeSlot( uint8_t slotId );
@@ -273,11 +275,11 @@ namespace Sapphire::Entity
 
     virtual void onDamageTaken( Chara& pSource ) {};
 
-    virtual bool isHostile( const Chara& chara );
+    virtual bool isHostile( Chara& chara );
 
     virtual void onActionHostile( CharaPtr pSource, int32_t aggro ) {};
 
-    virtual bool isFriendly( const Chara& chara );
+    virtual bool isFriendly( Chara& chara );
 
     virtual void onActionFriendly( Chara& pSource ) {};
 
@@ -293,7 +295,9 @@ namespace Sapphire::Entity
 
     virtual void restoreMP( uint32_t amount );
 
-    virtual bool checkAction();
+    virtual void processActions();
+
+    bool hasAction() const;
 
     virtual void update( uint64_t tickCount );
 
diff --git a/src/world/Actor/Player.cpp b/src/world/Actor/Player.cpp
index cf26f523e..e9e49eb99 100644
--- a/src/world/Actor/Player.cpp
+++ b/src/world/Actor/Player.cpp
@@ -1547,10 +1547,10 @@ void Player::resetRecastGroups()
   Network::Util::Packet::sendRecastGroups( *this );
 }
 
-bool Player::checkAction()
+void Player::processActions()
 {
   if( m_pCurrentAction == nullptr )
-    return false;
+    return;
 
   if( m_pCurrentAction->update() )
   {
@@ -1567,8 +1567,6 @@ bool Player::checkAction()
       m_pQueuedAction = nullptr;
     }
   }
-
-  return true;
 }
 
 uint64_t Player::getPartyId() const
diff --git a/src/world/Actor/Player.h b/src/world/Actor/Player.h
index 4edf58c2c..cc1de587d 100644
--- a/src/world/Actor/Player.h
+++ b/src/world/Actor/Player.h
@@ -462,7 +462,7 @@ namespace Sapphire::Entity
     /*! return a reference to the setMount guide bitmask array */
     MountList& getMountGuideBitmask();
 
-    bool checkAction() override;
+    void processActions() override;
 
     bool hasQueuedAction() const;
 
diff --git a/src/world/Encounter/ScheduleCondition.cpp b/src/world/Encounter/ScheduleCondition.cpp
index ef6fa2349..8fccecc89 100644
--- a/src/world/Encounter/ScheduleCondition.cpp
+++ b/src/world/Encounter/ScheduleCondition.cpp
@@ -41,10 +41,7 @@ namespace Sapphire
 
   bool ConditionDirectorVar::isConditionMet( ConditionState& state, TimelinePack& pack, EncounterPtr pEncounter, uint64_t time ) const
   {
-    auto pTeri = pEncounter->getTeriPtr();
-    Event::DirectorPtr pDirector = pTeri->getAsInstanceContent();
-    if( pDirector == nullptr )
-      pDirector = pTeri->getAsQuestBattle();
+    auto pDirector = pEncounter->getDirector();
 
     switch( m_conditionType )
     {
@@ -69,7 +66,6 @@ namespace Sapphire
     auto pTeri = pEncounter->getTeriPtr();
     auto pBNpc = pTeri->getActiveBNpcByLayoutId( m_layoutId );
 
-
     if( !pBNpc )
     {
       return false;
@@ -116,7 +112,13 @@ namespace Sapphire
   {
     auto pTeri = pEncounter->getTeriPtr();
     auto pBNpc = pTeri->getActiveBNpcByLayoutId( m_layoutId );
-    return pBNpc && pBNpc->getCurrentAction() && pBNpc->getCurrentAction()->getId() == m_actionId;
+
+    if( pBNpc )
+    {
+      auto pAction = pBNpc->getCurrentAction();
+      return pAction && pAction->getId() == m_actionId && !pAction->isInterrupted();
+    }
+    return false;
   }
 
   bool ConditionScheduleActive::isConditionMet( ConditionState& state, TimelinePack& pack, EncounterPtr pEncounter, uint64_t time ) const
@@ -124,6 +126,48 @@ namespace Sapphire
     return pack.isScheduleActive( m_actorName, m_scheduleName );
   }
 
+  bool ConditionInterruptedAction::isConditionMet( ConditionState& state, TimelinePack& pack, EncounterPtr pEncounter, uint64_t time ) const
+  {
+    auto pTeri = pEncounter->getTeriPtr();
+    auto pBNpc = pTeri->getActiveBNpcByLayoutId( m_layoutId );
+
+    if( pBNpc )
+    {
+      auto pAction = pBNpc->getCurrentAction();
+      return pAction && pAction->getId() == m_actionId && pAction->isInterrupted();
+    }
+    return false;
+  }
+
+  bool ConditionVarEquals::isConditionMet( ConditionState& state, TimelinePack& pack, EncounterPtr pEncounter, uint64_t time ) const
+  {
+    auto pDirector = pEncounter->getDirector();
+
+    switch( m_type )
+    {
+      case VarType::Director:
+      {
+        if( pDirector )
+          return pDirector->getDirectorVar( m_index ) == m_val;
+      }
+      break;
+      case VarType::Custom:
+      {
+        if( pDirector )
+          return pDirector->getCustomVar( m_index ) == m_val;
+      }
+      break;
+      case VarType::Pack:
+      {
+        return pack.getVar( m_index ) == m_val;
+      }
+      break;
+      default:
+        break;
+    }
+    return false;
+  }
+
   void ConditionHp::from_json( nlohmann::json& json, Schedule& phase, ConditionType condition,
                                const std::unordered_map< std::string, TimelineActor >& actors )
   {
@@ -217,6 +261,7 @@ namespace Sapphire
                                       const std::unordered_map< std::string, TimelineActor >& actors )
   {
     ScheduleCondition::from_json( json, phase, condition, actors );
+
     auto& paramData = json.at( "paramData" );
     auto actorRef = paramData.at( "sourceActor" ).get< std::string >();
 
@@ -261,6 +306,43 @@ namespace Sapphire
     m_scheduleName = scheduleName;
   }
 
+  void ConditionInterruptedAction::from_json( nlohmann::json& json, Schedule& phase, ConditionType condition, const std::unordered_map< std::string, TimelineActor >& actors )
+  {
+    ScheduleCondition::from_json( json, phase, condition, actors );
+
+    auto& paramData = json.at( "paramData" );
+    auto actorRef = paramData.at( "sourceActor" ).get< std::string >();
+    auto actionId = paramData.at( "actionId" ).get< std::uint32_t >();
+
+    // resolve the actor whose name we are checking
+    if( auto it = actors.find( actorRef ); it != actors.end() )
+      m_layoutId = it->second.m_layoutId;
+    else
+      throw std::runtime_error( fmt::format( std::string( "ConditionInterruptedAction::from_json unable to find actor by name: %s" ), actorRef ) );
+
+    m_actionId = actionId;
+  }
+
+  void ConditionVarEquals::from_json( nlohmann::json& json, Schedule& phase, ConditionType condition, const std::unordered_map< std::string, TimelineActor >& actors )
+  {
+    ScheduleCondition::from_json( json, phase, condition, actors );
+
+    auto& paramData = json.at( "paramData" );
+    auto index = paramData.at( "index" ).get< uint32_t >();
+    auto val = paramData.at( "val" ).get< uint32_t >();
+    auto type = paramData.at( "type" ).get< std::string >();
+
+    if( type == "director" )
+      m_type = VarType::Director;
+    else if( type == "custom" )
+      m_type = VarType::Custom;
+    else
+      m_type = VarType::Pack;
+
+    m_index = index;
+    m_val = val;
+  }
+
   // todo: i wrote this very sleep deprived, ensure it is actually sane
 
   void Schedule::execute( ConditionState& state, TimelineActor& self, TimelinePack& pack, EncounterPtr pEncounter, uint64_t time ) const
@@ -284,11 +366,12 @@ namespace Sapphire
 
       if( elapsed >= timepoint.m_offset )
       {
-        state.m_scheduleInfo.m_lastTimepointTime = time;
-        state.m_scheduleInfo.m_lastTimepointIndex = ++i;
-
-        timepoint.execute( self, pack, pEncounter, time );
-        continue;
+        if( timepoint.execute( self, pack, pEncounter, time ) )
+        {
+          state.m_scheduleInfo.m_lastTimepointTime = time;
+          state.m_scheduleInfo.m_lastTimepointIndex = ++i;
+          continue;
+        }
       }
       break;
     }
@@ -305,4 +388,5 @@ namespace Sapphire
   {
     return state.m_scheduleInfo.m_lastTimepointIndex == m_timepoints.size();
   }
-}// namespace Sapphire::Encounter
\ No newline at end of file
+
+}// namespace Sapphire
\ No newline at end of file
diff --git a/src/world/Encounter/ScheduleCondition.h b/src/world/Encounter/ScheduleCondition.h
index c04f79292..6c71a86d6 100644
--- a/src/world/Encounter/ScheduleCondition.h
+++ b/src/world/Encounter/ScheduleCondition.h
@@ -35,7 +35,10 @@ namespace Sapphire
     BNpcHasFlags,
 
     GetAction,
-    ScheduleActive
+    ScheduleActive,
+    InterruptedAction,
+
+    VarEquals
   };
 
   class Schedule : public std::enable_shared_from_this< Schedule >
@@ -80,7 +83,7 @@ namespace Sapphire
       this->m_id = json.at( "id" ).get< uint32_t >();
     }
 
-    const std::string& getScheduleName()
+    const std::string& getScheduleName() const
     {
       return m_schedule.m_name;
     }
@@ -241,4 +244,26 @@ namespace Sapphire
     bool isConditionMet( ConditionState& state, TimelinePack& pack, EncounterPtr pEncounter, uint64_t time ) const override;
   };
 
-}// namespace Sapphire::Encounter
\ No newline at end of file
+  class ConditionInterruptedAction : public ScheduleCondition
+  {
+  public:
+    uint32_t m_layoutId;
+    uint32_t m_actionId;
+
+    void from_json( nlohmann::json& json, Schedule& phase, ConditionType condition, const std::unordered_map< std::string, TimelineActor >& actors ) override;
+    bool isConditionMet( ConditionState& state, TimelinePack& pack, EncounterPtr pEncounter, uint64_t time ) const override;
+  };
+
+  class ConditionVarEquals : public ScheduleCondition
+  {
+  public:
+    uint32_t m_index;
+    uint32_t m_val;
+
+    VarType m_type;
+
+    void from_json( nlohmann::json& json, Schedule& phase, ConditionType condition, const std::unordered_map< std::string, TimelineActor >& actors ) override;
+    bool isConditionMet( ConditionState& state, TimelinePack& pack, EncounterPtr pEncounter, uint64_t time ) const override;
+  };
+
+}// namespace Sapphire
\ No newline at end of file
diff --git a/src/world/Encounter/Selector.cpp b/src/world/Encounter/Selector.cpp
index c61fdac93..1d60721a4 100644
--- a/src/world/Encounter/Selector.cpp
+++ b/src/world/Encounter/Selector.cpp
@@ -122,9 +122,9 @@ namespace Sapphire
     }
   }
 
-  void Selector::createSnapshot( Entity::CharaPtr pSrc, const std::vector< uint32_t >& exclude )
+  void Selector::createSnapshot( Entity::Chara& src, const std::vector< uint32_t >& exclude )
   {
-    m_snapshot.createSnapshot( pSrc, pSrc->getInRangeActors(), m_count, m_fillWithRandom, m_filters, exclude );
+    m_snapshot.createSnapshot( src, src.getInRangeActors(), m_count, m_fillWithRandom, m_filters, exclude );
   }
 
   const World::AI::Snapshot::Results& Selector::getResults()
diff --git a/src/world/Encounter/Selector.h b/src/world/Encounter/Selector.h
index 4c3d1361a..a42c147f6 100644
--- a/src/world/Encounter/Selector.h
+++ b/src/world/Encounter/Selector.h
@@ -18,7 +18,7 @@ namespace Sapphire
 
   public:
     Selector(){}
-    void createSnapshot( Entity::CharaPtr pSrc, const std::vector< uint32_t >& exclude = {} );
+    void createSnapshot( Entity::Chara& src, const std::vector< uint32_t >& exclude = {} );
     const World::AI::Snapshot::Results& getResults();
     const World::AI::Snapshot::TargetIds& getTargetIds();
     void clearResults();
diff --git a/src/world/Encounter/TimelinePack.cpp b/src/world/Encounter/TimelinePack.cpp
index 8cbea7413..b089ce470 100644
--- a/src/world/Encounter/TimelinePack.cpp
+++ b/src/world/Encounter/TimelinePack.cpp
@@ -20,6 +20,9 @@
 
 #include <Manager/ActionMgr.h>
 #include <Manager/PlayerMgr.h>
+
+#include <Random/RNGMgr.h>
+
 #include <Service.h>
 
 #include <Territory/QuestBattle.h>
@@ -31,283 +34,10 @@
 
 namespace Sapphire
 {
-
-  /*
-  class RngCondition : TimepointCondition
-  {
-    EncounterTimepointcondition m_type;
-    std::vector< uint32_t > m_params
-    
-    RngCondition( EncounterTimepointcondition condition std::vector< uint32_t params ) : m_type( condition ), m_params( params ){}
-    bool isConditionMet( uint32_t shit )
-    {
-      switch( m_type )
-      {
-        case EncounterTimepointcondition::RngMinMax:
-          return RNGMgr::generate( params[0], params[1] ) == params[2];
-      }
-      return false;
-    }
-  }
-  enum class ActionCallbackType : uint32_t
-  {
-    OnActionInit,
-    OnActionStart,
-    OnActionInterrupt,
-    OnActionExecute
-  };
-
-  using CallbackFunc = std::function< void < CharaPtr, Action > >;
-
-  std::unordered_map< ActionCallbackType, CallbackFunc > m_actionCallbacks;
-  void Chara::registerActionCallback( ActionCallbackType type, CallbackFunc callback )
-  {
-    m_actionCallbacks[ type ].push_back( callback );
-  }
-
-  // call this when changing EncounterPack
-  void Chara::clearActionCallbacks()
-  {
-    for( auto& callback : m_actionCallbacks )
-      callback.second.clear()
-  }
-
-  void Chara::onActionInterrupt()
-  {
-    auto action = getCurrentAction();
-    for( auto& callback : m_actionCallbacks[ ActionCallbackType::OnActionInterrupt ] )
-      callback( this, action );
-  }
-
-  void EncounterTimeline::Timepoint::execute( TerritoryPtr pTeri, uint64_t time )
-  {
-    switch( m_type )
-    {
-      case TimepointDataType::CastAction:
-      {
-        auto pActionData = std::dynamic_pointer_cast< TimepointDataAction, TimepointData >( getData() );
-
-        // todo: filter the correct target
-        // todo: tie to mechanic script?
-      }
-    }
-  }
-  */
-
   //
   // parsing stuff below
   //
 
-  TimelinePack TimelinePack::getEncounterPack( const std::string& name, bool reload )
-  {
-    static std::unordered_map< std::string, TimelinePack > cache = {};
-    const static std::unordered_map< std::string, ConditionType > conditionMap =
-    {
-      { "hpPctLessThan",            ConditionType::HpPctLessThan },
-      { "hpPctBetween",             ConditionType::HpPctBetween },
-
-      { "directorVarEquals",        ConditionType::DirectorVarEquals },
-      { "directorVarGreaterThan",   ConditionType::DirectorVarGreaterThan },
-
-      { "directorSeqEquals",        ConditionType::DirectorSeqEquals },
-      { "directorSeqGreaterThan",   ConditionType::DirectorSeqGreaterThan },
-
-      { "directorFlagsEquals",      ConditionType::DirectorFlagsEquals },
-      { "directorFlagsGreaterThan", ConditionType::DirectorFlagsGreaterThan },
-
-      { "encounterTimeElapsed",     ConditionType::EncounterTimeElapsed },
-
-      { "combatState",              ConditionType::CombatState },
-      { "bnpcHasFlags",             ConditionType::BNpcHasFlags },
-
-      { "getAction",                ConditionType::GetAction },
-      { "scheduleActive",           ConditionType::ScheduleActive }
-    };
-
-    TimelinePack pack;
-    if( cache.find( name ) != cache.end() && !reload )
-      return cache.at( name );
-
-    std::string encounter_name( fmt::format( std::string( "data/EncounterTimelines/{}.json" ), name ) );
-
-    std::fstream f( encounter_name );
-
-    if( !f.is_open() )
-      return pack;
-
-    auto json = nlohmann::json::parse( f );
-
-    std::unordered_map< std::string, TimelineActor > actorNameMap;
-    std::unordered_map< std::string, std::map< std::string, Schedule > > actorNameSchedMap;
-
-    for( const auto& selectorJ : json.at( "selectors" ).items() )
-    {
-      auto& selectorV = selectorJ.value();
-      auto name = selectorV.at( "name" ).get< std::string >();
-      Selector selector;
-      selector.from_json( selectorV );
-
-      pack.addSelector( name, selector );
-    }
-
-    // first run through cache actor info
-    for( const auto& actorJ : json.at( "actors" ).items() )
-    {
-      TimelineActor actor;
-      auto& actorV = actorJ.value();
-      actor.m_hp = actorV.at( "hp" ).get< uint32_t >();
-      actor.m_layoutId = actorV.at( "layoutId" ).get< uint32_t >();
-      actor.m_name = actorV.at( "name" ).get< std::string >();
-
-      auto& subActorsJ = actorV.at( "subactors" );
-
-      if( !subActorsJ.is_null() )
-        for( const auto& subActorV : subActorsJ.items() )
-          actor.addPlaceholderSubactor( subActorV.value().get< std::string >() );
-       
-      actorNameMap.emplace( std::make_pair( actor.m_name, actor ) );
-    }
-
-    // build timeline info per actor
-    for( const auto& actorJ : json.at( "actors" ).items() )
-    {
-      // < actorName, < schedulename, schedule > >
-      std::map< std::string, Schedule > scheduleNameMap;
-
-      auto& actorV = actorJ.value();
-      std::string actorName = actorV.at( "name" );
-
-      TimelineActor& actor = actorNameMap[ actorName ];
-      // todo: are schedules linked by actor, or global in the json
-      for( const auto& scheduleJ : actorV.at( "schedules" ).items() )
-      {
-        auto& scheduleV = scheduleJ.value();
-        const auto id = scheduleV.at( "id" ).get< uint32_t >();
-        const auto& scheduleName = scheduleV.at( "name" ).get< std::string >();
-        const auto& timepointsJ = scheduleV.at( "timepoints" );
-        const auto& description = scheduleV.at( "description" ).get< std::string >();
-
-        Schedule schedule;
-        schedule.m_name = scheduleName;
-        schedule.m_description = description;
-
-        uint64_t timepointOffset = 0;
-        for( const auto& timepointJ : timepointsJ.items() )
-        {
-          auto& timepointV = timepointJ.value();
-          Timepoint timepoint;
-          timepoint.from_json( timepointV, actorNameMap, actor.m_layoutId );
-
-          schedule.m_timepoints.push_back( timepoint );
-        }
-
-        if( scheduleNameMap.find( scheduleName ) != scheduleNameMap.end() )
-          throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::getEncounterPack - duplicate schedule by name: {}" ), scheduleName ) );
-
-        scheduleNameMap.emplace( std::make_pair( scheduleName, schedule ) );
-      }
-      actorNameSchedMap[ actorName ] = scheduleNameMap;
-    }
-
-    // build the condition list
-    for( const auto& pcJ : json.at( "conditions" ).items() )
-    {
-      auto& scV = pcJ.value();
-      auto conditionName = scV.at( "condition" ).get< std::string >();
-      auto scheduleRef = scV.at( "targetSchedule" ).get< std::string >();
-      auto actorRef = scV.at( "targetActor" ).get< std::string >();
-      
-      ConditionType condition;
-
-      // make sure condition exists
-      if( auto it = conditionMap.find( conditionName ); it != conditionMap.end() )
-        condition = it->second;
-      else
-        throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::getEncounterPack - no condition id found by name: {}" ), conditionName ) );
-
-      // make sure the actor we're referencing exists
-      if( auto actorIt = actorNameMap.find( actorRef ); actorIt != actorNameMap.end() )
-      {
-        auto& scheduleNameMap = actorNameSchedMap[ actorRef ];
-
-        TimelineActor& actor = actorIt->second;
-
-        // make sure schedule we're referencing exists
-        if( auto scheduleIt = scheduleNameMap.find( scheduleRef ); scheduleIt != scheduleNameMap.end() )
-        {
-          Schedule& schedule = scheduleIt->second;
-
-          // build the condition
-          ScheduleConditionPtr pCondition = nullptr;
-          switch( condition )
-          {
-            case ConditionType::HpPctLessThan:
-            case ConditionType::HpPctBetween:
-            {
-              pCondition = std::make_shared< ConditionHp >();
-              pCondition->from_json( scV, schedule, condition, actorNameMap );
-            }
-            break;
-            case ConditionType::DirectorVarEquals:
-            case ConditionType::DirectorVarGreaterThan:
-            case ConditionType::DirectorFlagsEquals:
-            case ConditionType::DirectorFlagsGreaterThan:
-            case ConditionType::DirectorSeqEquals:
-            case ConditionType::DirectorSeqGreaterThan:
-            {
-              pCondition = std::make_shared< ConditionDirectorVar >();
-              pCondition->from_json( scV, schedule, condition, actorNameMap );
-            }
-            break;
-            case ConditionType::EncounterTimeElapsed:
-            {
-              pCondition = std::make_shared< ConditionEncounterTimeElapsed >();
-              pCondition->from_json( scV, schedule, condition, actorNameMap );
-            }
-            break;
-            case ConditionType::CombatState:
-            {
-              pCondition = std::make_shared< ConditionCombatState >();
-              pCondition->from_json( scV, schedule, condition, actorNameMap );
-            }
-            break;
-            case ConditionType::GetAction:
-            {
-              pCondition = std::make_shared< ConditionGetAction >();
-              pCondition->from_json( scV, schedule, condition, actorNameMap );
-            }
-            break;
-            case ConditionType::ScheduleActive:
-            {
-              pCondition = std::make_shared< ConditionScheduleActive >();
-              pCondition->from_json( scV, schedule, condition, actorNameMap );
-            }
-            break;
-            default:
-              break;
-          }
-          actor.addPhaseCondition( pCondition );
-        }
-      }
-      else
-      {
-        throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::getEncounterPack - no state found by name: {}" ), scheduleRef ) );
-      }
-    }
-
-    for( const auto& actor : actorNameMap )
-      pack.addTimelineActor( actor.second );
-
-    pack.setName( name );
-
-    // todo: reload will probably kill the server when CastAction.callbacks are added
-    if( reload )
-      cache[ name ] = pack;
-    else
-      cache.emplace( std::make_pair( name, pack ) );
-    return pack;
-  }
-
   std::shared_ptr< TimelinePack > TimelinePack::createTimelinePack( const std::string& name )
   {
     const static std::unordered_map< std::string, ConditionType > conditionMap =
@@ -315,7 +45,7 @@ namespace Sapphire
       { "hpPctLessThan",            ConditionType::HpPctLessThan },
       { "hpPctBetween",             ConditionType::HpPctBetween },
 
-      { "directorVarEquals",        ConditionType::DirectorVarEquals },
+      { "varEquals",                ConditionType::VarEquals },
       { "directorVarGreaterThan",   ConditionType::DirectorVarGreaterThan },
 
       { "directorSeqEquals",        ConditionType::DirectorSeqEquals },
@@ -330,11 +60,12 @@ namespace Sapphire
       { "bnpcHasFlags",             ConditionType::BNpcHasFlags },
 
       { "getAction",                ConditionType::GetAction },
-      { "scheduleActive",           ConditionType::ScheduleActive }
+      { "scheduleActive",           ConditionType::ScheduleActive },
+      { "interruptedAction",        ConditionType::InterruptedAction },
     };
 
     auto pack = std::make_shared< TimelinePack >();
-    std::string encounter_name( fmt::format( std::string( "data/EncounterTimelines/{}.json" ), name ) );
+    std::string encounter_name( fmt::format( std::string( "data/encounterTimelines/{}.json" ), name ) );
 
     std::fstream f( encounter_name );
 
@@ -380,7 +111,7 @@ namespace Sapphire
       // < actorName, < phasename, phase > >
       std::map< std::string, Schedule > scheduleNameMap;
 
-      auto actorV = actorJ.value();
+      auto& actorV = actorJ.value();
       std::string actorName = actorV.at( "name" );
 
       TimelineActor& actor = actorNameMap[ actorName ];
@@ -398,7 +129,7 @@ namespace Sapphire
         phase.m_description = description;
         for( const auto& timepointJ : timepointsJ.items() )
         {
-          auto timepointV = timepointJ.value();
+          auto& timepointV = timepointJ.value();
           Timepoint timepoint;
           timepoint.from_json( timepointV, actorNameMap, actor.m_layoutId );
 
@@ -406,7 +137,7 @@ namespace Sapphire
         }
 
         if( scheduleNameMap.find( scheduleName ) != scheduleNameMap.end() )
-          throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::getEncounterPack - duplicate phase by name: {}" ), scheduleName ) );
+          throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::createTimelinePack - duplicate phase by name: {}" ), scheduleName ) );
 
         scheduleNameMap.emplace( std::make_pair( scheduleName, phase ) );
       }
@@ -427,7 +158,7 @@ namespace Sapphire
       if( auto it = conditionMap.find( conditionName ); it != conditionMap.end() )
         condition = it->second;
       else
-        throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::getEncounterPack - no condition id found by name: {}" ), conditionName ) );
+        throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::createTimelinePack - no condition id found by name: {}" ), conditionName ) );
 
       // make sure the actor we're referencing exists
       if( auto actorIt = actorNameMap.find( actorRef ); actorIt != actorNameMap.end() )
@@ -451,7 +182,7 @@ namespace Sapphire
               pCondition = std::make_shared< ConditionHp >();
               pCondition->from_json( pcV, schedule, condition, actorNameMap );
             }
-              break;
+            break;
             case ConditionType::DirectorVarEquals:
             case ConditionType::DirectorVarGreaterThan:
             case ConditionType::DirectorFlagsEquals:
@@ -463,31 +194,43 @@ namespace Sapphire
               pCondition->from_json( pcV, schedule, condition, actorNameMap );
 
             }
-              break;
+            break;
             case ConditionType::EncounterTimeElapsed:
             {
               pCondition = std::make_shared< ConditionEncounterTimeElapsed >();
               pCondition->from_json( pcV, schedule, condition, actorNameMap );
             }
-              break;
+            break;
             case ConditionType::CombatState:
             {
               pCondition = std::make_shared< ConditionCombatState >();
               pCondition->from_json( pcV, schedule, condition, actorNameMap );
             }
-              break;
+            break;
             case ConditionType::GetAction:
             {
               pCondition = std::make_shared< ConditionGetAction >();
               pCondition->from_json( pcV, schedule, condition, actorNameMap );
             }
-              break;
+            break;
             case ConditionType::ScheduleActive:
             {
               pCondition = std::make_shared< ConditionScheduleActive >();
               pCondition->from_json( pcV, schedule, condition, actorNameMap );
             }
-              break;
+            break;
+            case ConditionType::InterruptedAction:
+            {
+              pCondition = std::make_shared< ConditionInterruptedAction >();
+              pCondition->from_json( pcV, schedule, condition, actorNameMap );
+            }
+            break;
+            case ConditionType::VarEquals:
+            {
+              pCondition = std::make_shared< ConditionVarEquals >();
+              pCondition->from_json( pcV, schedule, condition, actorNameMap );
+            }
+            break;
             default:
               break;
           }
@@ -496,7 +239,7 @@ namespace Sapphire
       }
       else
       {
-        throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::getEncounterPack - no state found by name: {}" ), scheduleRef ) );
+        throw std::runtime_error( fmt::format( std::string( "EncounterTimeline::createTimelinePack - no state found by name: {}" ), scheduleRef ) );
       }
     }
 
@@ -517,10 +260,10 @@ namespace Sapphire
     m_selectors.emplace( std::make_pair( name, selector ) );
   }
 
-  void TimelinePack::createSnapshot( const std::string& selectorName, Entity::CharaPtr pSrc, const std::vector< uint32_t >& exclude )
+  void TimelinePack::createSnapshot( const std::string& selectorName, Entity::Chara& src, const std::vector< uint32_t >& exclude )
   {
     if( auto it = m_selectors.find( selectorName ); it != m_selectors.end() )
-      it->second.createSnapshot( pSrc, exclude );
+      it->second.createSnapshot( src, exclude );
   }
 
   const World::AI::Snapshot::Results& TimelinePack::getSnapshotResults( const std::string& selectorName )
@@ -616,4 +359,17 @@ namespace Sapphire
   {
     m_pEncounter = pEncounter;
   }
+
+  uint32_t TimelinePack::getVar( uint32_t index ) const
+  {
+    auto it = m_vars.find( index );
+    if( it != m_vars.end() )
+      return it->second;
+    return 0;
+  }
+
+  void TimelinePack::setVar( uint32_t index, uint32_t val )
+  {
+    m_vars[ index ] = val;
+  }
 }// namespace Sapphire::Encounter
\ No newline at end of file
diff --git a/src/world/Encounter/TimelinePack.h b/src/world/Encounter/TimelinePack.h
index 7bfad1594..e49b3ea89 100644
--- a/src/world/Encounter/TimelinePack.h
+++ b/src/world/Encounter/TimelinePack.h
@@ -41,6 +41,7 @@ namespace Sapphire
     
     uint64_t m_startTime{ 0 };
     std::shared_ptr< Encounter > m_pEncounter;
+    std::map< uint32_t, uint64_t > m_vars;
 
   public:
     TimelinePack() {}
@@ -61,7 +62,7 @@ namespace Sapphire
 
     void addSelector( const std::string& name, const Selector& selector );
 
-    void createSnapshot( const std::string& selectorName, Entity::CharaPtr pSrc,
+    void createSnapshot( const std::string& selectorName, Entity::Chara& src,
                          const std::vector< uint32_t >& exclude );
 
     const World::AI::Snapshot::Results& getSnapshotResults( const std::string& selectorName );
@@ -91,8 +92,11 @@ namespace Sapphire
 
     void setEncounter( std::shared_ptr< Encounter > pEncounter );
 
+    uint32_t getVar( uint32_t index ) const;
+
+    void setVar( uint32_t index, uint32_t val );
+
     static TimeLinePackPtr createTimelinePack( const std::string& name );
-    static TimelinePack getEncounterPack( const std::string& name, bool reload = false );
   };
 
 
diff --git a/src/world/Encounter/Timepoint.cpp b/src/world/Encounter/Timepoint.cpp
index 9140adfd1..facaa735e 100644
--- a/src/world/Encounter/Timepoint.cpp
+++ b/src/world/Encounter/Timepoint.cpp
@@ -14,6 +14,9 @@
 
 #include <Manager/ActionMgr.h>
 #include <Manager/PlayerMgr.h>
+
+#include <Random/RNGMgr.h>
+
 #include <Service.h>
 
 #include <Territory/QuestBattle.h>
@@ -60,7 +63,9 @@ namespace Sapphire
       { "setBGM",              TimepointDataType::SetBgm },
 
       { "setCondition",        TimepointDataType::SetCondition },
-      { "snapshot",            TimepointDataType::Snapshot }
+      { "snapshot",            TimepointDataType::Snapshot },
+      { "interruptAction",     TimepointDataType::InterruptAction },
+      { "rollRNG",             TimepointDataType::RollRNG }
     };
 
     const static std::unordered_map< std::string, DirectorOpId > directorOpMap =
@@ -87,10 +92,11 @@ namespace Sapphire
 
     const static std::unordered_map< std::string, ActionTargetType > actionTypeMap =
     {
-      { "none",     ActionTargetType::None },
-      { "self",     ActionTargetType::Self },
-      { "target",   ActionTargetType::Target },
-      { "selector", ActionTargetType::Selector }
+      { "none",           ActionTargetType::None },
+      { "self",           ActionTargetType::Self },
+      { "target",         ActionTargetType::Target },
+      { "selectorPos",    ActionTargetType::SelectorPos },
+      { "selectorTarget", ActionTargetType::SelectorTarget },
     };
 
     const static std::unordered_map< std::string, SetPosType > setPosTypeMap =
@@ -101,10 +107,18 @@ namespace Sapphire
 
     const static std::unordered_map< std::string, SetPosTargetType > setPosTargetTypeMap =
     {
-      { "none",     SetPosTargetType::None },
-      { "self",     SetPosTargetType::Self },
-      { "target",   SetPosTargetType::Target },
-      { "selector", SetPosTargetType::Selector }
+      { "none",           SetPosTargetType::None },
+      { "self",           SetPosTargetType::Self },
+      { "target",         SetPosTargetType::Target },
+      { "selectorPos",    SetPosTargetType::SelectorPos },
+      { "selectorTarget", SetPosTargetType::SelectorTarget }
+    };
+
+    const static std::unordered_map< std::string, VarType > varTypeMap =
+    {
+      { "director", VarType::Director },
+      { "custom",   VarType::Custom },
+      { "pack",     VarType::Pack }
     };
 
     TimepointDataType tpType{ 0 };
@@ -134,7 +148,7 @@ namespace Sapphire
         auto selectorIndex = dataJ.at( "selectorIndex" ).get< uint32_t >();
 
         m_pData = std::make_shared< TimepointDataAction >( sourceRef, actionId, targetType,
-                                                           selectorRef, selectorIndex - 1 );
+                                                           selectorRef, selectorIndex );
       }
       break;
       case TimepointDataType::SetPos:
@@ -338,7 +352,6 @@ namespace Sapphire
         m_pData = std::make_shared< TimepointDataCondition >( conditionId, enabled );
       }
       break;
-
       case TimepointDataType::Snapshot:
       {
         auto& dataJ = json.at( "data" );
@@ -350,6 +363,26 @@ namespace Sapphire
         m_pData = std::make_shared< TimepointDataSnapshot >( selectorName, actorRef, excludeSelector );
       }
       break;
+      case TimepointDataType::InterruptAction:
+      {
+        auto& dataJ = json.at( "data" );
+        auto actorRef = dataJ.at( "sourceActor" ).get< std::string >();
+        auto actionId = dataJ.at( "actionId" ).get< uint32_t >();
+
+        m_pData = std::make_shared< TimepointDataInterruptAction >( actorRef, actionId );
+      }
+      break;
+      case TimepointDataType::RollRNG:
+      {
+        auto& dataJ = json.at( "data" );
+        auto min = dataJ.at( "min" ).get< uint32_t >();
+        auto max = dataJ.at( "max" ).get< uint32_t >();
+        auto type = varTypeMap.at( dataJ.at( "type" ).get< std::string >() );
+        auto idx = dataJ.at( "index" ).get< uint32_t >();
+
+        m_pData = std::make_shared< TimepointDataRollRNG >( min, max, type, idx );
+      }
+      break;
       default:
         break;
     }
@@ -390,6 +423,7 @@ namespace Sapphire
       {
         auto pActionData = std::dynamic_pointer_cast< TimepointDataAction, TimepointData >( m_pData );
         auto pBNpc = pack.getBNpcByRef( pActionData->m_sourceRef, pEncounter );
+        Common::FFXIVARR_POSITION3 pos = pBNpc->getPos();
         // todo: filter the correct target
         // todo: tie to mechanic script?
         // todo: mechanic should probably just be an Action::onTick, with instance/director passed to it
@@ -407,11 +441,17 @@ namespace Sapphire
             case ActionTargetType::Self:
               targetId = pBNpc->getId();
               break;
-            case ActionTargetType::Selector:
+            case ActionTargetType::SelectorPos:
+            case ActionTargetType::SelectorTarget:
             {
-              const auto& results = pack.getSnapshotTargetIds( pActionData->m_selectorRef );
+              const auto& results = pack.getSnapshotResults( pActionData->m_selectorRef );
+
               if( pActionData->m_selectorIndex < results.size() )
-                targetId = results[ pActionData->m_selectorIndex ];
+              {
+                const auto& res = results[ pActionData->m_selectorIndex ];
+                targetId = res.m_entityId;
+                pos = res.m_pos;
+              }
             }
             break;
             default:
@@ -420,15 +460,36 @@ namespace Sapphire
           auto& actionMgr = Common::Service< Sapphire::World::Manager::ActionMgr >::ref();
           auto pAction = pBNpc->getCurrentAction();
 
-          // todo: this is probably wrong
-          if( !pAction || pAction->isInterrupted() )
+          // todo: probably a flag on TimelinePack for PauseIfOutOfRange? idk
+          // we need to pause the timeline if the player is out of range
+          auto topHateId = pBNpc->getTargetId();
           {
-            actionMgr.handleTargetedAction( *pBNpc, pActionData->m_actionId, targetId, pTeri->getNextActionResultId() );
-            //actionMgr.handlePlacedAction( *pBNpc, pActionData->m_actionId, pBNpc->getPos(), pTeri->getNextActionResultId() );
+            auto pTargetActor = pEncounter->getTeriPtr()->getEntityById( topHateId );
+
+            if( pTargetActor )
+            {
+              if( auto pTargetChara = pTargetActor->getAsChara() )
+              {
+                auto distance = Common::Util::distance2D( pBNpc->getPos().x, pBNpc->getPos().z, pTargetChara->getPos().x, pTargetChara->getPos().z );
+                if( targetId != pBNpc->getId() && distance >= 3.f + pBNpc->getRadius() + pTargetChara->getRadius() )
+                {
+                  // pause at this timepoint
+                  return false;
+                }
+              }
+            }
           }
-          else
-          {
+
+          if( pAction )
             return false;
+
+          // todo: this is probably wrong
+          //if( !pAction || pAction->isInterrupted() )
+          {
+            if( pActionData->m_targetType == ActionTargetType::SelectorPos )
+              actionMgr.handlePlacedAction( *pBNpc, pActionData->m_actionId, pos, pTeri->getNextActionResultId(), targetId );
+            else
+              actionMgr.handleTargetedAction( *pBNpc, pActionData->m_actionId, targetId, pTeri->getNextActionResultId() );
           }
         }
       }
@@ -458,7 +519,7 @@ namespace Sapphire
               }
             }
             break;
-            case SetPosTargetType::Selector:
+            case SetPosTargetType::SelectorPos:
             {
               const auto& results = pack.getSnapshotResults( pSetPosData->m_selectorName );
               if( pSetPosData->m_selectorIndex < results.size() )
@@ -468,6 +529,26 @@ namespace Sapphire
               }
             }
             break;
+            // todo: idk what i was thinking here but should this just be the snapshotted position as above rather than live pos?
+            case SetPosTargetType::SelectorTarget:
+            {
+              const auto& results = pack.getSnapshotResults( pSetPosData->m_selectorName );
+              if( pSetPosData->m_selectorIndex < results.size() )
+              {
+                // find the target by id and copy their pos
+                auto targetId = results[ pSetPosData->m_selectorIndex ].m_entityId;
+                for( const auto& pActor : pBNpc->getInRangeActors() )
+                {
+                  if( pActor->getId() == targetId )
+                  {
+                    pos = pActor->getPos();
+                    rot = pActor->getRot();
+                    break;
+                  }
+                }
+              }
+            }
+            break;
             default:
               break;
           }
@@ -476,21 +557,38 @@ namespace Sapphire
           {
             case SetPosType::Absolute:
             {
-              pBNpc->setRot( pSetPosData->m_rot );
-              pBNpc->setPos( pSetPosData->m_x, pSetPosData->m_y, pSetPosData->m_z, true );
+              // dont use absolute pos for selector, just use the selector pos
+              if( pSetPosData->m_targetType == SetPosTargetType::SelectorPos || pSetPosData->m_targetType == SetPosTargetType::SelectorTarget )
+              {
+                pBNpc->setRot( rot );
+                pBNpc->setPos( pos, true );
+              }
+              else
+              {
+                pos = { pSetPosData->m_x, pSetPosData->m_y, pSetPosData->m_z };
+                rot = pSetPosData->m_rot;
+              }
             }
             break;
             case SetPosType::Relative:
             {
               auto offsetPos = Common::Util::getOffsettedPosition( pos, rot, pSetPosData->m_x, pSetPosData->m_y, pSetPosData->m_z );
-              pBNpc->setRot( rot );
-              pBNpc->setPos( offsetPos );
+              pos = offsetPos;
             }
             break;
             default:
               break;
           }
 
+          // todo: handling agent should really be somewhere else
+          if( pBNpc->getAgentId() != -1 )
+          {
+            auto pNavi = pTeri->getNaviProvider();
+            if( pNavi )
+              pBNpc->setAgentId( pNavi->updateAgentPosition( pBNpc->getAgentId(), pos, pBNpc->getRadius(), pNavi->getAgentSpeed( pBNpc->getAgentId() ) ) );
+          }
+          pBNpc->setRot( rot );
+          pBNpc->setPos( pos, true );
         }
       }
       break;
@@ -537,7 +635,7 @@ namespace Sapphire
         }
       }
       break;
-      */
+      //*/
       case TimepointDataType::LogMessage:
       {
         auto pLogMessage = std::dynamic_pointer_cast< TimepointDataLogMessage, TimepointData >( m_pData );
@@ -722,7 +820,6 @@ namespace Sapphire
           pBNpc->init();
 
           pTeri->pushActor( pBNpc );
-
         }
       }
       break;
@@ -789,10 +886,59 @@ namespace Sapphire
         if( pBNpc )
         {
           const auto& exclude = pack.getSnapshotTargetIds( pSnapshotData->m_excludeSelector );
-          pack.createSnapshot( pSnapshotData->m_selector, pBNpc, exclude );
+          pack.createSnapshot( pSnapshotData->m_selector, *pBNpc, exclude );
+        }
+      }
+      break;
+      case TimepointDataType::InterruptAction:
+      {
+        auto pInterruptData = std::dynamic_pointer_cast< TimepointDataInterruptAction, TimepointData >( m_pData );
+        auto pBNpc = pack.getBNpcByRef( pInterruptData->m_actorRef, pEncounter );
+
+        if( pBNpc )
+        {
+          auto pAction = pBNpc->getCurrentAction();
+          if( pAction && pAction->getId() == pInterruptData->m_actionId )
+          {
+            pAction->setInterrupted( Common::ActionInterruptType::RegularInterrupt );
+            pAction->interrupt();
+          }
         }
       }
       break;
+      case TimepointDataType::RollRNG:
+      {
+        auto pRNGData = std::dynamic_pointer_cast< TimepointDataRollRNG, TimepointData >( m_pData );
+
+        auto& rngMgr = Common::Service< Common::Random::RNGMgr >::ref();
+        auto val = rngMgr.getRandGenerator( pRNGData->m_min, pRNGData->m_max ).next();
+
+        switch( pRNGData->m_type )
+        {
+          case VarType::Director:
+          {
+            auto pDirector = pEncounter->getDirector();
+            if( pDirector)
+              pDirector->setDirectorVar( pRNGData->m_idx, val );
+          }
+          break;
+          case VarType::Custom:
+          {
+            auto pDirector = pEncounter->getDirector();
+            if( pDirector )
+              pDirector->setCustomVar( pRNGData->m_idx, val );
+          }
+          break;
+          case VarType::Pack:
+          {
+            // todo: probably get rid of this?
+            pack.setVar( pRNGData->m_idx, val );
+          }
+          break;
+        }
+      }
+      break;
+
       default:
         break;
     }
diff --git a/src/world/Encounter/Timepoint.h b/src/world/Encounter/Timepoint.h
index 53d55c262..10738ca67 100644
--- a/src/world/Encounter/Timepoint.h
+++ b/src/world/Encounter/Timepoint.h
@@ -39,7 +39,9 @@ namespace Sapphire
 
     SetCondition,
 
-    Snapshot
+    Snapshot,
+    InterruptAction,
+    RollRNG // todo: make this save to director var idx
   };
 
   enum class ActionTargetType : uint32_t
@@ -47,7 +49,8 @@ namespace Sapphire
     None,
     Self,
     Target,
-    Selector
+    SelectorPos,
+    SelectorTarget
   };
 
   enum class MoveType : uint32_t
@@ -68,7 +71,8 @@ namespace Sapphire
     None,
     Self,
     Target,
-    Selector
+    SelectorPos,
+    SelectorTarget
   };
 
   enum class DirectorOpId
@@ -87,6 +91,13 @@ namespace Sapphire
     And // idx &= val
   };
 
+  enum class VarType : uint32_t
+  {
+    Director,
+    Custom,
+    Pack
+  };
+
   //
   // Timepoint.m_pData objects
   //
@@ -157,6 +168,7 @@ namespace Sapphire
       TimepointData( TimepointDataType::SetPos ),
       m_actorRef( actorRef ),
       m_posType( type ),
+      m_targetType( targetType ),
       m_moveType( moveType ),
       m_selectorName( selectorName), m_selectorIndex( selectorIndex ),
       m_x( x ), m_y( y ), m_z( z ), m_rot( rot )
@@ -318,6 +330,36 @@ namespace Sapphire
     }
   };
 
+  struct TimepointDataInterruptAction : public TimepointData
+  {
+    std::string m_actorRef;
+    uint32_t m_actionId;
+
+    TimepointDataInterruptAction( const std::string& actorRef, uint32_t actionId ) :
+      TimepointData( TimepointDataType::InterruptAction ),
+      m_actorRef( actorRef ),
+      m_actionId( actionId )
+    {
+    }
+  };
+
+  struct TimepointDataRollRNG : public TimepointData
+  {
+    uint32_t m_min;
+    uint32_t m_max;
+    VarType m_type;
+    uint32_t m_idx;
+
+    TimepointDataRollRNG( uint32_t min, uint32_t max, VarType type, uint32_t varIdx ) :
+      TimepointData( TimepointDataType::RollRNG ),
+      m_min( min ),
+      m_max( max ),
+      m_type( type ),
+      m_idx( varIdx )
+    {
+    }
+  };
+
   // todo: refactor all this to allow solo actor to use
   class Timepoint : public std::enable_shared_from_this< Timepoint >
   {
@@ -337,4 +379,4 @@ namespace Sapphire
     bool update( TimelineActor& self, TimelinePack& pack, EncounterPtr pEncounter, uint64_t time ) const;
     bool execute( TimelineActor& self, TimelinePack& pack, EncounterPtr pEncounter, uint64_t time ) const;
   };
-}// namespace Sapphire::Encounter
\ No newline at end of file
+}// namespace Sapphire
\ No newline at end of file
diff --git a/src/world/Manager/ActionMgr.cpp b/src/world/Manager/ActionMgr.cpp
index 68d7e11f0..780281245 100644
--- a/src/world/Manager/ActionMgr.cpp
+++ b/src/world/Manager/ActionMgr.cpp
@@ -29,11 +29,12 @@ bool ActionMgr::cacheActionShapeLut()
   return Action::ActionShapeLutData::cacheShapes();
 }
 
-void ActionMgr::handlePlacedAction( Entity::Chara& chara, uint32_t actionId, Common::FFXIVARR_POSITION3 pos, uint16_t requestId )
+void ActionMgr::handlePlacedAction( Entity::Chara& chara, uint32_t actionId, Common::FFXIVARR_POSITION3 pos, uint16_t requestId, uint64_t targetId )
 {
   auto action = Action::make_Action( chara.getAsChara(), actionId, requestId );
 
   action->setPos( pos );
+  action->setTargetId( targetId );
 
   if( !action->init() )
     return;
@@ -53,7 +54,7 @@ void ActionMgr::handlePlacedAction( Entity::Chara& chara, uint32_t actionId, Com
   bootstrapAction( chara, action, actionData );
 }
 
-void ActionMgr::handleItemManipulationAction( Entity::Player& player, uint32_t actionId,  uint16_t sequence )
+void ActionMgr::handleItemManipulationAction( Entity::Player& player, uint32_t actionId, uint16_t sequence )
 {
   auto action = Action::make_ItemManipulationAction( player.getAsPlayer(), actionId, sequence, nullptr, 2500 ); // todo: maybe the delay can be retrieved from data
 
diff --git a/src/world/Manager/ActionMgr.h b/src/world/Manager/ActionMgr.h
index 4831b418d..7093f9619 100644
--- a/src/world/Manager/ActionMgr.h
+++ b/src/world/Manager/ActionMgr.h
@@ -25,7 +25,7 @@ namespace Sapphire::World::Manager
 
     void handleItemManipulationAction( Entity::Player& player, uint32_t actionId, uint16_t requestId );
     void handleTargetedAction( Entity::Chara& chara, uint32_t actionId, uint64_t targetId, uint16_t requestId );
-    void handlePlacedAction( Entity::Chara& chara, uint32_t actionId, Common::FFXIVARR_POSITION3 pos, uint16_t requestId );
+    void handlePlacedAction( Entity::Chara& chara, uint32_t actionId, Common::FFXIVARR_POSITION3 pos, uint16_t requestId, uint64_t targetId = Common::INVALID_GAME_OBJECT_ID64 );
 
     void handleItemAction( Entity::Player& player, uint32_t itemId, std::shared_ptr< Excel::ExcelStruct< Excel::ItemAction > > itemActionData,
                            uint16_t itemSourceSlot, uint16_t itemSourceContainer );
diff --git a/src/world/Manager/DebugCommandMgr.cpp b/src/world/Manager/DebugCommandMgr.cpp
index 85287db0f..52c86ecae 100644
--- a/src/world/Manager/DebugCommandMgr.cpp
+++ b/src/world/Manager/DebugCommandMgr.cpp
@@ -31,6 +31,7 @@
 #include "Actor/EventObject.h"
 #include "Actor/BNpc.h"
 
+#include "Action/Action.h"
 #include "Action/ActionLutData.h"
 #include "Action/ActionShapeLutData.h"
 
@@ -87,7 +88,6 @@ DebugCommandMgr::DebugCommandMgr()
   registerCommand( "ew", &DebugCommandMgr::easyWarp, "Easy warping", 1 );
   registerCommand( "reload", &DebugCommandMgr::hotReload, "Reloads a resource", 1 );
   registerCommand( "facing", &DebugCommandMgr::facing, "Checks if you are facing an actor", 1 );
-  registerCommand( "facing", &DebugCommandMgr::facing, "Checks if you are facing an actor", 1 );
   registerCommand( "cbt", &DebugCommandMgr::cbt, "Create, bind and teleport to an instance", 1 );
 }
 
@@ -617,6 +617,21 @@ void DebugCommandMgr::add( char* data, Entity::Player& player, std::shared_ptr<
         pBNpc->knockback( player.getPos(), distance );
     }
   }
+  else if( subCommand == "interrupt" )
+  {
+    auto targetId = player.getTargetId();
+    for( auto& pActor : player.getInRangeActors() )
+    {
+      if( auto pChara = pActor->getAsChara(); pChara && pChara->getId() == targetId )
+      {
+        if( pChara->getCurrentAction() )
+        {
+          pChara->getCurrentAction()->interrupt();
+          break;
+        }
+      }
+    }
+  }
   else if( subCommand == "achvGeneral" )
   {
     uint32_t achvSubtype;
diff --git a/src/world/Manager/PlayerMgr.cpp b/src/world/Manager/PlayerMgr.cpp
index 15c0cf1a1..95ab92eaf 100644
--- a/src/world/Manager/PlayerMgr.cpp
+++ b/src/world/Manager/PlayerMgr.cpp
@@ -305,6 +305,7 @@ void PlayerMgr::onMoveZone( Sapphire::Entity::Player& player )
 
 void PlayerMgr::onUpdate( Entity::Player& player, uint64_t tickCount )
 {
+  // todo: shouldnt all this be in Player::update()?
   if( player.getHp() <= 0 && player.getStatus() != Common::ActorStatus::Dead )
   {
     player.die();
@@ -315,12 +316,24 @@ void PlayerMgr::onUpdate( Entity::Player& player, uint64_t tickCount )
     return;
 
   checkAutoAttack( player, tickCount );
+
+  /*
+  auto& teriMgr = Common::Service< Manager::TerritoryMgr >::ref();
+  auto pTeri = teriMgr.getTerritoryByGuId( player.getTerritoryId() );
+  if( pTeri )
+  {
+    auto pNaviProvider = pTeri->getNaviProvider();
+    // update with speed 0 to essentially have them as an obstacle
+    if( pNaviProvider )
+      pNaviProvider->updateAgentPosition( player.getAgentId(), player.getPos(), 1.0f, 0.0f );
+  }
+  //*/
 }
 
 void PlayerMgr::checkAutoAttack( Entity::Player& player, uint64_t tickCount ) const
 {
   auto mainWeap = player.getItemAt( Common::GearSet0, Common::MainHand );
-  if( !mainWeap || player.checkAction() || !player.isAutoattackOn() || !player.getTargetId() || player.getStance() != Common::Active )
+  if( !mainWeap || player.hasAction() || !player.isAutoattackOn() || !player.getTargetId() || player.getStance() != Common::Active )
     return;
 
   for( const auto& actor : player.getInRangeActors() )
diff --git a/src/world/Network/PacketWrappers/EffectPacket.h b/src/world/Network/PacketWrappers/EffectPacket.h
index c91b2de87..381a234d4 100644
--- a/src/world/Network/PacketWrappers/EffectPacket.h
+++ b/src/world/Network/PacketWrappers/EffectPacket.h
@@ -36,6 +36,8 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
     {
       std::memcpy( &m_data.CalcResult[ m_data.TargetCount ].CalcResultTg[ m_targetEffectCount++ ], &effect, sizeof( Common::CalcResultParam ) );
 
+      // todo: this is probably wrong, we should be able to have multiple ActionResults on the same target
+      /*
       // iterate and see if we already have this target added
       bool targetAlreadyAdded = false;
       for( int i = 0; i < sizeof( m_data.Target ) / sizeof( uint64_t ); ++i )
@@ -46,11 +48,11 @@ namespace Sapphire::Network::Packets::WorldPackets::Server
           break;
         }
       }
-
+      */
       m_data.Target[ m_data.TargetCount ] = targetId;
 
-      if( !targetAlreadyAdded )
-        m_data.TargetCount++;
+      //if( !targetAlreadyAdded )
+      m_data.TargetCount++;
     }
 
     void addSourceEffect( const Common::CalcResultParam& effect )
diff --git a/src/world/StatusEffect/StatusEffect.cpp b/src/world/StatusEffect/StatusEffect.cpp
index f6ad24f16..b5378b400 100644
--- a/src/world/StatusEffect/StatusEffect.cpp
+++ b/src/world/StatusEffect/StatusEffect.cpp
@@ -143,7 +143,7 @@ void Sapphire::StatusEffect::StatusEffect::onTick()
         
         const auto& pos = pAreaObject->getPos();
         const auto& potency = pAreaObject->getActionPotency();
-        if( Common::Util::distance( pos, pChara->getPos() ) <= m_groundAOE.radius )
+        if( Common::Util::distance( pos, pChara->getPos() ) <= m_groundAOE.radius + pChara->getRadius() )
         {
           auto wepDmg = 1.f;
 
diff --git a/src/world/Territory/Territory.cpp b/src/world/Territory/Territory.cpp
index 68c997dee..0483cef8d 100644
--- a/src/world/Territory/Territory.cpp
+++ b/src/world/Territory/Territory.cpp
@@ -992,6 +992,25 @@ Entity::BNpcPtr Territory::createBNpcFromLayoutIdNoPush( uint32_t layoutId, uint
   return pBNpc;
 }
 
+Entity::GameObjectPtr Territory::getEntityById( uint32_t entityId )
+{
+  Entity::GameObjectPtr pRet = nullptr;
+
+  pRet = getPlayer( entityId );
+  if( pRet )
+    return pRet;
+
+  pRet = getActiveBNpcByEntityId( entityId );
+  if( pRet )
+    return pRet;
+
+  pRet = getEObj( entityId );
+  if( pRet )
+    return pRet;
+
+  return pRet;
+}
+
 Entity::BNpcPtr Territory::getActiveBNpcByEntityId( uint32_t entityId )
 {
   auto it = m_bNpcMap.find( entityId );
diff --git a/src/world/Territory/Territory.h b/src/world/Territory/Territory.h
index 8d6dcb4fd..5c8c1ca47 100644
--- a/src/world/Territory/Territory.h
+++ b/src/world/Territory/Territory.h
@@ -188,6 +188,8 @@ namespace Sapphire
     Entity::BNpcPtr createBNpcFromLayoutId( uint32_t levelId, uint32_t hp, Common::BNpcType bnpcType, uint32_t triggerOwnerId = 0 );
     Entity::BNpcPtr createBNpcFromLayoutIdNoPush( uint32_t levelId, uint32_t hp, Common::BNpcType bnpcType, uint32_t triggerOwnerId = 0 );
 
+    Entity::GameObjectPtr getEntityById( uint32_t entityId );
+
     Entity::BNpcPtr getActiveBNpcByEntityId( uint32_t entityId );
 
     Entity::BNpcPtr getActiveBNpcByLayoutId( uint32_t instanceId );
diff --git a/src/world/Util/ActorFilter.cpp b/src/world/Util/ActorFilter.cpp
index cfc8c24fe..e3585d6b9 100644
--- a/src/world/Util/ActorFilter.cpp
+++ b/src/world/Util/ActorFilter.cpp
@@ -1,4 +1,5 @@
 #include "ActorFilter.h"
+#include "Actor/Chara.h"
 #include "Actor/GameObject.h"
 #include "Util/Util.h"
 #include "Util/UtilMath.h"
@@ -12,9 +13,14 @@ Sapphire::World::Util::ActorFilterInRange::ActorFilterInRange( Common::FFXIVARR_
 {
 }
 
-bool Sapphire::World::Util::ActorFilterInRange::conditionApplies( const Entity::GameObject& actor )
+bool Sapphire::World::Util::ActorFilterInRange::conditionApplies( Entity::GameObject& actor )
 {
-  return Sapphire::Common::Util::distance( m_aoePos, actor.getPos() ) <= m_radius;
+  auto radius = m_radius;
+
+  if( actor.isChara() )
+    radius += actor.getAsChara()->getRadius();
+
+  return Sapphire::Common::Util::distance( m_aoePos, actor.getPos() ) <= radius;
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -24,7 +30,7 @@ Sapphire::World::Util::ActorFilterSingleTarget::ActorFilterSingleTarget( uint32_
 {
 }
 
-bool Sapphire::World::Util::ActorFilterSingleTarget::conditionApplies( const Sapphire::Entity::GameObject& actor )
+bool Sapphire::World::Util::ActorFilterSingleTarget::conditionApplies( Entity::GameObject& actor )
 {
   return actor.getId() == m_actorId;
 }
@@ -38,8 +44,9 @@ Sapphire::World::Util::ActorFilterBox::ActorFilterBox( Common::FFXIVARR_POSITION
 {
 }
 
-bool Sapphire::World::Util::ActorFilterBox::conditionApplies( const Sapphire::Entity::GameObject& actor )
+bool Sapphire::World::Util::ActorFilterBox::conditionApplies( Entity::GameObject& actor )
 {
+  // todo: factor in target actor radius
   return actor.getPos().x < m_aoePos.x + m_width &&
       actor.getPos().x > m_aoePos.x &&
       actor.getPos().y < m_aoePos.y + m_height &&
@@ -52,7 +59,7 @@ Sapphire::World::Util::ActorFilterCone::ActorFilterCone( Common::FFXIVARR_POSITI
 {
 }
 
-bool Sapphire::World::Util::ActorFilterCone::conditionApplies( const Entity::GameObject& actor )
+bool Sapphire::World::Util::ActorFilterCone::conditionApplies( Entity::GameObject& actor )
 {
   Common::FFXIVARR_POSITION3 targetPos = actor.getPos();
   
diff --git a/src/world/Util/ActorFilter.h b/src/world/Util/ActorFilter.h
index 1db3015be..2e49e41a2 100644
--- a/src/world/Util/ActorFilter.h
+++ b/src/world/Util/ActorFilter.h
@@ -14,7 +14,7 @@ namespace Sapphire::World::Util
   public:
     ActorFilter() = default;
     virtual ~ActorFilter() = default;
-    virtual bool conditionApplies( const Entity::GameObject& actor ) = 0;
+    virtual bool conditionApplies( Entity::GameObject& actor ) = 0;
   };
 
   using ActorFilterPtr = std::shared_ptr< ActorFilter >;
@@ -27,7 +27,7 @@ namespace Sapphire::World::Util
     float m_radius;
   public:
     ActorFilterInRange( Common::FFXIVARR_POSITION3 aoePos, float range );
-    bool conditionApplies( const Entity::GameObject& actor ) override;
+    bool conditionApplies( Entity::GameObject& actor ) override;
   };
 
   /////////////////////////////////////////////////////////////////////////////
@@ -38,7 +38,7 @@ namespace Sapphire::World::Util
 
   public:
     explicit ActorFilterSingleTarget( uint32_t actorId );
-    bool conditionApplies( const Entity::GameObject& actor ) override;
+    bool conditionApplies( Entity::GameObject& actor ) override;
   };
   
   /////////////////////////////////////////////////////////////////////////////
@@ -50,7 +50,7 @@ namespace Sapphire::World::Util
     uint16_t m_height;
   public:
     explicit ActorFilterBox( Common::FFXIVARR_POSITION3 aoePos, uint16_t width, uint16_t height );
-    bool conditionApplies( const Entity::GameObject& actor ) override;
+    bool conditionApplies( Entity::GameObject& actor ) override;
   };
 
   /////////////////////////////////////////////////////////////////////////////
@@ -64,7 +64,7 @@ namespace Sapphire::World::Util
 
   public:
     explicit ActorFilterCone( Common::FFXIVARR_POSITION3 startPos, Common::FFXIVARR_POSITION3 skillTargetPos, float startAngle, float endAngle );
-    bool conditionApplies( const Entity::GameObject& actor ) override;
+    bool conditionApplies( Entity::GameObject& actor ) override;
   };
 }
 
diff --git a/src/world/WorldServer.h b/src/world/WorldServer.h
index 0ae645f54..e5f9042a9 100644
--- a/src/world/WorldServer.h
+++ b/src/world/WorldServer.h
@@ -6,6 +6,7 @@
 #include <mutex>
 #include <map>
 #include <set>
+#include <thread>
 #include "ForwardsZone.h"
 #include <Config/ConfigDef.h>