diff --git a/init.lua b/init.lua
index cbe36f7..a5544ed 100644
--- a/init.lua
+++ b/init.lua
@@ -2,3 +2,4 @@ dofile(minetest.get_modpath('aether2') .. '/nodes.lua')
 dofile(minetest.get_modpath('aether2') .. '/tools.lua')
 dofile(minetest.get_modpath('aether2') .. '/crafting.lua')
 dofile(minetest.get_modpath('aether2') .. '/craft_items.lua')
+dofile(minetest.get_modpath('aether2') .. '/weapons.lua')
diff --git a/tools.lua b/tools.lua
index 9bc9ebf..37474ea 100644
--- a/tools.lua
+++ b/tools.lua
@@ -8,7 +8,7 @@ minetest.register_tool("aether2:pick_skyroot", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aetherstone = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aetherstone = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=60}
     },
     damage_groups = {fleshy=3},
   }
@@ -21,7 +21,7 @@ minetest.register_tool("aether2:axe_skyroot", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aehtertree = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aehtertree = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=60}
     },
     damage_groups = {fleshy=3},
   }
@@ -34,7 +34,7 @@ minetest.register_tool("aether2:shovel_skyroot", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aehterdirt = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aehterdirt = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=60}
     },
     damage_groups = {fleshy=3},
   }
@@ -88,7 +88,7 @@ minetest.register_tool("aether2:pick_zanite", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aetherstone = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aetherstone = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=251}
     },
     damage_groups = {fleshy=3},
   }
@@ -101,7 +101,7 @@ minetest.register_tool("aether2:axe_zanite", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aehtertree = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aehtertree = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=251}
     },
     damage_groups = {fleshy=3},
   }
@@ -114,7 +114,7 @@ minetest.register_tool("aether2:shovel_zanite", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aehterdirt = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aehterdirt = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=251}
     },
     damage_groups = {fleshy=3},
   }
@@ -128,7 +128,7 @@ minetest.register_tool("aether2:pick_gavitite", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aetherstone = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aetherstone = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=1562}
     },
     damage_groups = {fleshy=3},
   }
@@ -141,7 +141,7 @@ minetest.register_tool("aether2:axe_gavitite", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aehtertree = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aehtertree = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=1562}
     },
     damage_groups = {fleshy=3},
   }
@@ -154,7 +154,7 @@ minetest.register_tool("aether2:shovel_gavitite", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aehterdirt = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aehterdirt = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=1562}
     },
     damage_groups = {fleshy=3},
   }
@@ -168,7 +168,7 @@ minetest.register_tool("aether2:pick_valkyrie", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aetherstone = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aetherstone = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=1562}
     },
     damage_groups = {fleshy=3},
   }
@@ -181,7 +181,7 @@ minetest.register_tool("aether2:axe_valkyrie", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aehtertree = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aehtertree = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=1562}
     },
     damage_groups = {fleshy=3},
   }
@@ -194,7 +194,7 @@ minetest.register_tool("aether2:shovel_valkyrie", {
     full_punch_interval = 1.3,
     max_drop_level =0,
     groupcaps={
-      aehterdirt = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=132}
+      aehterdirt = {times={[1]=.75, [2]=2.0, [3]=1.00}, uses=1562}
     },
     damage_groups = {fleshy=3},
   }
diff --git a/weapons.lua b/weapons.lua
new file mode 100644
index 0000000..e69de29