diff --git a/server/src/skill.rs b/server/src/skill.rs
index 6496678d..9000dfef 100644
--- a/server/src/skill.rs
+++ b/server/src/skill.rs
@@ -276,6 +276,8 @@ impl Effect {
 
             Effect::Empower => 2,
 
+            Effect::Shield => 2,
+
             Effect::Decay => 2,
             Effect::Drain => 2,
             Effect::Triage => 2,
@@ -587,81 +589,64 @@ impl Skill {
 
     pub fn speed(&self) -> u8 {
         match self {
-            Skill::Attack => 5,
 
-            // -----------------
-            // Nature
-            // -----------------
+            // defensive block
             Skill::Block => 10, // reduce dmg
             Skill::Evade => 10,
             Skill::Parry => 10, // avoid all dmg
             Skill::Snare => 10,
+            Skill::Shield => 10, // avoid magic dmg,
 
+            // fast phys combat
+            Skill::Attack => 5,
             Skill::Paralyse => 5,
             Skill::Strangle => 5,
+            Skill::Banish => 5,
+            Skill::Blast => 5,
+            Skill::Decay => 5, // dot
 
-            // Strangle
-
-            Skill::Stun => 2,
+            // magic combat trickery
             Skill::Evasion => 3, // additional layer of dmg avoidance
+            Skill::Triage => 3, // hot
+            Skill::Slow => 3,
+            Skill::Fear => 2,
+            Skill::Amplify => 3,
+            Skill::Curse => 3,
+            Skill::Empower => 3,
+            Skill::Haste => 3,
 
-            // -----------------
-            // Technology
-            // -----------------
+            // general combat
+            Skill::DecayTick => 2, // hot
+            Skill::Drain => 2,
+            Skill::DrainTick => 2, // hot
+            Skill::Hex => 2,
+            Skill::Pause => 2, // extend durations
+            Skill::Plague => 2, // aoe dot
+            Skill::Silence => 2,
+            Skill::Stun => 2,
+            Skill::Throw => 2, // no dmg stun, adds vulnerable
+            Skill::TriageTick => 2, // hot
+
+            Skill::Heal => 1,
+            Skill::Purify => 1,
+            Skill::Purge => 1,
+
+            // unimplemented
+            // Skill::Precision => 1,
+            // Skill::Lag => 2, //
+            Skill::Taunt => 10,
+            Skill::Ruin => 3, // aoe
+            Skill::Slay => 1,
+            Skill::Charm => 2,
+            Skill::Calm => 2,
+            Skill::Inquiry => 2,
+            Skill::Rez => 4,
             Skill::Replicate => 1,
             Skill::Swarm => 3,
             Skill::Orbit => 2,
             Skill::Repair => 1,
             Skill::Scan => 2, // track?
 
-            // -----------------
-            // Preservation
-            // -----------------
-            Skill::Heal => 1,
-            Skill::Triage => 1, // hot
-            Skill::TriageTick => 1, // hot
-            Skill::Throw => 2, // no dmg stun, adds vulnerable
-            Skill::Charm => 2,
-            Skill::Calm => 2,
-            Skill::Rez => 4,
-
-            // -----------------
-            // Destruction
-            // -----------------
-            Skill::Blast => 5,
-            Skill::Amplify => 2,
-            Skill::Decay => 5, // dot
-            Skill::DecayTick => 2, // hot
-            Skill::Drain => 2,
-            Skill::DrainTick => 2, // hot
-            Skill::Curse => 2,
-            Skill::Plague => 2, // aoe dot
-            Skill::Ruin => 3, // aoe
-
-            // -----------------
-            // Purity
-            // -----------------
-            // Skill::Precision => 1,
-            Skill::Empower => 2,
-            Skill::Slay => 1,
-            Skill::Shield => 1,
-            Skill::Silence => 2,
-            Skill::Inquiry => 2,
-            Skill::Purify => 1,
-            Skill::Purge => 1,
-
-            // -----------------
-            // Chaos
-            // -----------------
-            Skill::Banish => 5,
-            Skill::Hex => 2,
-            Skill::Fear => 2,
-            Skill::Taunt => 2,
-            Skill::Pause => 2, // extend durations
-            // Skill::Lag => 2, //
-            Skill::Haste => 2,
-            Skill::Slow => 2,
-
             // -----------------
             // Test
             // -----------------