diff --git a/js/atree_constants.js b/js/atree_constants.js
index 38ca0a2..dda9834 100644
--- a/js/atree_constants.js
+++ b/js/atree_constants.js
@@ -176,6 +176,78 @@ const atrees =
         {"title": "", "desc": "", "image": "../media/atree/connect_line.png", "connector": true, "row": 34, "col": 6, "rotate": 90},
         {"title": "Minefield Ability\nTrapper Archetype", "desc": "Allow you to place +6 Traps, but with reduced damage and range Total Damage: -80% (of DPS) - Neutral: -80% AoE: -2 Blocks (Circular) AP: 2 Req: Basaltic Trap Min Trapper: 0/10", "image": "../media/atree/node.png", "connector": false, "row": 34, "col": 7},
     ],
+    "Warrior": [
+        {"row": 0, "col": 4, "name": "Bash", "desc": "Violently bash the ground, dealing high damage in a large area"},
+        {"row": 2, "col": 2, "name": "Cheaper Bash", "desc": "Reduce the Mana cost of Bash"},
+        {"row": 2, "col": 4, "name": "Spear Proficiency 1", "desc": "Improve your Main Attack's damage and range w/ spear"},
+        {"row": 4, "col": 4, "name": "Double Bash", "desc": "Bash will hit a second time at a farther range"},
+        {"row": 6, "col": 2, "name": "Heavy Impact", "desc": "After using Charge, violently crash down into the ground and deal damage. (Does not work if Flying Kick is unlocked)"},
+        {"row": 6, "col": 4, "name": "Charge", "desc": "Charge forward at high speed (hold shift to cancel)"},
+        {"row": 6, "col": 6, "name": "Tougher Skin", "desc": "Harden your skin and become permanently +5% more resistant. For every 1% or 1 Raw Heath Regen you have from items, gain +10 Health (Max 100)"},
+        {"row": 7, "col": 0, "name": "Vehement", "desc": "For every 1% or 1 Raw Main Attack Damage you have from items, gain +2% Walk Speed (Max 20%). Damage Bonus: +5 (Raw)"},
+        {"row": 8, "col": 2, "name": "Uppercut", "desc": "Rocket enemies in the air and deal massive damage"},
+        {"row": 8, "col": 4, "name": "Cheaper Charge", "desc": "Reduce the Mana cost of Charge"},
+        {"row": 8, "col": 6, "name": "War Scream", "desc": "Emit a terrorizing roar that deals damage, pull nearby enemies, and add damage resistance to yourself and allies"},
+        {"row": 10, "col": 0, "name": "Earth Mastery", "desc": "Increases base damage from all Earth attacks"},
+        {"row": 10, "col": 2, "name": "Thunder Mastery", "desc": "Increases base damage from all Thunder attacks"},
+        {"row": 10, "col": 6, "name": "Air Mastery", "desc": "Increases base damage from all Air attacks"},
+        {"row": 10, "col": 8, "name": "Fire Mastery", "desc": "Increases base damage from all Fire attacks"},
+        {"row": 11, "col": 4, "name": "Water Mastery", "desc": "Increases base damage from all Water attacks"},
+        {"row": 12, "col": 0, "name": "Quadruple Bash", "desc": "Bash will hit 4 times at an even larger range"},
+        {"row": 12, "col": 2, "name": "Fireworks", "desc": "Mobs hit by Uppercut will explode mid-air and receive additional damage"},
+        {"row": 12, "col": 6, "name": "Flyby Jab", "desc": "Damage enemies in your way when using Charge"},
+        {"row": 12, "col": 8, "name": "Flaming Uppercut", "desc": "Uppercut will light mobs on fire, dealing damage every 0.6 seconds"},
+        {"row": 13, "col": 4, "name": "Half-Moon Swipe", "desc": "Uppercut will deal a footsweep attack at a longer and wider angle. All elemental conversions become Water"},
+        {"row": 13, "col": 7, "name": "Iron Lungs", "desc": "War scream deals more damage"},
+        {"row": 15, "col": 2, "name": "Generalist", "desc": "After casting 3 different spells in a row, your next spell will cost 5 mana"},
+        {"row": 15, "col": 4, "name": "Counter", "desc": "When dodging a nearby enemy attack, get 30% chance to instantly attack back"},
+        {"row": 15, "col": 7, "name": "Mantle of the Bovemists", "desc": "When casting War Scream, create a holy shield around you that reduces all incoming damage by 70% for 3 hits (20s cooldown)"},
+        {"row": 16, "col": 1, "name": "Bak'al's Grasp", "desc": "After casting war Scream, become Corrupted (15s Cooldown). You cannot heal while in that state. While Corrupted, every 2% of Health you lose will add +4 Raw Damage to your attacks (Max 120)."},
+        {"row": 17, "col": 0, "name": "Spear Proficiency 2", "desc": "Improve your Main Attack's damage and range w/ spear"},
+        {"row": 17, "col": 3, "name": "Cheaper Uppercut", "desc": "Reduce the Mana Cost of Uppercut"},
+        {"row": 17, "col": 5, "name": "Aerodynamics", "desc": "During Charge, you can steer and change direction"},
+        {"row": 17, "col": 7, "name": "Provoke", "desc": "Mobs damaged by War Scream will target only you for at least 5s. Reduce the Mana cost of War Scream."},
+        {"row": 18, "col": 2, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 18, "col": 6, "name": "Air Shout", "desc": "War Scream will fire a projectile that can go through walls and deal damage multiple times."},
+        {"row": 20, "col": 0, "name": "Enraged Blow", "desc": "While Corriupted, every 1% of Health you lose will increase your damage by +2% (Max 200%)"},
+        {"row": 20, "col": 3, "name": "Flying Kick", "desc": "While using Charge, mobs hit will halt your momentum and get knocked back"},
+        {"row": 20, "col": 6, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 20, "col": 8, "name": "Manachism", "desc": "If you receive a hit that's less than 5% of your max HP, gain 10 mana (1s Cooldown)"},
+        {"row": 22, "col": 0, "name": "Boiling Blood", "desc": "Bash leaves a trail of boiling blood behind its first explosion, slowing down and damaging enemies above it every 0.4 seconds"},
+        {"row": 22, "col": 2, "name": "Ragnarokkr", "desc": "War Scream becomes deafening, increasing its range and giving damage bonus to players"},
+        {"row": 22, "col": 4, "name": "Ambidextrous", "desc": "Increase your change to attack with Counter by 30%"},
+        {"row": 22, "col": 6, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 22, "col": 8, "name": "Stronger Bash", "desc": "Increase the damage of Bash"},
+        {"row": 23, "col": 1, "name": "Massacre", "desc": "While Corrupted, if your effective attack speed is Slow or lower, hitting an enemy with your Main Attack will add +1% to your Corrupted bar"},
+        {"row": 23, "col": 5, "name": "Collide", "desc": "Mobs thrown into walls from Flying Kick will explode and receive additonal damage"},
+        {"row": 23, "col": 7, "name": "Rejuvenating Skin", "desc": "Regain back 30% of the damage you take as healing over 30s"},
+        {"row": 24, "col": 2, "name": "Comet", "desc": "After being hit by Fireworks, enemies will crash into the ground and receive more damage"},
+        {"row": 26, "col": 0, "name": "Uncontainable Corruption", "desc": "Reduce the cooldown of Bak'al's Grasp by -5s, and increase the raw damage gained for every 2% of health lost by +1"},
+        {"row": 26, "col": 2, "name": "Radiant Devotee", "desc": "For every 4% Reflection you have from items, gain +1/5s Mana Regen (Max 10/5s)"},
+        {"row": 26, "col": 4, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 26, "col": 7, "name": "Mythril Skin", "desc": "Gain +5% Base Resistance and become immune to knockback"},
+        {"row": 27, "col": 1, "name": "Armour Breaker", "desc": "While Corrupted, losing 30% Health will make your next Uppercut destroy enemies' defense, rendering them weaker to damage"},
+        {"row": 27, "col": 3, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 27, "col": 6, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 27, "col": 8, "name": "Sparking Hope", "desc": "Everytime you heal 5% of your max health, deal damage to all nearby enemies"},
+        {"row": 28, "col": 0, "name": "Massive Bash", "desc": "While Corrupted, every 3% Health you lose will add +1 AoE to Bash (Max 10)"},
+        {"row": 28, "col": 2, "name": "Tempest", "desc": "War Scream will ripple the ground and deal damage 3 times in a large area"},
+        {"row": 28, "col": 4, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 29, "col": 3, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 29, "col": 5, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 29, "col": 7, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 31, "col": 0, "name": "Cheaper War Scream", "desc": "Reduce the Mana cost of War Scream"},
+        {"row": 31, "col": 4, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 32, "col": 1, "name": "Blood KO", "desc": "Gonna have to rewrite this one chief"},
+        {"row": 32, "col": 3, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 32, "col": 5, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 32, "col": 7, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 34, "col": 1, "name": "Blood Pact", "desc": "If you do not have enough mana to cast a spell, spend health instead (1% health per mana)"},
+        {"row": 34, "col": 4, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 34, "col": 6, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 34, "col": 8, "name": "TEXT", "desc": "IDFK MMMM"},
+        {"row": 35, "col": 0, "name": "TEXT", "desc": "IDFK MMMM"}
+    ]
     "Assassin": [
         {
             "title": "Spin Attack",