diff --git a/leveldesign/game_element/sitem/melee_weapon/test/ic_item_1h_a.sitem b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_1h_a.sitem
new file mode 100644
index 0000000..1d50555
--- /dev/null
+++ b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_1h_a.sitem
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.7 $" State="modified">
+  <PARENT Filename="_c_m1pd.sitem"/>
+  <STRUCT>
+    <STRUCT Name="basics">
+      <ATOM Name="name" Value="dagger"/>
+      <ATOM Name="origin" Value="common"/>
+      <ATOM Name="family" Value="handled item"/>
+      <ATOM Name="Bulk" Value="1"/>
+      <ATOM Name="Weight" Value="0.19"/>
+      <ATOM Name="Stackable" Value="12"/>
+      <STRUCT Name="EquipmentInfo">
+        <ARRAY Name="EquipmentSlots">
+          <ATOM Name="right_hand" Value="Right Hand"/>
+        </ARRAY>
+      </STRUCT>
+      <ATOM Name="Price" Value="1"/>
+      <ATOM Name="Time to Equip In Ticks" Value="1"/>
+    </STRUCT>
+    <STRUCT Name="3d">
+      <ATOM Name="shape" Value="item_1h_a.shape"/>
+      <ATOM Name="shape_female" Value="item_1h_a.shape"/>
+      <ATOM Name="icon background" Value="bk_matis.tga"/>
+      <ATOM Name="anim_set" Value="Dagger"/>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/ic_item_1h_b.sitem b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_1h_b.sitem
new file mode 100644
index 0000000..c2a8a6c
--- /dev/null
+++ b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_1h_b.sitem
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.7 $" State="modified">
+  <PARENT Filename="_c_m1pd.sitem"/>
+  <STRUCT>
+    <STRUCT Name="basics">
+      <ATOM Name="name" Value="dagger"/>
+      <ATOM Name="origin" Value="common"/>
+      <ATOM Name="family" Value="handled item"/>
+      <ATOM Name="Bulk" Value="1"/>
+      <ATOM Name="Weight" Value="0.19"/>
+      <ATOM Name="Stackable" Value="12"/>
+      <STRUCT Name="EquipmentInfo">
+        <ARRAY Name="EquipmentSlots">
+          <ATOM Name="right_hand" Value="Right Hand"/>
+        </ARRAY>
+      </STRUCT>
+      <ATOM Name="Price" Value="1"/>
+      <ATOM Name="Time to Equip In Ticks" Value="1"/>
+    </STRUCT>
+    <STRUCT Name="3d">
+      <ATOM Name="shape" Value="item_1h_b.shape"/>
+      <ATOM Name="shape_female" Value="item_1h_b.shape"/>
+      <ATOM Name="icon background" Value="bk_matis.tga"/>
+      <ATOM Name="anim_set" Value="Dagger"/>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/ic_item_1h_c.sitem b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_1h_c.sitem
new file mode 100644
index 0000000..7b319c5
--- /dev/null
+++ b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_1h_c.sitem
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.7 $" State="modified">
+  <PARENT Filename="_c_m1pd.sitem"/>
+  <STRUCT>
+    <STRUCT Name="basics">
+      <ATOM Name="name" Value="dagger"/>
+      <ATOM Name="origin" Value="common"/>
+      <ATOM Name="family" Value="handled item"/>
+      <ATOM Name="Bulk" Value="1"/>
+      <ATOM Name="Weight" Value="0.19"/>
+      <ATOM Name="Stackable" Value="12"/>
+      <STRUCT Name="EquipmentInfo">
+        <ARRAY Name="EquipmentSlots">
+          <ATOM Name="right_hand" Value="Right Hand"/>
+        </ARRAY>
+      </STRUCT>
+      <ATOM Name="Price" Value="1"/>
+      <ATOM Name="Time to Equip In Ticks" Value="1"/>
+    </STRUCT>
+    <STRUCT Name="3d">
+      <ATOM Name="shape" Value="item_1h_c.shape"/>
+      <ATOM Name="shape_female" Value="item_1h_c.shape"/>
+      <ATOM Name="icon background" Value="bk_matis.tga"/>
+      <ATOM Name="anim_set" Value="Dagger"/>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/ic_item_2h_a.sitem b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_2h_a.sitem
new file mode 100644
index 0000000..66dd870
--- /dev/null
+++ b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_2h_a.sitem
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.7 $" State="modified">
+  <PARENT Filename="_c_m1ss.sitem"/>
+  <STRUCT>
+    <STRUCT Name="basics">
+      <ATOM Name="name" Value="dagger"/>
+      <ATOM Name="origin" Value="common"/>
+      <ATOM Name="family" Value="handled item"/>
+      <ATOM Name="Bulk" Value="1"/>
+      <ATOM Name="Weight" Value="0.19"/>
+      <ATOM Name="Stackable" Value="12"/>
+      <ATOM Name="Price" Value="1"/>
+      <ATOM Name="Time to Equip In Ticks" Value="1"/>
+    </STRUCT>
+    <STRUCT Name="3d">
+      <ATOM Name="shape" Value="item_2h_a.shape"/>
+      <ATOM Name="shape_female" Value="item_2h_a.shape"/>
+      <ATOM Name="icon background" Value="bk_matis.tga"/>
+      <ATOM Name="anim_set" Value="Dagger"/>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/ic_item_2h_b.sitem b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_2h_b.sitem
new file mode 100644
index 0000000..2fa00d6
--- /dev/null
+++ b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_2h_b.sitem
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.7 $" State="modified">
+  <PARENT Filename="_c_m1ss.sitem"/>
+  <STRUCT>
+    <STRUCT Name="basics">
+      <ATOM Name="name" Value="dagger"/>
+      <ATOM Name="origin" Value="common"/>
+      <ATOM Name="family" Value="handled item"/>
+      <ATOM Name="Bulk" Value="1"/>
+      <ATOM Name="Weight" Value="0.19"/>
+      <ATOM Name="Stackable" Value="12"/>
+      <ATOM Name="Price" Value="1"/>
+      <ATOM Name="Time to Equip In Ticks" Value="1"/>
+    </STRUCT>
+    <STRUCT Name="3d">
+      <ATOM Name="shape" Value="item_2h_b.shape"/>
+      <ATOM Name="shape_female" Value="item_2h_b.shape"/>
+      <ATOM Name="icon background" Value="bk_matis.tga"/>
+      <ATOM Name="anim_set" Value="Dagger"/>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/ic_item_2h_c.sitem b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_2h_c.sitem
new file mode 100644
index 0000000..846e38b
--- /dev/null
+++ b/leveldesign/game_element/sitem/melee_weapon/test/ic_item_2h_c.sitem
@@ -0,0 +1,27 @@
+<?xml version="1.0"?>
+<FORM Revision="$Revision: 1.7 $" State="modified">
+  <PARENT Filename="_c_m1ss.sitem"/>
+  <STRUCT>
+    <STRUCT Name="basics">
+      <ATOM Name="name" Value="dagger"/>
+      <ATOM Name="origin" Value="common"/>
+      <ATOM Name="family" Value="handled item"/>
+      <ATOM Name="Bulk" Value="1"/>
+      <ATOM Name="Weight" Value="0.19"/>
+      <ATOM Name="Stackable" Value="12"/>
+      <ATOM Name="Price" Value="1"/>
+      <ATOM Name="Time to Equip In Ticks" Value="1"/>
+    </STRUCT>
+    <STRUCT Name="3d">
+      <ATOM Name="shape" Value="item_2h_c.shape"/>
+      <ATOM Name="shape_female" Value="item_2h_c.shape"/>
+      <ATOM Name="icon background" Value="bk_matis.tga"/>
+      <ATOM Name="anim_set" Value="Dagger"/>
+    </STRUCT>
+  </STRUCT>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <STRUCT/>
+  <LOG></LOG>
+</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/item_1h_a.sitem b/leveldesign/game_element/sitem/melee_weapon/test/item_1h_a.sitem
deleted file mode 100644
index a3f4274..0000000
--- a/leveldesign/game_element/sitem/melee_weapon/test/item_1h_a.sitem
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<FORM Revision="$Revision: 1.2 $" State="modified">
-  <PARENT Filename="_c_m1pd.sitem"/>
-  <STRUCT>
-    <STRUCT Name="basics">
-      <ATOM Name="name" Value="refugee dagger"/>
-      <ATOM Name="origin" Value="refugee"/>
-      <ATOM Name="CraftPlan" Value="bcrmea06.sbrick"/>
-    </STRUCT>
-    <STRUCT Name="3d">
-      <ATOM Name="shape" Value="item_1h_a.shape"/>
-      <ATOM Name="shape_female" Value="item_1h_a.shape"/>
-      <ATOM Name="map_variant" Value="Default"/>
-      <ATOM Name="icon background" Value="BK_generic.tga"/>
-    </STRUCT>
-  </STRUCT>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <LOG></LOG>
-</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/item_1h_b.sitem b/leveldesign/game_element/sitem/melee_weapon/test/item_1h_b.sitem
deleted file mode 100644
index e131ee9..0000000
--- a/leveldesign/game_element/sitem/melee_weapon/test/item_1h_b.sitem
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<FORM Revision="$Revision: 1.2 $" State="modified">
-  <PARENT Filename="_c_m1pd.sitem"/>
-  <STRUCT>
-    <STRUCT Name="basics">
-      <ATOM Name="name" Value="refugee dagger"/>
-      <ATOM Name="origin" Value="refugee"/>
-      <ATOM Name="CraftPlan" Value="bcrmea06.sbrick"/>
-    </STRUCT>
-    <STRUCT Name="3d">
-      <ATOM Name="shape" Value="item_1h_b.shape"/>
-      <ATOM Name="shape_female" Value="item_1h_b.shape"/>
-      <ATOM Name="map_variant" Value="Default"/>
-      <ATOM Name="icon background" Value="BK_generic.tga"/>
-    </STRUCT>
-  </STRUCT>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <LOG></LOG>
-</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/item_1h_c.sitem b/leveldesign/game_element/sitem/melee_weapon/test/item_1h_c.sitem
deleted file mode 100644
index 1ff2e6b..0000000
--- a/leveldesign/game_element/sitem/melee_weapon/test/item_1h_c.sitem
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<FORM Revision="$Revision: 1.2 $" State="modified">
-  <PARENT Filename="_c_m1pd.sitem"/>
-  <STRUCT>
-    <STRUCT Name="basics">
-      <ATOM Name="name" Value="refugee dagger"/>
-      <ATOM Name="origin" Value="refugee"/>
-      <ATOM Name="CraftPlan" Value="bcrmea06.sbrick"/>
-    </STRUCT>
-    <STRUCT Name="3d">
-      <ATOM Name="shape" Value="item_1h_c.shape"/>
-      <ATOM Name="shape_female" Value="item_1h_c.shape"/>
-      <ATOM Name="map_variant" Value="Default"/>
-      <ATOM Name="icon background" Value="BK_generic.tga"/>
-    </STRUCT>
-  </STRUCT>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <LOG></LOG>
-</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/item_2h_a.sitem b/leveldesign/game_element/sitem/melee_weapon/test/item_2h_a.sitem
deleted file mode 100644
index f5a7c47..0000000
--- a/leveldesign/game_element/sitem/melee_weapon/test/item_2h_a.sitem
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<FORM Revision="$Revision: 1.2 $" State="modified">
-  <PARENT Filename="_c_m2ss.sitem"/>
-  <STRUCT>
-    <STRUCT Name="basics">
-      <ATOM Name="name" Value="long sword"/>
-      <ATOM Name="origin" Value="refugee"/>
-      <ATOM Name="CraftPlan" Value="bccmea03.sbrick"/>
-    </STRUCT>
-    <STRUCT Name="3d">
-      <ATOM Name="shape" Value="item_2h_a.shape"/>
-      <ATOM Name="shape_female" Value="item_2h_a.shape"/>
-      <ATOM Name="map_variant" Value="Default"/>
-      <ATOM Name="icon background" Value="BK_generic.tga"/>
-    </STRUCT>
-  </STRUCT>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <LOG></LOG>
-</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/item_2h_b.sitem b/leveldesign/game_element/sitem/melee_weapon/test/item_2h_b.sitem
deleted file mode 100644
index 2c281be..0000000
--- a/leveldesign/game_element/sitem/melee_weapon/test/item_2h_b.sitem
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<FORM Revision="$Revision: 1.2 $" State="modified">
-  <PARENT Filename="_c_m2ss.sitem"/>
-  <STRUCT>
-    <STRUCT Name="basics">
-      <ATOM Name="name" Value="long sword"/>
-      <ATOM Name="origin" Value="refugee"/>
-      <ATOM Name="CraftPlan" Value="bccmea03.sbrick"/>
-    </STRUCT>
-    <STRUCT Name="3d">
-      <ATOM Name="shape" Value="item_2h_b.shape"/>
-      <ATOM Name="shape_female" Value="item_2h_b.shape"/>
-      <ATOM Name="map_variant" Value="Default"/>
-      <ATOM Name="icon background" Value="BK_generic.tga"/>
-    </STRUCT>
-  </STRUCT>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <LOG></LOG>
-</FORM>
diff --git a/leveldesign/game_element/sitem/melee_weapon/test/item_2h_c.sitem b/leveldesign/game_element/sitem/melee_weapon/test/item_2h_c.sitem
deleted file mode 100644
index 960d996..0000000
--- a/leveldesign/game_element/sitem/melee_weapon/test/item_2h_c.sitem
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0"?>
-<FORM Revision="$Revision: 1.2 $" State="modified">
-  <PARENT Filename="_c_m2ss.sitem"/>
-  <STRUCT>
-    <STRUCT Name="basics">
-      <ATOM Name="name" Value="long sword"/>
-      <ATOM Name="origin" Value="refugee"/>
-      <ATOM Name="CraftPlan" Value="bccmea03.sbrick"/>
-    </STRUCT>
-    <STRUCT Name="3d">
-      <ATOM Name="shape" Value="item_2h_c.shape"/>
-      <ATOM Name="shape_female" Value="item_2h_c.shape"/>
-      <ATOM Name="map_variant" Value="Default"/>
-      <ATOM Name="icon background" Value="BK_generic.tga"/>
-    </STRUCT>
-  </STRUCT>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <STRUCT/>
-  <LOG></LOG>
-</FORM>