diff --git a/Library/Basic Set/Basic Set Equipment.eqp b/Library/Basic Set/Basic Set Equipment.eqp
index 438b2737a..8aa23474d 100644
--- a/Library/Basic Set/Basic Set Equipment.eqp	
+++ b/Library/Basic Set/Basic Set Equipment.eqp	
@@ -5257,12 +5257,13 @@
 		{
 			"id": "d4738e51-1029-4fab-9b07-871f3bcdbb94",
 			"type": "equipment",
-			"description": "Composite Bow (ST10)",
+			"description": "Composite Bow",
 			"reference": "B275",
 			"tech_level": "1",
 			"tags": [
 				"Missile Weapon"
 			],
+			"rated_strength": 10,
 			"quantity": 1,
 			"value": 900,
 			"weight": "4 lb",
@@ -5272,11 +5273,12 @@
 					"type": "ranged_weapon",
 					"damage": {
 						"type": "imp",
-						"base": "1d+1"
+						"st": "thr",
+						"base": "3"
 					},
 					"strength": "10†",
 					"accuracy": "3",
-					"range": "200/250",
+					"range": "x20/x25",
 					"rate_of_fire": "1",
 					"shots": "1(2)",
 					"bulk": "-7",
@@ -5291,8 +5293,8 @@
 						}
 					],
 					"calc": {
-						"range": "200/250",
-						"damage": "1d+1 imp"
+						"range": "x20/x25",
+						"damage": "thr+3 imp"
 					}
 				}
 			],
@@ -5302,360 +5304,291 @@
 			}
 		},
 		{
-			"id": "87a57f20-7973-4565-85c6-b5292278f136",
+			"id": "9c2bf1a6-6a76-4596-842a-ca9c5aa018dc",
 			"type": "equipment",
-			"description": "Composite Bow (ST11)",
-			"reference": "B275",
-			"tech_level": "1",
+			"description": "Computer, Laptop",
+			"reference": "B288",
+			"notes": "Modem plugs into phone. 2 hrs.",
+			"tech_level": "8",
 			"tags": [
-				"Missile Weapon"
+				"Communications and Information Gear"
 			],
 			"quantity": 1,
-			"value": 990,
-			"weight": "4 lb",
-			"weapons": [
-				{
-					"id": "7a74635c-b9a1-41ad-947b-cdd7e1a51b0d",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+2"
-					},
-					"strength": "11†",
-					"accuracy": "3",
-					"range": "220/275",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "220/275",
-						"damage": "1d+2 imp"
-					}
-				}
+			"value": 1500,
+			"weight": "3 lb",
+			"calc": {
+				"extended_value": 1500,
+				"extended_weight": "3 lb"
+			}
+		},
+		{
+			"id": "fb6e6827-8484-4b59-bcf2-9b116dc383ef",
+			"type": "equipment",
+			"description": "Computer, Wearable",
+			"reference": "B288",
+			"notes": "Display glasses and wireless modem. 8 hrs.",
+			"tech_level": "8",
+			"tags": [
+				"Communications and Information Gear"
 			],
+			"quantity": 1,
+			"value": 1000,
+			"weight": "2 lb",
 			"calc": {
-				"extended_value": 990,
-				"extended_weight": "4 lb"
+				"extended_value": 1000,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "52982e62-fd1b-4ba6-9ddc-7c33b59afb6c",
+			"id": "aefdb53f-f716-4cfb-bcf8-147c379603c3",
 			"type": "equipment",
-			"description": "Composite Bow (ST12)",
-			"reference": "B275",
+			"description": "Copper Farthing",
+			"reference": "B264",
 			"tech_level": "1",
 			"tags": [
-				"Missile Weapon"
+				"Money: GURPS Standard Medieval Coins"
 			],
 			"quantity": 1,
-			"value": 1080,
-			"weight": "4 lb",
-			"weapons": [
+			"value": 1,
+			"weight": "0.008 lb",
+			"calc": {
+				"extended_value": 1,
+				"extended_weight": "0.008 lb"
+			}
+		},
+		{
+			"id": "1e069176-5594-463c-8996-ed57f1fe238c",
+			"type": "equipment",
+			"description": "Cord, 3/16\", 10 yards",
+			"reference": "B288",
+			"notes": "Supports 90 lbs.",
+			"tech_level": "0",
+			"tags": [
+				"Camping and Survival Gear"
+			],
+			"quantity": 1,
+			"value": 1,
+			"weight": "0.5 lb",
+			"calc": {
+				"extended_value": 1,
+				"extended_weight": "0.5 lb"
+			}
+		},
+		{
+			"id": "d8f7c4bf-dafd-4b6e-a9cc-735bbdf0a448",
+			"type": "equipment",
+			"description": "Cord, 3/16\", 20 yards",
+			"reference": "B288",
+			"notes": "Supports 90 lbs.",
+			"tech_level": "0",
+			"tags": [
+				"Camping and Survival Gear"
+			],
+			"quantity": 1,
+			"value": 2,
+			"weight": "1 lb",
+			"calc": {
+				"extended_value": 2,
+				"extended_weight": "1 lb"
+			}
+		},
+		{
+			"id": "2b20d8cd-b8c5-46ab-a318-b7002d00c8b3",
+			"type": "equipment",
+			"description": "Crash Kit/TL0-5",
+			"reference": "B289",
+			"notes": "A complete kit for treating serous injuries. Includes sterile bandages, sutures, and drugs appropriate for the TL. Counts as improvised gear (-5) for Surgery",
+			"tech_level": "0-5",
+			"tags": [
+				"Medical Gear"
+			],
+			"quantity": 1,
+			"value": 200,
+			"weight": "10 lb",
+			"features": [
 				{
-					"id": "ec2dc73e-15a3-48e6-90f0-4a326dab441c",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+2"
+					"type": "skill_bonus",
+					"selection_type": "skills_with_name",
+					"name": {
+						"compare": "is",
+						"qualifier": "First Aid"
 					},
-					"strength": "12†",
-					"accuracy": "3",
-					"range": "240/300",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "240/300",
-						"damage": "1d+2 imp"
-					}
+					"amount": 2
 				}
 			],
 			"calc": {
-				"extended_value": 1080,
-				"extended_weight": "4 lb"
+				"extended_value": 200,
+				"extended_weight": "10 lb"
 			}
 		},
 		{
-			"id": "6d3bb148-a3d8-4f24-8f89-b952af873642",
+			"id": "13f733b6-42d5-4224-ac98-3d9df9f1ebc0",
 			"type": "equipment",
-			"description": "Composite Bow (ST13)",
-			"reference": "B275",
-			"tech_level": "1",
+			"description": "Crash Kit/TL6+",
+			"reference": "B289",
+			"notes": "A complete kit for treating serous injuries. Includes sterile bandages, sutures, and drugs appropriate for the TL. Includes IV drip, needle, and plasma. Counts as improvised gear (-5) for Surgery",
+			"tech_level": "6+",
 			"tags": [
-				"Missile Weapon"
+				"Medical Gear"
 			],
 			"quantity": 1,
-			"value": 1170,
-			"weight": "4 lb",
-			"weapons": [
+			"value": 200,
+			"weight": "10 lb",
+			"features": [
 				{
-					"id": "c82a84a2-59fe-4cd9-963a-514d9ba1fd31",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+3"
+					"type": "skill_bonus",
+					"selection_type": "skills_with_name",
+					"name": {
+						"compare": "is",
+						"qualifier": "First Aid"
 					},
-					"strength": "13†",
-					"accuracy": "3",
-					"range": "260/325",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "260/325",
-						"damage": "1d+3 imp"
-					}
+					"amount": 2
 				}
 			],
 			"calc": {
-				"extended_value": 1170,
-				"extended_weight": "4 lb"
+				"extended_value": 200,
+				"extended_weight": "10 lb"
 			}
 		},
 		{
-			"id": "c5650846-9e0b-45b4-af1c-c3c36c2e929d",
+			"id": "f3f45d4e-cc11-4556-938d-7587142b5088",
 			"type": "equipment",
-			"description": "Composite Bow (ST14)",
-			"reference": "B275",
-			"tech_level": "1",
+			"description": "Crossbow",
+			"reference": "B276",
+			"tech_level": "2",
 			"tags": [
-				"Missile Weapon"
+				"Missile Weapon",
+				"UsesAmmoType:Bolt"
 			],
+			"rated_strength": 7,
 			"quantity": 1,
-			"value": 1260,
-			"weight": "4 lb",
+			"value": 150,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "96898e2d-7e04-43f9-bc6e-580dddc77068",
+					"id": "dff3833e-b0dc-4362-b65e-4628d2ba454a",
 					"type": "ranged_weapon",
 					"damage": {
 						"type": "imp",
-						"base": "1d+3"
+						"st": "thr",
+						"base": "4"
 					},
-					"strength": "14†",
-					"accuracy": "3",
-					"range": "280/350",
+					"strength": "7†",
+					"accuracy": "4",
+					"range": "x20/x25",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"range": "280/350",
-						"damage": "1d+3 imp"
+						"range": "x20/x25",
+						"damage": "thr+4 imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 1260,
-				"extended_weight": "4 lb"
+				"extended_value": 150,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "1ca4e2d4-0c44-4b71-a482-90ba38155d94",
+			"id": "f11340e0-77c6-47e2-b736-6e1e71e7956b",
 			"type": "equipment",
-			"description": "Composite Bow (ST15)",
-			"reference": "B275",
-			"tech_level": "1",
+			"description": "Crossbow Bolt",
+			"reference": "B276",
+			"tech_level": "2",
 			"tags": [
+				"AmmoType:Bolt",
+				"Ammunition",
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 1350,
-			"weight": "4 lb",
-			"weapons": [
-				{
-					"id": "fd1b310b-45d4-4c73-8ccd-2aeeca66ebb3",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+4"
-					},
-					"strength": "15†",
-					"accuracy": "3",
-					"range": "300/375",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "300/375",
-						"damage": "1d+4 imp"
-					}
-				}
-			],
+			"value": 2,
+			"weight": "0.06 lb",
 			"calc": {
-				"extended_value": 1350,
-				"extended_weight": "4 lb"
+				"extended_value": 2,
+				"extended_weight": "0.06 lb"
 			}
 		},
 		{
-			"id": "25e4cdc0-8065-4d1f-911d-9a6186272a0e",
+			"id": "b669205c-4834-4b3f-b440-55ef154fe98c",
 			"type": "equipment",
-			"description": "Composite Bow (ST16)",
-			"reference": "B275",
-			"tech_level": "1",
+			"description": "Crowbar, 3'",
+			"reference": "B289",
+			"tech_level": "2",
 			"tags": [
-				"Missile Weapon"
+				"Melee Weapon",
+				"Missile Weapon",
+				"Tools"
 			],
 			"quantity": 1,
-			"value": 1440,
-			"weight": "4 lb",
+			"value": 20,
+			"weight": "3 lb",
 			"weapons": [
 				{
-					"id": "d8b2e21f-1aac-4a7e-9a40-166ed4540174",
-					"type": "ranged_weapon",
+					"id": "5c2d2e95-12cd-45ad-a635-bc07801ce602",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+4"
+						"type": "cr",
+						"st": "sw",
+						"base": "2"
 					},
-					"strength": "16†",
-					"accuracy": "3",
-					"range": "320/400",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"strength": "10",
+					"usage": "Swung",
+					"reach": "1",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -6
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "320/400",
-						"damage": "1d+4 imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 1440,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "bc535b20-87b8-4726-995d-3be1f5e54954",
-			"type": "equipment",
-			"description": "Composite Bow (ST17)",
-			"reference": "B275",
-			"tech_level": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 1530,
-			"weight": "4 lb",
-			"weapons": [
-				{
-					"id": "630219fd-6a4d-4f75-9dda-042c3b3450cd",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+5"
-					},
-					"strength": "17†",
-					"accuracy": "3",
-					"range": "340/425",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
-					"defaults": [
+							"name": "Axe/Mace",
+							"modifier": -1
+						},
 						{
-							"type": "dx",
+							"type": "skill",
+							"name": "Flail",
 							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Two-Handed Axe/Mace",
+							"modifier": -4
 						}
 					],
 					"calc": {
-						"range": "340/425",
-						"damage": "1d+5 imp"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+2 cr"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 1530,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "c11be75c-2e03-4ed8-a714-f52bdc840140",
-			"type": "equipment",
-			"description": "Composite Bow (ST18)",
-			"reference": "B275",
-			"tech_level": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 1620,
-			"weight": "4 lb",
-			"weapons": [
+				},
 				{
-					"id": "e5a94699-728e-4d28-83b0-f4a6a0eb3902",
+					"id": "7cc7ddf4-b36b-4a54-be59-3182450835ef",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+5"
+						"type": "cr",
+						"st": "sw",
+						"base": "2"
 					},
-					"strength": "18†",
-					"accuracy": "3",
-					"range": "360/450",
+					"strength": "10",
+					"usage": "Thrown",
+					"accuracy": "1",
+					"range": "x1/x1.5",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"shots": "T(1)",
+					"bulk": "-3",
 					"defaults": [
 						{
 							"type": "dx",
@@ -5663,46 +5596,47 @@
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Thrown Weapon",
+							"specialization": "Axe/Mace",
+							"modifier": -1
 						}
 					],
 					"calc": {
-						"range": "360/450",
-						"damage": "1d+5 imp"
+						"range": "x1/x1.5",
+						"damage": "sw+2 cr"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 1620,
-				"extended_weight": "4 lb"
+				"extended_value": 20,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "34e564a2-4c29-4260-b9b1-7c85847e1052",
+			"id": "bbae415e-7ceb-4760-8a70-d904d7989a31",
 			"type": "equipment",
-			"description": "Composite Bow (ST19)",
-			"reference": "B275",
-			"tech_level": "1",
+			"description": "Cutlass",
+			"reference": "B273",
+			"tech_level": "4",
 			"tags": [
-				"Missile Weapon"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 1710,
-			"weight": "4 lb",
+			"value": 300,
+			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "1f78a565-8fd3-4a39-8699-35006b393e3e",
-					"type": "ranged_weapon",
+					"id": "53dea8e9-0c33-4ad8-a70f-c9332f0fb9a8",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d+2"
+						"type": "cut",
+						"st": "sw"
 					},
-					"strength": "19†",
-					"accuracy": "3",
-					"range": "380/475",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"strength": "8",
+					"usage": "Swung",
+					"reach": "1",
+					"parry": "0",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
@@ -5710,46 +5644,66 @@
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Shortsword"
+						},
+						{
+							"type": "skill",
+							"name": "Broadsword",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Force Sword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Jitte/Sai",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Knife",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Saber",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Smallsword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Tonfa",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "380/475",
-						"damage": "2d+2 imp"
+						"parry": "0",
+						"block": "No",
+						"damage": "sw cut"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 1710,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "399398f0-4ca3-441f-a9ee-42a40dd4ff03",
-			"type": "equipment",
-			"description": "Composite Bow (ST20)",
-			"reference": "B275",
-			"tech_level": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 1800,
-			"weight": "4 lb",
-			"weapons": [
+				},
 				{
-					"id": "b1c9660a-af81-49be-b620-1408675c8149",
-					"type": "ranged_weapon",
+					"id": "11d7599d-c0cc-401c-a9b4-7e53e3345154",
+					"type": "melee_weapon",
 					"damage": {
 						"type": "imp",
-						"base": "2d+2"
+						"st": "thr"
 					},
-					"strength": "20†",
-					"accuracy": "3",
-					"range": "400/500",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"strength": "8",
+					"usage": "Thrust",
+					"reach": "1",
+					"parry": "0",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
@@ -5757,194 +5711,123 @@
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Shortsword"
+						},
+						{
+							"type": "skill",
+							"name": "Broadsword",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Force Sword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Jitte/Sai",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Knife",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Saber",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Smallsword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Tonfa",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "400/500",
-						"damage": "2d+2 imp"
+						"parry": "0",
+						"block": "No",
+						"damage": "thr imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 1800,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "9c2bf1a6-6a76-4596-842a-ca9c5aa018dc",
-			"type": "equipment",
-			"description": "Computer, Laptop",
-			"reference": "B288",
-			"notes": "Modem plugs into phone. 2 hrs.",
-			"tech_level": "8",
-			"tags": [
-				"Communications and Information Gear"
-			],
-			"quantity": 1,
-			"value": 1500,
-			"weight": "3 lb",
-			"calc": {
-				"extended_value": 1500,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "fb6e6827-8484-4b59-bcf2-9b116dc383ef",
-			"type": "equipment",
-			"description": "Computer, Wearable",
-			"reference": "B288",
-			"notes": "Display glasses and wireless modem. 8 hrs.",
-			"tech_level": "8",
-			"tags": [
-				"Communications and Information Gear"
-			],
-			"quantity": 1,
-			"value": 1000,
-			"weight": "2 lb",
-			"calc": {
-				"extended_value": 1000,
+				"extended_value": 300,
 				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "aefdb53f-f716-4cfb-bcf8-147c379603c3",
-			"type": "equipment",
-			"description": "Copper Farthing",
-			"reference": "B264",
-			"tech_level": "1",
-			"tags": [
-				"Money: GURPS Standard Medieval Coins"
-			],
-			"quantity": 1,
-			"value": 1,
-			"weight": "0.008 lb",
-			"calc": {
-				"extended_value": 1,
-				"extended_weight": "0.008 lb"
-			}
-		},
-		{
-			"id": "1e069176-5594-463c-8996-ed57f1fe238c",
-			"type": "equipment",
-			"description": "Cord, 3/16\", 10 yards",
-			"reference": "B288",
-			"notes": "Supports 90 lbs.",
-			"tech_level": "0",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 1,
-			"weight": "0.5 lb",
-			"calc": {
-				"extended_value": 1,
-				"extended_weight": "0.5 lb"
-			}
-		},
-		{
-			"id": "d8f7c4bf-dafd-4b6e-a9cc-735bbdf0a448",
-			"type": "equipment",
-			"description": "Cord, 3/16\", 20 yards",
-			"reference": "B288",
-			"notes": "Supports 90 lbs.",
-			"tech_level": "0",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 2,
-			"weight": "1 lb",
-			"calc": {
-				"extended_value": 2,
-				"extended_weight": "1 lb"
-			}
-		},
-		{
-			"id": "2b20d8cd-b8c5-46ab-a318-b7002d00c8b3",
+			"id": "e68b8c36-8cd4-4036-bf5b-925d72124f0f",
 			"type": "equipment",
-			"description": "Crash Kit/TL0-5",
+			"description": "Cutting Torch",
 			"reference": "B289",
-			"notes": "A complete kit for treating serous injuries. Includes sterile bandages, sutures, and drugs appropriate for the TL. Counts as improvised gear (-5) for Surgery",
-			"tech_level": "0-5",
+			"notes": "1d+3(2) burn per second. Each gas bottle gives 30 seconds of cutting. Extra gas bottles are $50, 15 lbs. per bottle.",
+			"tech_level": "6",
 			"tags": [
-				"Medical Gear"
+				"Tools"
 			],
 			"quantity": 1,
-			"value": 200,
-			"weight": "10 lb",
-			"features": [
-				{
-					"type": "skill_bonus",
-					"selection_type": "skills_with_name",
-					"name": {
-						"compare": "is",
-						"qualifier": "First Aid"
-					},
-					"amount": 2
-				}
-			],
+			"value": 500,
+			"weight": "30 lb",
 			"calc": {
-				"extended_value": 200,
-				"extended_weight": "10 lb"
+				"extended_value": 500,
+				"extended_weight": "30 lb"
 			}
 		},
 		{
-			"id": "13f733b6-42d5-4224-ac98-3d9df9f1ebc0",
+			"id": "3fab2a5b-a6f0-4065-b83d-b122b025a9a5",
 			"type": "equipment",
-			"description": "Crash Kit/TL6+",
+			"description": "Cutting Torch Gas Bottle",
 			"reference": "B289",
-			"notes": "A complete kit for treating serous injuries. Includes sterile bandages, sutures, and drugs appropriate for the TL. Includes IV drip, needle, and plasma. Counts as improvised gear (-5) for Surgery",
-			"tech_level": "6+",
+			"notes": "Extra Gas Bottle",
+			"tech_level": "6",
 			"tags": [
-				"Medical Gear"
+				"Tools"
 			],
 			"quantity": 1,
-			"value": 200,
-			"weight": "10 lb",
-			"features": [
-				{
-					"type": "skill_bonus",
-					"selection_type": "skills_with_name",
-					"name": {
-						"compare": "is",
-						"qualifier": "First Aid"
-					},
-					"amount": 2
-				}
-			],
+			"value": 50,
+			"weight": "15 lb",
 			"calc": {
-				"extended_value": 200,
-				"extended_weight": "10 lb"
+				"extended_value": 50,
+				"extended_weight": "15 lb"
 			}
 		},
 		{
-			"id": "f3f45d4e-cc11-4556-938d-7587142b5088",
+			"id": "7492f0b1-3c8f-41b0-8200-43e05c0b52d6",
 			"type": "equipment",
-			"description": "Crossbow (ST7)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Dagger",
+			"reference": "B272",
+			"tech_level": "1",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Melee Weapon",
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 150,
-			"weight": "6 lb",
+			"value": 20,
+			"weight": "0.25 lb",
 			"weapons": [
 				{
-					"id": "dff3833e-b0dc-4362-b65e-4628d2ba454a",
-					"type": "ranged_weapon",
+					"id": "7ba39755-8571-43fa-a9af-4d6cc53df929",
+					"type": "melee_weapon",
 					"damage": {
 						"type": "imp",
-						"base": "1d+1"
+						"st": "thr",
+						"base": "-1"
 					},
-					"strength": "7†",
-					"accuracy": "4",
-					"range": "140/175",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "5",
+					"usage": "Thrust",
+					"reach": "C",
+					"parry": "-1",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
@@ -5952,47 +5835,49 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Knife"
+						},
+						{
+							"type": "skill",
+							"name": "Force Sword",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Main-Gauche",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Shortsword",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "140/175",
-						"damage": "1d+1 imp"
+						"parry": "-1",
+						"block": "No",
+						"damage": "thr-1 imp"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 150,
-				"extended_weight": "6 lb"
-			}
-		},
-		{
-			"id": "8c1c9ac5-b630-4bcf-a1c5-2a7b50051ed6",
-			"type": "equipment",
-			"description": "Crossbow (ST8)",
-			"reference": "B276",
-			"tech_level": "2",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
-			],
-			"quantity": 1,
-			"value": 165,
-			"weight": "6 lb",
-			"weapons": [
+				},
 				{
-					"id": "31a6fce7-d127-432d-9800-77eb3b7eaa97",
+					"id": "7d6f591f-516a-4cc3-92bf-8971b0537f84",
 					"type": "ranged_weapon",
 					"damage": {
 						"type": "imp",
-						"base": "1d+1"
+						"st": "thr",
+						"base": "-1"
 					},
-					"strength": "8†",
-					"accuracy": "4",
-					"range": "160/200",
+					"strength": "5",
+					"usage": "Thrown",
+					"accuracy": "+0",
+					"range": "x0.5/x1",
 					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"shots": "T(1)",
+					"bulk": "-1",
 					"defaults": [
 						{
 							"type": "dx",
@@ -6000,47 +5885,49 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Thrown Weapon",
+							"specialization": "Knife"
 						}
 					],
 					"calc": {
-						"range": "160/200",
-						"damage": "1d+1 imp"
+						"range": "x0.5/x1",
+						"damage": "thr-1 imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 165,
-				"extended_weight": "6 lb"
+				"extended_value": 20,
+				"extended_weight": "0.25 lb"
 			}
 		},
 		{
-			"id": "8c5717ff-06b4-44be-ad08-38e2a66f74ed",
+			"id": "b2e910e2-9a41-4785-af43-1234b7eb0756",
 			"type": "equipment",
-			"description": "Crossbow (ST9)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Dart Rifle, 11mm",
+			"reference": "B279",
+			"tech_level": "8",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 180,
-			"weight": "6 lb",
+			"value": 1200,
+			"weight": "6.6 lb",
 			"weapons": [
 				{
-					"id": "f213b543-a100-4af8-b0f0-78414d1946ac",
+					"id": "5cf3e96d-71b3-4574-9cba-40e59ffb6562",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+2"
+						"type": "pi-",
+						"base": "1d",
+						"armor_divisor": 0.2
 					},
 					"strength": "9†",
-					"accuracy": "4",
-					"range": "180/225",
+					"accuracy": "5+1",
+					"range": "45/145",
 					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"shots": "1(3)",
+					"bulk": "-5",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
@@ -6048,47 +5935,101 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Rifle"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "180/225",
-						"damage": "1d+2 imp"
+						"range": "45/145",
+						"damage": "1d(0.2) pi-"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 180,
-				"extended_weight": "6 lb"
+				"extended_value": 1200,
+				"extended_weight": "6.6 lb"
 			}
 		},
 		{
-			"id": "d30c64ee-03e0-4468-a98c-39d55f347694",
+			"id": "ac0bf83b-5d10-459c-89fc-80e184c3f71e",
 			"type": "equipment",
-			"description": "Crossbow (ST10)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Derringer, .41",
+			"reference": "B278",
+			"tech_level": "5",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 195,
-			"weight": "6 lb",
+			"value": 100,
+			"weight": "0.5 lb",
 			"weapons": [
 				{
-					"id": "0b5c82b8-1a9f-4761-9e39-65a636a633ff",
+					"id": "79573800-cafb-4382-995e-6ca1350898f3",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+2"
+						"type": "pi+",
+						"base": "1d"
 					},
-					"strength": "10†",
-					"accuracy": "4",
-					"range": "200/250",
+					"strength": "9",
+					"accuracy": "1",
+					"range": "80/650",
 					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"shots": "2(3i)",
+					"bulk": "-1",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
@@ -6096,143 +6037,184 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Guns",
+							"specialization": "Pistol"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "200/250",
-						"damage": "1d+2 imp"
+						"range": "80/650",
+						"damage": "1d pi+"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 195,
-				"extended_weight": "6 lb"
+				"extended_value": 100,
+				"extended_weight": "0.5 lb"
 			}
 		},
 		{
-			"id": "ad576f0e-73d0-4fc2-98f0-cbadcfa59c0b",
+			"id": "15393964-54e8-452f-9ec4-41f54a40a5fc",
 			"type": "equipment",
-			"description": "Crossbow (ST11)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Disguise Kit",
+			"reference": "B289",
+			"tech_level": "5",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Law-Enforcement",
+				"Spy Gear",
+				"Thief"
 			],
 			"quantity": 1,
-			"value": 210,
-			"weight": "6 lb",
-			"weapons": [
+			"value": 200,
+			"weight": "10 lb",
+			"features": [
 				{
-					"id": "e47e9242-4080-4d3a-8a3f-62b7e9fc07d1",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+3"
+					"type": "skill_bonus",
+					"selection_type": "skills_with_name",
+					"name": {
+						"compare": "is",
+						"qualifier": "Disguise"
 					},
-					"strength": "11†",
-					"accuracy": "4",
-					"range": "220/275",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "220/275",
-						"damage": "1d+3 imp"
-					}
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 210,
-				"extended_weight": "6 lb"
+				"extended_value": 200,
+				"extended_weight": "10 lb"
 			}
 		},
 		{
-			"id": "1c9f6290-f20a-4fa7-9101-f312f07f57a2",
+			"id": "5b14cd88-ed0a-4988-bcc5-fc1c64f9b624",
 			"type": "equipment",
-			"description": "Crossbow (ST12)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Double Mail Hauberk",
+			"reference": "B283",
+			"notes": "Flexible",
+			"tech_level": "3",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Body Armor"
 			],
 			"quantity": 1,
-			"value": 225,
-			"weight": "6 lb",
-			"weapons": [
+			"value": 520,
+			"weight": "44 lb",
+			"features": [
 				{
-					"id": "c638b42b-cb43-4e99-9c4b-69133daf6711",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+3"
-					},
-					"strength": "12†",
-					"accuracy": "4",
-					"range": "240/300",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "240/300",
-						"damage": "1d+3 imp"
-					}
+					"type": "dr_bonus",
+					"location": "torso",
+					"amount": 5
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 5
+				},
+				{
+					"type": "dr_bonus",
+					"location": "groin",
+					"amount": 5
+				},
+				{
+					"type": "dr_bonus",
+					"location": "torso",
+					"specialization": "crushing",
+					"amount": -2
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"specialization": "crushing",
+					"amount": -2
+				},
+				{
+					"type": "dr_bonus",
+					"location": "groin",
+					"specialization": "crushing",
+					"amount": -2
 				}
 			],
 			"calc": {
-				"extended_value": 225,
-				"extended_weight": "6 lb"
+				"extended_value": 520,
+				"extended_weight": "44 lb"
 			}
 		},
 		{
-			"id": "a96c540f-be88-4e76-b504-e04138c48aee",
+			"id": "e40e35cb-17bb-46e7-bd03-e1d72e6898c2",
 			"type": "equipment",
-			"description": "Crossbow (ST13)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Double Shotgun, 10G",
+			"reference": "B279",
+			"tech_level": "5",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 240,
-			"weight": "6 lb",
+			"value": 450,
+			"weight": "10 lb",
 			"weapons": [
 				{
-					"id": "93b45581-45fc-443f-96b1-9c8a001dc7c4",
+					"id": "e77b0b3a-803f-4bd1-8638-4da5d7082143",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d"
+						"type": "pi",
+						"base": "1d+2"
 					},
-					"strength": "13†",
-					"accuracy": "4",
-					"range": "260/325",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "11†",
+					"accuracy": "3",
+					"range": "50/125",
+					"rate_of_fire": "2x9",
+					"shots": "2(3i)",
+					"bulk": "-5",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
@@ -6240,47 +6222,137 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Shotgun"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "260/325",
-						"damage": "2d imp"
+						"range": "50/125",
+						"damage": "1d+2 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 240,
-				"extended_weight": "6 lb"
+				"extended_value": 450,
+				"extended_weight": "10 lb"
 			}
 		},
 		{
-			"id": "cd61311a-edaf-4183-99b3-03656ab24559",
+			"id": "4abf81c4-170d-4395-aa51-ff96e7f3280a",
 			"type": "equipment",
-			"description": "Crossbow (ST14)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Drum",
+			"reference": "B288",
+			"notes": "Audible for several miles",
+			"tech_level": "0",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Communications and Information Gear"
 			],
 			"quantity": 1,
-			"value": 255,
-			"weight": "6 lb",
+			"value": 40,
+			"weight": "2 lb",
+			"calc": {
+				"extended_value": 40,
+				"extended_weight": "2 lb"
+			}
+		},
+		{
+			"id": "43318b08-8e71-4785-93c5-741a72dfbd1d",
+			"type": "equipment",
+			"description": "Ear Muffs",
+			"reference": "B289",
+			"notes": "Block loud noises (e.g. gunshots). Give Protected Hearing.",
+			"tech_level": "6",
+			"tags": [
+				"Weapon and Combat Accessories"
+			],
+			"quantity": 1,
+			"value": 200,
+			"weight": "1 lb",
+			"calc": {
+				"extended_value": 200,
+				"extended_weight": "1 lb"
+			}
+		},
+		{
+			"id": "a89f962a-aad8-4b64-8225-e3ed7667f2a2",
+			"type": "equipment",
+			"description": "Electrolaser Carbine",
+			"reference": "B280",
+			"tech_level": "9",
+			"legality_class": "3",
+			"tags": [
+				"Missile Weapon"
+			],
+			"quantity": 1,
+			"value": 3900,
+			"weight": "3.7 lb",
 			"weapons": [
 				{
-					"id": "5b147c1d-b8ca-4662-8870-335b52a6d108",
+					"id": "2114207e-7dda-490e-8247-84648fe1ff29",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d"
+						"type": "burn",
+						"base": "1d-3"
 					},
-					"strength": "14†",
-					"accuracy": "4",
-					"range": "280/350",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "4†",
+					"accuracy": "8+1",
+					"range": "160/470",
+					"rate_of_fire": "3",
+					"shots": "360(3)",
+					"bulk": "-4",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
@@ -6288,47 +6360,70 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
-						}
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Pistol",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Rifle"
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Projector",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
+						}
 					],
 					"calc": {
-						"range": "280/350",
-						"damage": "2d imp"
+						"range": "160/470",
+						"damage": "1d-3 burn"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 255,
-				"extended_weight": "6 lb"
+				"extended_value": 3900,
+				"extended_weight": "3.7 lb"
 			}
 		},
 		{
-			"id": "f9b53ef3-ef45-41f0-a7bb-0a9272567e7d",
+			"id": "50dd34ba-72e6-45ba-9bdf-12f0bcb86c3e",
 			"type": "equipment",
-			"description": "Crossbow (ST15)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Electrolaser Pistol",
+			"reference": "B280",
+			"tech_level": "9",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 270,
-			"weight": "6 lb",
+			"value": 1800,
+			"weight": "2.2 lb",
 			"weapons": [
 				{
-					"id": "d1d70ea9-3eab-480f-ad9d-07f9740c4ccb",
+					"id": "2451edb0-0ef0-4a42-af9d-d3cf7c3cb532",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d+1"
+						"type": "burn",
+						"base": "1d-3"
 					},
-					"strength": "15†",
+					"strength": "4",
 					"accuracy": "4",
-					"range": "300/375",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"range": "40/80",
+					"rate_of_fire": "3",
+					"shots": "180(3)",
+					"bulk": "-2",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
@@ -6336,588 +6431,561 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Pistol"
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Rifle",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Projector",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "300/375",
-						"damage": "2d+1 imp"
+						"range": "40/80",
+						"damage": "1d-3 burn"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 270,
-				"extended_weight": "6 lb"
+				"extended_value": 1800,
+				"extended_weight": "2.2 lb"
 			}
 		},
 		{
-			"id": "b238c4f1-b0e5-4d43-862a-76841c26f022",
+			"id": "da39446b-ee1e-4928-a5b3-52e30ef95d01",
 			"type": "equipment",
-			"description": "Crossbow (ST16)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Electronic \"Lockpicks\"",
+			"reference": "B289",
+			"notes": "+2 to pick electronic locks",
+			"tech_level": "7",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Law-Enforcement",
+				"Spy Gear",
+				"Thief"
 			],
 			"quantity": 1,
-			"value": 285,
-			"weight": "6 lb",
-			"weapons": [
-				{
-					"id": "c759c221-f7f4-4905-818b-3ca5b9e70e6c",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "2d+1"
-					},
-					"strength": "16†",
-					"accuracy": "4",
-					"range": "320/400",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "320/400",
-						"damage": "2d+1 imp"
-					}
-				}
-			],
+			"value": 1500,
+			"weight": "3 lb",
 			"calc": {
-				"extended_value": 285,
-				"extended_weight": "6 lb"
+				"extended_value": 1500,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "cdf58b1c-b9ac-422a-a8aa-c988147d48dc",
+			"id": "5c78d68d-90ba-4a26-b01c-d866ebd78068",
 			"type": "equipment",
-			"description": "Crossbow (ST17)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Face Mask",
+			"reference": "B284",
+			"tech_level": "3",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Headgear"
 			],
 			"quantity": 1,
-			"value": 300,
-			"weight": "6 lb",
-			"weapons": [
+			"value": 100,
+			"weight": "2 lb",
+			"features": [
 				{
-					"id": "0c4888d9-f8a4-44df-a2a2-45725fa48074",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "2d+2"
-					},
-					"strength": "17†",
-					"accuracy": "4",
-					"range": "340/425",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "340/425",
-						"damage": "2d+2 imp"
-					}
+					"type": "dr_bonus",
+					"location": "face",
+					"amount": 4
 				}
 			],
 			"calc": {
-				"extended_value": 300,
-				"extended_weight": "6 lb"
+				"extended_value": 100,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "39f2d38f-5f7e-4867-ba5a-0e9ec5a9e5c3",
+			"id": "1915d027-7c99-4b5e-aa00-41a90f80b344",
 			"type": "equipment",
-			"description": "Crossbow (ST18)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "First Aid Kit",
+			"reference": "B289",
+			"notes": "A complete kit for treating wounds, with bandages, ointments, etc.",
+			"tech_level": "0",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Medical Gear"
 			],
 			"quantity": 1,
-			"value": 315,
-			"weight": "6 lb",
-			"weapons": [
+			"value": 50,
+			"weight": "2 lb",
+			"features": [
 				{
-					"id": "2ad6a7db-4e3a-442e-98a0-76736c880d2a",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "2d+2"
+					"type": "skill_bonus",
+					"selection_type": "skills_with_name",
+					"name": {
+						"compare": "is",
+						"qualifier": "First Aid"
 					},
-					"strength": "18†",
-					"accuracy": "4",
-					"range": "360/450",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "360/450",
-						"damage": "2d+2 imp"
-					}
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 315,
-				"extended_weight": "6 lb"
+				"extended_value": 50,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "c75e41f5-7fe6-43b0-9e09-2715f29a5a01",
+			"id": "1feae9c8-fcbb-4ddb-a03a-f78ace72e1a8",
 			"type": "equipment",
-			"description": "Crossbow (ST19)",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Fishhooks \u0026 Line",
+			"reference": "B288",
+			"tech_level": "0",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 330,
-			"weight": "6 lb",
-			"weapons": [
-				{
-					"id": "f6868899-b8d5-48b2-938a-fef2179790ed",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "2d+3"
-					},
-					"strength": "19†",
-					"accuracy": "4",
-					"range": "380/475",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "380/475",
-						"damage": "2d+3 imp"
-					}
-				}
-			],
+			"value": 50,
+			"weight": "0.01 lb",
 			"calc": {
-				"extended_value": 330,
-				"extended_weight": "6 lb"
+				"extended_value": 50,
+				"extended_weight": "0.01 lb"
 			}
 		},
 		{
-			"id": "b4143e02-27e0-419a-a020-21263ac692e7",
+			"id": "aaef8f66-398e-4187-8eaf-b325a69cddb0",
 			"type": "equipment",
-			"description": "Crossbow (ST20)",
-			"reference": "B276",
+			"description": "Flail",
+			"reference": "B274",
 			"tech_level": "2",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 345,
-			"weight": "6 lb",
+			"value": 100,
+			"weight": "8 lb",
 			"weapons": [
 				{
-					"id": "161d15d4-7c7b-4797-916c-0b8e18c8e915",
-					"type": "ranged_weapon",
+					"id": "1a94f309-2b9e-408b-84a6-2fb25a56ea70",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d+3"
+						"type": "cr",
+						"st": "sw",
+						"base": "4"
 					},
-					"strength": "20†",
-					"accuracy": "4",
-					"range": "400/500",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "13†",
+					"usage": "Swung",
+					"usage_notes": "Attempts to parry this weapon are at -4 and fencing weapons may not parry it at all; attempts to block this weapon are at -2",
+					"reach": "1,2*",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
+							"modifier": -6
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Flail"
+						},
+						{
+							"type": "skill",
+							"name": "Flail",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Kusari",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Two-Handed Axe/Mace",
+							"modifier": -4
 						}
 					],
 					"calc": {
-						"range": "400/500",
-						"damage": "2d+3 imp"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+4 cr"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 345,
-				"extended_weight": "6 lb"
+				"extended_value": 100,
+				"extended_weight": "8 lb"
 			}
 		},
 		{
-			"id": "f11340e0-77c6-47e2-b736-6e1e71e7956b",
+			"id": "f039f6fa-853d-4d54-9fb0-61190c6b5025",
 			"type": "equipment",
-			"description": "Crossbow Bolt",
-			"reference": "B276",
-			"tech_level": "2",
+			"description": "Flak Jacket",
+			"reference": "B284",
+			"tech_level": "6",
+			"legality_class": "3",
 			"tags": [
-				"AmmoType:Bolt",
-				"Ammunition",
-				"Missile Weapon"
+				"Body Armor"
 			],
 			"quantity": 1,
-			"value": 2,
-			"weight": "0.06 lb",
+			"value": 500,
+			"weight": "20 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "torso",
+					"amount": 7
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 7
+				}
+			],
 			"calc": {
-				"extended_value": 2,
-				"extended_weight": "0.06 lb"
+				"extended_value": 500,
+				"extended_weight": "20 lb"
 			}
 		},
 		{
-			"id": "b669205c-4834-4b3f-b440-55ef154fe98c",
+			"id": "b230c032-a3d9-440d-9dc3-472af77746fe",
 			"type": "equipment",
-			"description": "Crowbar, 3'",
-			"reference": "B289",
-			"tech_level": "2",
+			"description": "Flamethrower",
+			"reference": "B281",
+			"tech_level": "6",
+			"legality_class": "1",
 			"tags": [
-				"Melee Weapon",
-				"Missile Weapon",
-				"Tools"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 20,
-			"weight": "3 lb",
+			"value": 1800,
+			"weight": "70 lb",
 			"weapons": [
 				{
-					"id": "5c2d2e95-12cd-45ad-a635-bc07801ce602",
-					"type": "melee_weapon",
+					"id": "5d44001e-0983-49fe-8cfc-6949e1a833d0",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "sw",
-						"base": "2"
+						"type": "burn",
+						"base": "3d"
 					},
-					"strength": "10",
-					"usage": "Swung",
-					"reach": "1",
-					"parry": "0U",
-					"block": "No",
+					"strength": "10†",
+					"accuracy": "-",
+					"range": "50",
+					"rate_of_fire": "Jet",
+					"shots": "10",
+					"bulk": "-8",
+					"recoil": "-",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -6
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Axe/Mace",
-							"modifier": -1
+							"name": "Liquid Projector",
+							"specialization": "Flamethrower"
 						},
 						{
 							"type": "skill",
-							"name": "Flail",
-							"modifier": -5
+							"name": "Liquid Projector",
+							"specialization": "Sprayer",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
+							"name": "Liquid Projector",
+							"specialization": "Squirt Gun",
 							"modifier": -4
-						}
-					],
-					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+2 cr"
-					}
-				},
-				{
-					"id": "7cc7ddf4-b36b-4a54-be59-3182450835ef",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "sw",
-						"base": "2"
-					},
-					"strength": "10",
-					"usage": "Thrown",
-					"accuracy": "1",
-					"range": "x1/x1.5",
-					"rate_of_fire": "1",
-					"shots": "T(1)",
-					"bulk": "-3",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Thrown Weapon",
-							"specialization": "Axe/Mace",
-							"modifier": -1
+							"name": "Liquid Projector",
+							"specialization": "Water Cannon",
+							"modifier": -4
 						}
 					],
 					"calc": {
-						"range": "x1/x1.5",
-						"damage": "sw+2 cr"
+						"range": "50",
+						"damage": "3d burn"
 					}
 				}
 			],
+			"calc": {
+				"extended_value": 1800,
+				"extended_weight": "70 lb"
+			}
+		},
+		{
+			"id": "466aa12b-a191-43ae-8cc0-440d33f3ef9b",
+			"type": "equipment",
+			"description": "Flashlight, Heavy",
+			"reference": "B288",
+			"notes": "30' beam, lasts 5 hours",
+			"tech_level": "6",
+			"tags": [
+				"Camping and Survival Gear"
+			],
+			"quantity": 1,
+			"value": 20,
+			"weight": "1 lb",
 			"calc": {
 				"extended_value": 20,
-				"extended_weight": "3 lb"
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "bbae415e-7ceb-4760-8a70-d904d7989a31",
+			"id": "4056b325-497f-4e70-ad65-b3988ff3a93b",
 			"type": "equipment",
-			"description": "Cutlass",
-			"reference": "B273",
+			"description": "Flashlight, Mini",
+			"reference": "B288",
+			"notes": "15' beam, lasts 1 hour",
+			"tech_level": "7",
+			"tags": [
+				"Camping and Survival Gear"
+			],
+			"quantity": 1,
+			"value": 10,
+			"weight": "0.25 lb",
+			"calc": {
+				"extended_value": 10,
+				"extended_weight": "0.25 lb"
+			}
+		},
+		{
+			"id": "72680450-9d82-41bc-8b82-e61b9ced5d09",
+			"type": "equipment",
+			"description": "Flintlock Musket, .75",
+			"reference": "B279",
 			"tech_level": "4",
 			"tags": [
-				"Melee Weapon"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 300,
-			"weight": "2 lb",
+			"value": 200,
+			"weight": "13 lb",
 			"weapons": [
 				{
-					"id": "53dea8e9-0c33-4ad8-a70f-c9332f0fb9a8",
-					"type": "melee_weapon",
+					"id": "3f28b419-956d-4b05-9f9b-0cf7b82b7709",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cut",
-						"st": "sw"
+						"type": "pi++",
+						"base": "4d"
 					},
-					"strength": "8",
-					"usage": "Swung",
-					"reach": "1",
-					"parry": "0",
-					"block": "No",
+					"strength": "10†",
+					"accuracy": "2",
+					"range": "100/1500",
+					"rate_of_fire": "1",
+					"shots": "1(15)",
+					"bulk": "-6",
+					"recoil": "4",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Shortsword"
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Broadsword",
+							"name": "Guns",
+							"specialization": "Rifle",
 							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Force Sword",
-							"modifier": -4
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Jitte/Sai",
-							"modifier": -3
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Knife",
-							"modifier": -4
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Saber",
+							"name": "Guns",
+							"specialization": "Musket"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Smallsword",
+							"name": "Guns",
+							"specialization": "Gyroc",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Tonfa",
-							"modifier": -3
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Sword!"
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "sw cut"
+						"range": "100/1500",
+						"damage": "4d pi++"
 					}
-				},
+				}
+			],
+			"calc": {
+				"extended_value": 200,
+				"extended_weight": "13 lb"
+			}
+		},
+		{
+			"id": "803dedee-fd24-4f6c-aee4-424694742a94",
+			"type": "equipment",
+			"description": "Flintlock Pistol, .51",
+			"reference": "B278",
+			"tech_level": "4",
+			"legality_class": "3",
+			"tags": [
+				"Missile Weapon"
+			],
+			"quantity": 1,
+			"value": 200,
+			"weight": "3 lb",
+			"weapons": [
 				{
-					"id": "11d7599d-c0cc-401c-a9b4-7e53e3345154",
-					"type": "melee_weapon",
+					"id": "4c12bc04-77d5-4cbf-8f5e-1ab457ef3a22",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"st": "thr"
+						"type": "pi+",
+						"base": "2d-1"
 					},
-					"strength": "8",
-					"usage": "Thrust",
-					"reach": "1",
-					"parry": "0",
-					"block": "No",
+					"strength": "10",
+					"accuracy": "1",
+					"range": "75/450",
+					"rate_of_fire": "1",
+					"shots": "1(20)",
+					"bulk": "-3",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Shortsword"
+							"name": "Guns",
+							"specialization": "Pistol"
 						},
 						{
 							"type": "skill",
-							"name": "Broadsword",
+							"name": "Guns",
+							"specialization": "Rifle",
 							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Force Sword",
-							"modifier": -4
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Jitte/Sai",
-							"modifier": -3
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Knife",
-							"modifier": -4
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Saber",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Smallsword",
+							"name": "Guns",
+							"specialization": "Gyroc",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Tonfa",
-							"modifier": -3
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Sword!"
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "thr imp"
+						"range": "75/450",
+						"damage": "2d-1 pi+"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 300,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "e68b8c36-8cd4-4036-bf5b-925d72124f0f",
-			"type": "equipment",
-			"description": "Cutting Torch",
-			"reference": "B289",
-			"notes": "1d+3(2) burn per second. Each gas bottle gives 30 seconds of cutting. Extra gas bottles are $50, 15 lbs. per bottle.",
-			"tech_level": "6",
-			"tags": [
-				"Tools"
-			],
-			"quantity": 1,
-			"value": 500,
-			"weight": "30 lb",
-			"calc": {
-				"extended_value": 500,
-				"extended_weight": "30 lb"
-			}
-		},
-		{
-			"id": "3fab2a5b-a6f0-4065-b83d-b122b025a9a5",
-			"type": "equipment",
-			"description": "Cutting Torch Gas Bottle",
-			"reference": "B289",
-			"notes": "Extra Gas Bottle",
-			"tech_level": "6",
-			"tags": [
-				"Tools"
-			],
-			"quantity": 1,
-			"value": 50,
-			"weight": "15 lb",
-			"calc": {
-				"extended_value": 50,
-				"extended_weight": "15 lb"
+				"extended_value": 200,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "7492f0b1-3c8f-41b0-8200-43e05c0b52d6",
+			"id": "57a8a938-2f48-4049-9699-25d06145645f",
 			"type": "equipment",
-			"description": "Dagger",
-			"reference": "B272",
-			"tech_level": "1",
+			"description": "Force Shield",
+			"reference": "B287",
+			"tech_level": "^",
+			"legality_class": "3",
 			"tags": [
-				"Melee Weapon",
-				"Missile Weapon"
+				"Shield"
 			],
 			"quantity": 1,
-			"value": 20,
-			"weight": "0.25 lb",
+			"value": 1500,
+			"weight": "0.5 lb",
 			"weapons": [
 				{
-					"id": "7ba39755-8571-43fa-a9af-4d6cc53df929",
+					"id": "4a2e6ef1-0c3c-4c9d-81c9-9cd5a015d30a",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "-1"
+						"type": "cr",
+						"st": "thr"
 					},
-					"strength": "5",
-					"usage": "Thrust",
-					"reach": "C",
-					"parry": "-1",
-					"block": "No",
+					"strength": "0",
+					"usage": "Shield Bash",
+					"reach": "1",
+					"parry": "No",
+					"block": "+0",
 					"defaults": [
 						{
 							"type": "dx",
@@ -6925,319 +6993,195 @@
 						},
 						{
 							"type": "skill",
-							"name": "Knife"
-						},
-						{
-							"type": "skill",
-							"name": "Force Sword",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Main-Gauche",
-							"modifier": -3
+							"name": "Shield",
+							"specialization": "Buckler",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Shortsword",
-							"modifier": -3
+							"name": "Shield",
+							"specialization": "Force Shield"
 						},
 						{
 							"type": "skill",
-							"name": "Sword!"
+							"name": "Shield",
+							"specialization": "Shield",
+							"modifier": -2
 						}
 					],
 					"calc": {
-						"parry": "-1",
-						"block": "No",
-						"damage": "thr-1 imp"
+						"parry": "No",
+						"block": "+0",
+						"damage": "thr cr"
 					}
-				},
+				}
+			],
+			"features": [
 				{
-					"id": "7d6f591f-516a-4cc3-92bf-8971b0537f84",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "-1"
-					},
-					"strength": "5",
-					"usage": "Thrown",
-					"accuracy": "+0",
-					"range": "x0.5/x1",
-					"rate_of_fire": "1",
-					"shots": "T(1)",
-					"bulk": "-1",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Thrown Weapon",
-							"specialization": "Knife"
-						}
-					],
-					"calc": {
-						"range": "x0.5/x1",
-						"damage": "thr-1 imp"
-					}
+					"type": "attribute_bonus",
+					"attribute": "dodge",
+					"amount": 3
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "parry",
+					"amount": 3
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "block",
+					"amount": 3
 				}
 			],
 			"calc": {
-				"extended_value": 20,
-				"extended_weight": "0.25 lb"
+				"extended_value": 1500,
+				"extended_weight": "0.5 lb"
 			}
 		},
 		{
-			"id": "b2e910e2-9a41-4785-af43-1234b7eb0756",
+			"id": "457262c8-152b-48d3-8b95-836c761e8785",
 			"type": "equipment",
-			"description": "Dart Rifle, 11mm",
-			"reference": "B279",
-			"tech_level": "8",
+			"description": "Force Sword",
+			"reference": "B272",
+			"tech_level": "^",
+			"legality_class": "2",
 			"tags": [
-				"Missile Weapon"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 1200,
-			"weight": "6.6 lb",
+			"value": 10000,
+			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "5cf3e96d-71b3-4574-9cba-40e59ffb6562",
-					"type": "ranged_weapon",
+					"id": "42f7d1d8-0d8b-4a96-8184-a8bfa4821a56",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi-",
-						"base": "1d",
-						"armor_divisor": 0.2
+						"type": "burn",
+						"base": "8d",
+						"armor_divisor": 5
 					},
-					"strength": "9†",
-					"accuracy": "5+1",
-					"range": "45/145",
-					"rate_of_fire": "1",
-					"shots": "1(3)",
-					"bulk": "-5",
-					"recoil": "2",
+					"strength": "3",
+					"usage": "Swung",
+					"reach": "1,2",
+					"parry": "0",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -2
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
+							"name": "Broadsword",
+							"modifier": -3
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
+							"name": "Force Sword"
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
+							"name": "Saber",
+							"modifier": -3
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
+							"name": "Shortsword",
+							"modifier": -3
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
+							"name": "Smallsword",
+							"modifier": -3
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
+							"name": "Two-Handed Sword",
+							"modifier": -3
 						},
 						{
 							"type": "skill",
-							"name": "Gun!"
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "45/145",
-						"damage": "1d(0.2) pi-"
+						"parry": "0",
+						"block": "No",
+						"damage": "8d(5) burn"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 1200,
-				"extended_weight": "6.6 lb"
+				"extended_value": 10000,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "ac0bf83b-5d10-459c-89fc-80e184c3f71e",
+			"id": "c809e330-1020-4416-8aed-947cfcec1864",
 			"type": "equipment",
-			"description": "Derringer, .41",
-			"reference": "B278",
-			"tech_level": "5",
-			"legality_class": "3",
+			"description": "Frag Helmet",
+			"reference": "B285",
+			"tech_level": "7",
 			"tags": [
-				"Missile Weapon"
+				"Headgear"
 			],
 			"quantity": 1,
-			"value": 100,
-			"weight": "0.5 lb",
-			"weapons": [
+			"value": 125,
+			"weight": "3 lb",
+			"features": [
 				{
-					"id": "79573800-cafb-4382-995e-6ca1350898f3",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi+",
-						"base": "1d"
-					},
-					"strength": "9",
-					"accuracy": "1",
-					"range": "80/650",
-					"rate_of_fire": "1",
-					"shots": "2(3i)",
-					"bulk": "-1",
-					"recoil": "2",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "80/650",
-						"damage": "1d pi+"
-					}
+					"type": "dr_bonus",
+					"location": "skull",
+					"amount": 5
 				}
 			],
 			"calc": {
-				"extended_value": 100,
-				"extended_weight": "0.5 lb"
+				"extended_value": 125,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "15393964-54e8-452f-9ec4-41f54a40a5fc",
+			"id": "26dc3937-6953-43db-b01c-8fecd44befd4",
 			"type": "equipment",
-			"description": "Disguise Kit",
-			"reference": "B289",
-			"tech_level": "5",
-			"tags": [
-				"Law-Enforcement",
-				"Spy Gear",
-				"Thief"
+			"description": "Frag Helmet Visor",
+			"reference": "B285",
+			"tech_level": "7",
+			"tags": [
+				"Headgear"
 			],
 			"quantity": 1,
-			"value": 200,
-			"weight": "10 lb",
+			"value": 25,
+			"weight": "1.5 lb",
 			"features": [
 				{
-					"type": "skill_bonus",
-					"selection_type": "skills_with_name",
-					"name": {
-						"compare": "is",
-						"qualifier": "Disguise"
-					},
+					"type": "dr_bonus",
+					"location": "face",
+					"amount": 1
+				},
+				{
+					"type": "dr_bonus",
+					"location": "eye",
 					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 200,
-				"extended_weight": "10 lb"
+				"extended_value": 25,
+				"extended_weight": "1.5 lb"
 			}
 		},
 		{
-			"id": "5b14cd88-ed0a-4988-bcc5-fc1c64f9b624",
+			"id": "366a05b5-8749-4f93-a558-577c059c60cb",
 			"type": "equipment",
-			"description": "Double Mail Hauberk",
-			"reference": "B283",
-			"notes": "Flexible",
-			"tech_level": "3",
+			"description": "Frag Vest",
+			"reference": "B284",
+			"tech_level": "7",
 			"legality_class": "3",
 			"tags": [
 				"Body Armor"
 			],
 			"quantity": 1,
-			"value": 520,
-			"weight": "44 lb",
+			"value": 350,
+			"weight": "9 lb",
 			"features": [
 				{
 					"type": "dr_bonus",
@@ -7253,222 +7197,296 @@
 					"type": "dr_bonus",
 					"location": "groin",
 					"amount": 5
-				},
+				}
+			],
+			"calc": {
+				"extended_value": 350,
+				"extended_weight": "9 lb"
+			}
+		},
+		{
+			"id": "72193d3b-4179-4102-aaf1-2e8f67d646c0",
+			"type": "equipment",
+			"description": "Frag Vest Plate Inserts",
+			"reference": "B284",
+			"tech_level": "7",
+			"legality_class": "3",
+			"tags": [
+				"Body Armor"
+			],
+			"quantity": 1,
+			"value": 300,
+			"weight": "15 lb",
+			"features": [
 				{
 					"type": "dr_bonus",
 					"location": "torso",
-					"specialization": "crushing",
-					"amount": -2
+					"amount": 20
 				},
 				{
 					"type": "dr_bonus",
 					"location": "vitals",
-					"specialization": "crushing",
-					"amount": -2
-				},
+					"amount": 20
+				}
+			],
+			"calc": {
+				"extended_value": 300,
+				"extended_weight": "15 lb"
+			}
+		},
+		{
+			"id": "f17e1785-1155-432e-acce-0c756c64d9c6",
+			"type": "equipment",
+			"description": "Fur Loincloth",
+			"reference": "B283",
+			"notes": "Flexible, concealable",
+			"tech_level": "0",
+			"tags": [
+				"Body Armor"
+			],
+			"quantity": 1,
+			"value": 10,
+			"features": [
 				{
 					"type": "dr_bonus",
 					"location": "groin",
-					"specialization": "crushing",
-					"amount": -2
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 520,
-				"extended_weight": "44 lb"
+				"extended_value": 10,
+				"extended_weight": "0 lb"
 			}
 		},
 		{
-			"id": "e40e35cb-17bb-46e7-bd03-e1d72e6898c2",
+			"id": "e98907d1-57cd-4199-b5c0-6082f612207d",
 			"type": "equipment",
-			"description": "Double Shotgun, 10G",
-			"reference": "B279",
-			"tech_level": "5",
+			"description": "Fur Tunic",
+			"reference": "B283",
+			"notes": "Flexible, concealable",
+			"tech_level": "0",
 			"tags": [
-				"Missile Weapon"
+				"Body Armor"
 			],
 			"quantity": 1,
-			"value": 450,
-			"weight": "10 lb",
+			"value": 25,
+			"weight": "2 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "torso",
+					"amount": 1
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 1
+				}
+			],
+			"calc": {
+				"extended_value": 25,
+				"extended_weight": "2 lb"
+			}
+		},
+		{
+			"id": "397815ec-a745-4e64-9893-67f161d21c58",
+			"type": "equipment",
+			"description": "Garrote",
+			"reference": "B272",
+			"tech_level": "0",
+			"tags": [
+				"Melee Weapon"
+			],
+			"quantity": 1,
+			"value": 2,
+			"weight": "0.01 lb",
 			"weapons": [
 				{
-					"id": "e77b0b3a-803f-4bd1-8638-4da5d7082143",
-					"type": "ranged_weapon",
+					"id": "3b235275-02d7-4429-b5b8-0a3efd9e1f85",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "1d+2"
+						"type": "see B405"
 					},
-					"strength": "11†",
-					"accuracy": "3",
-					"range": "50/125",
-					"rate_of_fire": "2x9",
-					"shots": "2(3i)",
-					"bulk": "-5",
-					"recoil": "1",
+					"reach": "C",
+					"parry": "No",
+					"block": "No",
 					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
-						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
+							"name": "Garrote"
 						},
 						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
+							"type": "dx",
 							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "50/125",
-						"damage": "1d+2 pi"
+						"parry": "No",
+						"block": "No",
+						"damage": "see B405"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 450,
-				"extended_weight": "10 lb"
+				"extended_value": 2,
+				"extended_weight": "0.01 lb"
 			}
 		},
 		{
-			"id": "4abf81c4-170d-4395-aa51-ff96e7f3280a",
+			"id": "890a526d-696b-43c8-9d37-79aae8578b62",
 			"type": "equipment",
-			"description": "Drum",
-			"reference": "B288",
-			"notes": "Audible for several miles",
-			"tech_level": "0",
+			"description": "Gas Mask",
+			"reference": "B285",
+			"tech_level": "6",
 			"tags": [
-				"Communications and Information Gear"
+				"Headgear"
 			],
 			"quantity": 1,
-			"value": 40,
-			"weight": "2 lb",
+			"value": 100,
+			"weight": "4 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "face",
+					"amount": 2
+				},
+				{
+					"type": "dr_bonus",
+					"location": "eye",
+					"amount": 2
+				}
+			],
 			"calc": {
-				"extended_value": 40,
-				"extended_weight": "2 lb"
+				"extended_value": 100,
+				"extended_weight": "4 lb"
 			}
 		},
 		{
-			"id": "43318b08-8e71-4785-93c5-741a72dfbd1d",
+			"id": "403acf05-17ac-4621-a515-beec456a6494",
 			"type": "equipment",
-			"description": "Ear Muffs",
-			"reference": "B289",
-			"notes": "Block loud noises (e.g. gunshots). Give Protected Hearing.",
+			"description": "Gasoline, 1 Gallon",
+			"reference": "B288",
 			"tech_level": "6",
 			"tags": [
-				"Weapon and Combat Accessories"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 200,
-			"weight": "1 lb",
+			"value": 2,
+			"weight": "6 lb",
 			"calc": {
-				"extended_value": 200,
-				"extended_weight": "1 lb"
+				"extended_value": 2,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "a89f962a-aad8-4b64-8225-e3ed7667f2a2",
+			"id": "974a75e0-d127-489a-a506-4d0eb7c93609",
 			"type": "equipment",
-			"description": "Electrolaser Carbine",
-			"reference": "B280",
-			"tech_level": "9",
-			"legality_class": "3",
+			"description": "Gauntlets",
+			"reference": "B284",
+			"tech_level": "2",
+			"tags": [
+				"Gloves"
+			],
+			"quantity": 1,
+			"value": 100,
+			"weight": "2 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "hand",
+					"amount": 4
+				}
+			],
+			"calc": {
+				"extended_value": 100,
+				"extended_weight": "2 lb"
+			}
+		},
+		{
+			"id": "1ab1d0b8-2006-45c3-adbf-aff292fb0c0b",
+			"type": "equipment",
+			"description": "Gauss PDW, 4mm",
+			"reference": "B278",
+			"tech_level": "10",
+			"legality_class": "2",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 3900,
-			"weight": "3.7 lb",
+			"value": 3600,
+			"weight": "4.6 lb",
 			"weapons": [
 				{
-					"id": "2114207e-7dda-490e-8247-84648fe1ff29",
+					"id": "11a91e2c-8751-4ca8-983a-b636011da0fc",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "burn",
-						"base": "1d-3"
+						"type": "pi-",
+						"base": "4d",
+						"armor_divisor": 3
 					},
-					"strength": "4†",
-					"accuracy": "8+1",
-					"range": "160/470",
-					"rate_of_fire": "3",
-					"shots": "360(3)",
-					"bulk": "-4",
-					"recoil": "1",
+					"strength": "9†",
+					"accuracy": "6+1",
+					"range": "700/2900",
+					"rate_of_fire": "16",
+					"shots": "80(3)",
+					"bulk": "-3",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
 							"modifier": -4
 						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -2
+						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Rifle",
-							"modifier": -4
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Pistol",
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Rifle"
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Projector",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
 							"modifier": -4
 						},
 						{
@@ -7477,43 +7495,45 @@
 						}
 					],
 					"calc": {
-						"range": "160/470",
-						"damage": "1d-3 burn"
+						"range": "700/2900",
+						"damage": "4d(3) pi-"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 3900,
-				"extended_weight": "3.7 lb"
+				"extended_value": 3600,
+				"extended_weight": "4.6 lb"
 			}
 		},
 		{
-			"id": "50dd34ba-72e6-45ba-9bdf-12f0bcb86c3e",
+			"id": "b82c5e28-c9ff-46fd-81f5-122f60048baf",
 			"type": "equipment",
-			"description": "Electrolaser Pistol",
-			"reference": "B280",
-			"tech_level": "9",
+			"description": "Gauss Rifle, 4mm",
+			"reference": "B279",
+			"tech_level": "10",
+			"legality_class": "2",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 1800,
-			"weight": "2.2 lb",
+			"value": 7100,
+			"weight": "8.5 lb",
 			"weapons": [
 				{
-					"id": "2451edb0-0ef0-4a42-af9d-d3cf7c3cb532",
+					"id": "d0cf83c0-099f-4195-87e3-73effba5eb55",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "burn",
-						"base": "1d-3"
+						"type": "pi-",
+						"base": "6d+2",
+						"armor_divisor": 3
 					},
-					"strength": "4",
-					"accuracy": "4",
-					"range": "40/80",
-					"rate_of_fire": "3",
-					"shots": "180(3)",
-					"bulk": "-2",
-					"recoil": "1",
+					"strength": "10†",
+					"accuracy": "7+2",
+					"range": "1200/4800",
+					"rate_of_fire": "12",
+					"shots": "60(3)",
+					"bulk": "-4",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
@@ -7523,23 +7543,53 @@
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Pistol",
-							"modifier": -4
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Pistol"
+							"name": "Guns",
+							"specialization": "Rifle"
 						},
 						{
 							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Rifle",
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Projector",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
 							"modifier": -4
 						},
 						{
@@ -7548,113 +7598,182 @@
 						}
 					],
 					"calc": {
-						"range": "40/80",
-						"damage": "1d-3 burn"
+						"range": "1200/4800",
+						"damage": "6d+2(3) pi-"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 1800,
-				"extended_weight": "2.2 lb"
-			}
-		},
-		{
-			"id": "da39446b-ee1e-4928-a5b3-52e30ef95d01",
-			"type": "equipment",
-			"description": "Electronic \"Lockpicks\"",
-			"reference": "B289",
-			"notes": "+2 to pick electronic locks",
-			"tech_level": "7",
-			"tags": [
-				"Law-Enforcement",
-				"Spy Gear",
-				"Thief"
-			],
-			"quantity": 1,
-			"value": 1500,
-			"weight": "3 lb",
-			"calc": {
-				"extended_value": 1500,
-				"extended_weight": "3 lb"
+				"extended_value": 7100,
+				"extended_weight": "8.5 lb"
 			}
 		},
 		{
-			"id": "5c78d68d-90ba-4a26-b01c-d866ebd78068",
+			"id": "daf7a0f6-7380-41ef-8220-b9a9746dbb63",
 			"type": "equipment",
-			"description": "Face Mask",
-			"reference": "B284",
-			"tech_level": "3",
-			"legality_class": "3",
+			"description": "Glaive",
+			"reference": "B272",
+			"tech_level": "1",
 			"tags": [
-				"Headgear"
+				"Melee Weapon"
 			],
 			"quantity": 1,
 			"value": 100,
-			"weight": "2 lb",
-			"features": [
+			"weight": "8 lb",
+			"weapons": [
 				{
-					"type": "dr_bonus",
-					"location": "face",
-					"amount": 4
-				}
-			],
-			"calc": {
-				"extended_value": 100,
-				"extended_weight": "2 lb"
+					"id": "d4787849-063d-41b8-a17e-b8b5252b4fc5",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "cut",
+						"st": "sw",
+						"base": "3"
+					},
+					"strength": "11‡",
+					"usage": "Swung",
+					"reach": "2,3*",
+					"parry": "0U",
+					"block": "No",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Polearm"
+						},
+						{
+							"type": "skill",
+							"name": "Spear",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Staff",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Axe/Mace",
+							"modifier": -4
+						}
+					],
+					"calc": {
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+3 cut"
+					}
+				},
+				{
+					"id": "9d652e3f-053f-4662-9ef9-4d35b1ef88a2",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "imp",
+						"st": "thr",
+						"base": "3"
+					},
+					"strength": "11†",
+					"usage": "Thrust",
+					"reach": "1-3*",
+					"parry": "0U",
+					"block": "No",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Polearm"
+						},
+						{
+							"type": "skill",
+							"name": "Spear",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Staff",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Axe/Mace",
+							"modifier": -4
+						}
+					],
+					"calc": {
+						"parry": "0U",
+						"block": "No",
+						"damage": "thr+3 imp"
+					}
+				}
+			],
+			"calc": {
+				"extended_value": 100,
+				"extended_weight": "8 lb"
 			}
 		},
 		{
-			"id": "1915d027-7c99-4b5e-aa00-41a90f80b344",
+			"id": "e1abfe2e-46cd-474c-b9c1-576137b472a5",
 			"type": "equipment",
-			"description": "First Aid Kit",
-			"reference": "B289",
-			"notes": "A complete kit for treating wounds, with bandages, ointments, etc.",
-			"tech_level": "0",
+			"description": "Gold Coin",
+			"reference": "B264",
+			"tech_level": "1",
 			"tags": [
-				"Medical Gear"
+				"Money: GURPS Standard Medieval Coins"
 			],
 			"quantity": 1,
-			"value": 50,
-			"weight": "2 lb",
-			"features": [
-				{
-					"type": "skill_bonus",
-					"selection_type": "skills_with_name",
-					"name": {
-						"compare": "is",
-						"qualifier": "First Aid"
-					},
-					"amount": 1
-				}
+			"value": 80,
+			"weight": "0.004 lb",
+			"calc": {
+				"extended_value": 80,
+				"extended_weight": "0.004 lb"
+			}
+		},
+		{
+			"id": "83b15a74-a3d2-4b68-bf2d-994a1fe94738",
+			"type": "equipment",
+			"description": "GPS Receiver",
+			"reference": "B288",
+			"notes": "Satellite-updated, lasts 24 hours; Grants Absolute Direction (Requires Signal)",
+			"tech_level": "8",
+			"tags": [
+				"Camping and Survival Gear"
 			],
+			"quantity": 1,
+			"value": 200,
+			"weight": "3 lb",
 			"calc": {
-				"extended_value": 50,
-				"extended_weight": "2 lb"
+				"extended_value": 200,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "1feae9c8-fcbb-4ddb-a03a-f78ace72e1a8",
+			"id": "1701969e-275b-4f13-a7b5-cf5c44aadda9",
 			"type": "equipment",
-			"description": "Fishhooks \u0026 Line",
+			"description": "Grapnel",
 			"reference": "B288",
-			"tech_level": "0",
+			"notes": "Supports 300 lbs; throw to STx2 yards",
+			"tech_level": "5",
 			"tags": [
 				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 50,
-			"weight": "0.01 lb",
+			"value": 20,
+			"weight": "2 lb",
 			"calc": {
-				"extended_value": 50,
-				"extended_weight": "0.01 lb"
+				"extended_value": 20,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "aaef8f66-398e-4187-8eaf-b325a69cddb0",
+			"id": "945b83ab-9dfb-4e64-bb9a-8bb8fcd1b8da",
 			"type": "equipment",
-			"description": "Flail",
+			"description": "Great Axe",
 			"reference": "B274",
-			"tech_level": "2",
+			"tech_level": "1",
 			"tags": [
 				"Melee Weapon"
 			],
@@ -7663,48 +7782,47 @@
 			"weight": "8 lb",
 			"weapons": [
 				{
-					"id": "1a94f309-2b9e-408b-84a6-2fb25a56ea70",
+					"id": "f6860129-d553-43d0-a82a-3bae8210a992",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cr",
+						"type": "cut",
 						"st": "sw",
-						"base": "4"
+						"base": "3"
 					},
-					"strength": "13†",
+					"strength": "12‡",
 					"usage": "Swung",
-					"usage_notes": "Attempts to parry this weapon are at -4 and fencing weapons may not parry it at all; attempts to block this weapon are at -2",
 					"reach": "1,2*",
 					"parry": "0U",
 					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -6
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Flail"
+							"name": "Two-Handed Axe/Mace"
 						},
 						{
 							"type": "skill",
-							"name": "Flail",
+							"name": "Axe/Mace",
 							"modifier": -3
 						},
 						{
 							"type": "skill",
-							"name": "Kusari",
+							"name": "Polearm",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
+							"name": "Two-Handed Flail",
 							"modifier": -4
 						}
 					],
 					"calc": {
 						"parry": "0U",
 						"block": "No",
-						"damage": "sw+4 cr"
+						"damage": "sw+3 cut"
 					}
 				}
 			],
@@ -7714,166 +7832,192 @@
 			}
 		},
 		{
-			"id": "f039f6fa-853d-4d54-9fb0-61190c6b5025",
+			"id": "99a808a1-d157-4052-9647-03ef5dc55ead",
 			"type": "equipment",
-			"description": "Flak Jacket",
+			"description": "Greathelm",
 			"reference": "B284",
-			"tech_level": "6",
+			"notes": "No peripheral vision",
+			"tech_level": "3",
 			"legality_class": "3",
 			"tags": [
-				"Body Armor"
+				"Headgear"
 			],
 			"quantity": 1,
-			"value": 500,
-			"weight": "20 lb",
+			"value": 340,
+			"weight": "10 lb",
 			"features": [
 				{
 					"type": "dr_bonus",
-					"location": "torso",
+					"location": "neck",
 					"amount": 7
 				},
 				{
 					"type": "dr_bonus",
-					"location": "vitals",
+					"location": "face",
+					"amount": 7
+				},
+				{
+					"type": "dr_bonus",
+					"location": "skull",
 					"amount": 7
 				}
 			],
 			"calc": {
-				"extended_value": 500,
-				"extended_weight": "20 lb"
+				"extended_value": 340,
+				"extended_weight": "10 lb"
 			}
 		},
 		{
-			"id": "b230c032-a3d9-440d-9dc3-472af77746fe",
+			"id": "6f8e7dc2-81c9-4a7a-ac67-8bd168c241da",
 			"type": "equipment",
-			"description": "Flamethrower",
-			"reference": "B281",
-			"tech_level": "6",
-			"legality_class": "1",
+			"description": "Greatsword",
+			"reference": "B274",
+			"tech_level": "3",
 			"tags": [
-				"Missile Weapon"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 1800,
-			"weight": "70 lb",
+			"value": 800,
+			"weight": "7 lb",
 			"weapons": [
 				{
-					"id": "5d44001e-0983-49fe-8cfc-6949e1a833d0",
-					"type": "ranged_weapon",
+					"id": "1a5fe8c3-5e56-400b-bbbd-94d3489de69d",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "burn",
-						"base": "3d"
+						"type": "cut",
+						"st": "sw",
+						"base": "3"
 					},
-					"strength": "10†",
-					"accuracy": "-",
-					"range": "50",
-					"rate_of_fire": "Jet",
-					"shots": "10",
-					"bulk": "-8",
-					"recoil": "-",
+					"strength": "12†",
+					"usage": "Swung",
+					"reach": "1,2",
+					"parry": "0",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -4
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Liquid Projector",
-							"specialization": "Flamethrower"
+							"name": "Two-Handed Sword"
 						},
 						{
 							"type": "skill",
-							"name": "Liquid Projector",
-							"specialization": "Sprayer",
+							"name": "Broadsword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Liquid Projector",
-							"specialization": "Squirt Gun",
+							"name": "Force Sword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Liquid Projector",
-							"specialization": "Water Cannon",
-							"modifier": -4
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "50",
-						"damage": "3d burn"
+						"parry": "0",
+						"block": "No",
+						"damage": "sw+3 cut"
+					}
+				},
+				{
+					"id": "5ff38cbc-9977-41e9-aaae-ce5928655df1",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "cr",
+						"st": "thr",
+						"base": "2"
+					},
+					"strength": "12†",
+					"usage": "Thrust",
+					"reach": "2",
+					"parry": "0",
+					"block": "No",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Sword"
+						},
+						{
+							"type": "skill",
+							"name": "Broadsword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Force Sword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
+						}
+					],
+					"calc": {
+						"parry": "0",
+						"block": "No",
+						"damage": "thr+2 cr"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 1800,
-				"extended_weight": "70 lb"
-			}
-		},
-		{
-			"id": "466aa12b-a191-43ae-8cc0-440d33f3ef9b",
-			"type": "equipment",
-			"description": "Flashlight, Heavy",
-			"reference": "B288",
-			"notes": "30' beam, lasts 5 hours",
-			"tech_level": "6",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 20,
-			"weight": "1 lb",
-			"calc": {
-				"extended_value": 20,
-				"extended_weight": "1 lb"
+				"extended_value": 800,
+				"extended_weight": "7 lb"
 			}
 		},
 		{
-			"id": "4056b325-497f-4e70-ad65-b3988ff3a93b",
+			"id": "8ef3ab82-c779-45a3-b207-64e54c301479",
 			"type": "equipment",
-			"description": "Flashlight, Mini",
+			"description": "Group Basics",
 			"reference": "B288",
-			"notes": "15' beam, lasts 1 hour",
-			"tech_level": "7",
+			"notes": "Basic equipment for Cooking and Survival skill for a group. Cook pot, rope, hatchet etc., for 3-8 campers.",
+			"tech_level": "0",
 			"tags": [
 				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 10,
-			"weight": "0.25 lb",
+			"value": 50,
+			"weight": "20 lb",
 			"calc": {
-				"extended_value": 10,
-				"extended_weight": "0.25 lb"
+				"extended_value": 50,
+				"extended_weight": "20 lb"
 			}
 		},
 		{
-			"id": "72680450-9d82-41bc-8b82-e61b9ced5d09",
+			"id": "718c0fec-bf5d-41ed-9861-7bac70639bfb",
 			"type": "equipment",
-			"description": "Flintlock Musket, .75",
-			"reference": "B279",
-			"tech_level": "4",
+			"description": "Gyroc Pistol, 15mm",
+			"reference": "B278",
+			"tech_level": "9",
+			"legality_class": "3",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
 			"value": 200,
-			"weight": "13 lb",
+			"weight": "1 lb",
 			"weapons": [
 				{
-					"id": "3f28b419-956d-4b05-9f9b-0cf7b82b7709",
+					"id": "73ffabc4-536a-4f0b-b5c3-c11395eb8332",
 					"type": "ranged_weapon",
 					"damage": {
 						"type": "pi++",
-						"base": "4d"
+						"base": "6d"
 					},
-					"strength": "10†",
-					"accuracy": "2",
-					"range": "100/1500",
-					"rate_of_fire": "1",
-					"shots": "1(15)",
-					"bulk": "-6",
-					"recoil": "4",
+					"strength": "9",
+					"accuracy": "1",
+					"range": "1900",
+					"rate_of_fire": "3",
+					"shots": "4(3i)",
+					"bulk": "-2",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
@@ -7883,36 +8027,37 @@
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Pistol",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Rifle",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Shotgun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Light Machine Gun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Submachine Gun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Musket"
+							"specialization": "Musket",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
@@ -7923,8 +8068,7 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
+							"specialization": "Gyroc"
 						},
 						{
 							"type": "skill",
@@ -7938,589 +8082,588 @@
 						}
 					],
 					"calc": {
-						"range": "100/1500",
-						"damage": "4d pi++"
+						"range": "1900",
+						"damage": "6d pi++"
 					}
 				}
 			],
 			"calc": {
 				"extended_value": 200,
-				"extended_weight": "13 lb"
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "803dedee-fd24-4f6c-aee4-424694742a94",
+			"id": "4b13bd9f-5517-46a0-8a14-c4fd3466d023",
 			"type": "equipment",
-			"description": "Flintlock Pistol, .51",
-			"reference": "B278",
-			"tech_level": "4",
-			"legality_class": "3",
+			"description": "Halberd",
+			"reference": "B272",
+			"tech_level": "3",
 			"tags": [
-				"Missile Weapon"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 200,
-			"weight": "3 lb",
+			"value": 150,
+			"weight": "12 lb",
 			"weapons": [
 				{
-					"id": "4c12bc04-77d5-4cbf-8f5e-1ab457ef3a22",
-					"type": "ranged_weapon",
+					"id": "fea6f598-02c9-4e54-a543-907ea1f54e24",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi+",
-						"base": "2d-1"
+						"type": "cut",
+						"st": "sw",
+						"base": "5"
 					},
-					"strength": "10",
-					"accuracy": "1",
-					"range": "75/450",
-					"rate_of_fire": "1",
-					"shots": "1(20)",
-					"bulk": "-3",
-					"recoil": "2",
+					"strength": "13‡",
+					"usage": "Swung",
+					"reach": "2,3*",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -4
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol"
+							"name": "Polearm"
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -2
+							"name": "Spear",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -2
+							"name": "Staff",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
-						},
+							"name": "Two-Handed Axe/Mace",
+							"modifier": -4
+						}
+					],
+					"calc": {
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+5 cut"
+					}
+				},
+				{
+					"id": "35b7d686-bf2f-4d37-8ae9-17d644968a5f",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "imp (may stick)",
+						"st": "sw",
+						"base": "4"
+					},
+					"strength": "13‡",
+					"usage": "Swung Hook",
+					"reach": "2,3*",
+					"parry": "0U",
+					"block": "No",
+					"defaults": [
 						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
+							"type": "dx",
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
+							"name": "Polearm"
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
+							"name": "Spear",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
+							"name": "Staff",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
+							"name": "Two-Handed Axe/Mace",
 							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "75/450",
-						"damage": "2d-1 pi+"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+4 imp (may stick)"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 200,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "57a8a938-2f48-4049-9699-25d06145645f",
-			"type": "equipment",
-			"description": "Force Shield",
-			"reference": "B287",
-			"tech_level": "^",
-			"legality_class": "3",
-			"tags": [
-				"Shield"
-			],
-			"quantity": 1,
-			"value": 1500,
-			"weight": "0.5 lb",
-			"weapons": [
+				},
 				{
-					"id": "4a2e6ef1-0c3c-4c9d-81c9-9cd5a015d30a",
+					"id": "c4613c7b-7f1e-48da-b5f0-eb562ab2db83",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "thr"
+						"type": "imp",
+						"st": "thr",
+						"base": "3"
 					},
-					"strength": "0",
-					"usage": "Shield Bash",
-					"reach": "1",
-					"parry": "No",
-					"block": "+0",
+					"strength": "12†",
+					"usage": "Thrust",
+					"reach": "1-3*",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -4
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Buckler",
-							"modifier": -2
+							"name": "Polearm"
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Force Shield"
+							"name": "Spear",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Shield",
-							"modifier": -2
+							"name": "Staff",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Axe/Mace",
+							"modifier": -4
 						}
 					],
 					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "thr cr"
+						"parry": "0U",
+						"block": "No",
+						"damage": "thr+3 imp"
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 3
-				}
-			],
 			"calc": {
-				"extended_value": 1500,
-				"extended_weight": "0.5 lb"
+				"extended_value": 150,
+				"extended_weight": "12 lb"
 			}
 		},
 		{
-			"id": "457262c8-152b-48d3-8b95-836c761e8785",
+			"id": "e375d668-bb15-4609-a4d6-74597f882168",
 			"type": "equipment",
-			"description": "Force Sword",
-			"reference": "B272",
-			"tech_level": "^",
+			"description": "Hand Grenade, Black Powder",
+			"reference": "B277",
+			"notes": "Fuse 3-5",
+			"tech_level": "5",
 			"legality_class": "2",
 			"tags": [
-				"Melee Weapon"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 10000,
-			"weight": "2 lb",
+			"value": 5,
+			"weight": "1 lb",
 			"weapons": [
 				{
-					"id": "42f7d1d8-0d8b-4a96-8184-a8bfa4821a56",
-					"type": "melee_weapon",
+					"id": "8a1f8cce-28fe-494a-b918-2c7e1cc9ddc9",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "burn",
-						"base": "8d",
-						"armor_divisor": 5
+						"type": "cr ex",
+						"base": "3d",
+						"fragmentation": "1d",
+						"fragmentation_type": "cut"
 					},
-					"strength": "3",
-					"usage": "Swung",
-					"reach": "1,2",
-					"parry": "0",
-					"block": "No",
+					"accuracy": "0",
+					"range": "x3.5",
+					"rate_of_fire": "1",
+					"shots": "1",
+					"bulk": "0",
+					"recoil": "0",
 					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Force Sword"
-						},
-						{
-							"type": "skill",
-							"name": "Saber",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Shortsword",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Smallsword",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Sword",
-							"modifier": -3
-						},
 						{
 							"type": "skill",
-							"name": "Sword!"
+							"name": "Throwing"
 						}
 					],
 					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "8d(5) burn"
+						"range": "x3.5",
+						"damage": "3d cr ex [1d cut]"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 10000,
-				"extended_weight": "2 lb"
+				"extended_value": 5,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "c809e330-1020-4416-8aed-947cfcec1864",
+			"id": "3e4c76a9-ed21-4880-a1c8-4abdd35550a5",
 			"type": "equipment",
-			"description": "Frag Helmet",
-			"reference": "B285",
+			"description": "Hand Grenade, Chemical",
+			"reference": "B277",
+			"notes": "Fuse 2",
 			"tech_level": "7",
+			"legality_class": "3",
 			"tags": [
-				"Headgear"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 125,
-			"weight": "3 lb",
-			"features": [
+			"value": 10,
+			"weight": "1 lb",
+			"weapons": [
 				{
-					"type": "dr_bonus",
-					"location": "skull",
-					"amount": 5
+					"id": "fc3c462d-a49e-45f1-8d4d-b1367bbf1f71",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "spec. (2 y)"
+					},
+					"accuracy": "0",
+					"range": "x3.5",
+					"rate_of_fire": "1",
+					"shots": "1",
+					"bulk": "0",
+					"recoil": "0",
+					"defaults": [
+						{
+							"type": "skill",
+							"name": "Throwing"
+						}
+					],
+					"calc": {
+						"range": "x3.5",
+						"damage": "spec. (2 y)"
+					}
 				}
 			],
 			"calc": {
-				"extended_value": 125,
-				"extended_weight": "3 lb"
+				"extended_value": 10,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "26dc3937-6953-43db-b01c-8fecd44befd4",
+			"id": "69199f35-eefe-4304-a11f-fe02fea86b34",
 			"type": "equipment",
-			"description": "Frag Helmet Visor",
-			"reference": "B285",
-			"tech_level": "7",
+			"description": "Hand Grenade, Concussion",
+			"reference": "B277",
+			"notes": "Fuse 4",
+			"tech_level": "6",
+			"legality_class": "2",
 			"tags": [
-				"Headgear"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 25,
-			"weight": "1.5 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "face",
-					"amount": 1
-				},
+			"value": 15,
+			"weight": "1 lb",
+			"weapons": [
 				{
-					"type": "dr_bonus",
-					"location": "eye",
-					"amount": 1
+					"id": "680b046f-bbfa-4c30-a01e-f024b07feffe",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "cr ex",
+						"base": "6d"
+					},
+					"accuracy": "0",
+					"range": "x3.5",
+					"rate_of_fire": "1",
+					"shots": "1",
+					"bulk": "0",
+					"recoil": "0",
+					"defaults": [
+						{
+							"type": "skill",
+							"name": "Throwing"
+						}
+					],
+					"calc": {
+						"range": "x3.5",
+						"damage": "6d cr ex"
+					}
 				}
 			],
 			"calc": {
-				"extended_value": 25,
-				"extended_weight": "1.5 lb"
+				"extended_value": 15,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "366a05b5-8749-4f93-a558-577c059c60cb",
+			"id": "9ca04dea-8be3-48e7-889b-eee2e67e7b76",
 			"type": "equipment",
-			"description": "Frag Vest",
-			"reference": "B284",
-			"tech_level": "7",
-			"legality_class": "3",
+			"description": "Hand Grenade, Concussion",
+			"reference": "B277",
+			"notes": "Fuse 4",
+			"tech_level": "7",
+			"legality_class": "2",
 			"tags": [
-				"Body Armor"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 350,
-			"weight": "9 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 5
-				},
-				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 5
-				},
+			"value": 40,
+			"weight": "1 lb",
+			"weapons": [
 				{
-					"type": "dr_bonus",
-					"location": "groin",
-					"amount": 5
+					"id": "4f8f2372-6b0d-470e-b469-062af06ba1bd",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "cr",
+						"base": "5dx2"
+					},
+					"accuracy": "0",
+					"range": "x3.5",
+					"rate_of_fire": "1",
+					"shots": "1",
+					"bulk": "0",
+					"recoil": "0",
+					"defaults": [
+						{
+							"type": "skill",
+							"name": "Throwing"
+						}
+					],
+					"calc": {
+						"range": "x3.5",
+						"damage": "5dx2 cr"
+					}
 				}
 			],
 			"calc": {
-				"extended_value": 350,
-				"extended_weight": "9 lb"
+				"extended_value": 40,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "72193d3b-4179-4102-aaf1-2e8f67d646c0",
+			"id": "03cc05c3-6fe8-4f71-a414-7e1839dcb882",
 			"type": "equipment",
-			"description": "Frag Vest Plate Inserts",
-			"reference": "B284",
-			"tech_level": "7",
-			"legality_class": "3",
+			"description": "Hand Grenade, Fragmentation",
+			"reference": "B277",
+			"notes": "Fuse 4",
+			"tech_level": "6",
+			"legality_class": "2",
 			"tags": [
-				"Body Armor"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 300,
-			"weight": "15 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 20
-				},
+			"value": 10,
+			"weight": "1 lb",
+			"weapons": [
 				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 20
+					"id": "9f0c48cd-ec23-4e42-89c7-28f99b25c814",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "cr ex",
+						"base": "4d",
+						"fragmentation": "2d",
+						"fragmentation_type": "cut"
+					},
+					"accuracy": "0",
+					"range": "x3.5",
+					"rate_of_fire": "1",
+					"shots": "1",
+					"bulk": "0",
+					"recoil": "0",
+					"defaults": [
+						{
+							"type": "skill",
+							"name": "Throwing"
+						}
+					],
+					"calc": {
+						"range": "x3.5",
+						"damage": "4d cr ex [2d cut]"
+					}
 				}
 			],
 			"calc": {
-				"extended_value": 300,
-				"extended_weight": "15 lb"
+				"extended_value": 10,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "f17e1785-1155-432e-acce-0c756c64d9c6",
+			"id": "4f3df2a3-0d47-4ca2-b310-34152c1a9386",
 			"type": "equipment",
-			"description": "Fur Loincloth",
-			"reference": "B283",
-			"notes": "Flexible, concealable",
-			"tech_level": "0",
+			"description": "Hand Grenade, Fragmentation",
+			"reference": "B277",
+			"notes": "Fuse 4",
+			"tech_level": "7",
+			"legality_class": "2",
 			"tags": [
-				"Body Armor"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 10,
-			"features": [
+			"value": 40,
+			"weight": "1 lb",
+			"weapons": [
 				{
-					"type": "dr_bonus",
-					"location": "groin",
-					"amount": 1
+					"id": "b7e5b362-ff41-4d39-8c93-17edd079d231",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "cr ex",
+						"base": "8d",
+						"fragmentation": "3d",
+						"fragmentation_type": "cut"
+					},
+					"accuracy": "0",
+					"range": "x3.5",
+					"rate_of_fire": "1",
+					"shots": "1",
+					"bulk": "0",
+					"recoil": "0",
+					"defaults": [
+						{
+							"type": "skill",
+							"name": "Throwing"
+						}
+					],
+					"calc": {
+						"range": "x3.5",
+						"damage": "8d cr ex [3d cut]"
+					}
 				}
 			],
 			"calc": {
-				"extended_value": 10,
-				"extended_weight": "0 lb"
+				"extended_value": 40,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "e98907d1-57cd-4199-b5c0-6082f612207d",
+			"id": "b7313471-48a6-4659-98db-3e7a15043150",
 			"type": "equipment",
-			"description": "Fur Tunic",
-			"reference": "B283",
-			"notes": "Flexible, concealable",
-			"tech_level": "0",
+			"description": "Hand Grenade, Plasma",
+			"reference": "B277",
+			"notes": "Fuse 2",
+			"tech_level": "^",
+			"legality_class": "1",
 			"tags": [
-				"Body Armor"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 25,
-			"weight": "2 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 1
-				},
+			"value": 100,
+			"weight": "1 lb",
+			"weapons": [
 				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 1
+					"id": "023a3807-290b-40fd-9628-95458e1e4330",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "burn ex",
+						"base": "6dx4"
+					},
+					"accuracy": "0",
+					"range": "x3.5",
+					"rate_of_fire": "1",
+					"shots": "1",
+					"bulk": "0",
+					"recoil": "0",
+					"defaults": [
+						{
+							"type": "skill",
+							"name": "Throwing"
+						}
+					],
+					"calc": {
+						"range": "x3.5",
+						"damage": "6dx4 burn ex"
+					}
 				}
 			],
 			"calc": {
-				"extended_value": 25,
-				"extended_weight": "2 lb"
+				"extended_value": 100,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "397815ec-a745-4e64-9893-67f161d21c58",
+			"id": "005304c8-5f8d-4976-ba52-db456785f77f",
 			"type": "equipment",
-			"description": "Garrote",
-			"reference": "B272",
-			"tech_level": "0",
+			"description": "Hand Grenade, Stun",
+			"reference": "B277",
+			"notes": "Fuse 2",
+			"tech_level": "8",
+			"legality_class": "2",
 			"tags": [
-				"Melee Weapon"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 2,
-			"weight": "0.01 lb",
+			"value": 40,
+			"weight": "1 lb",
 			"weapons": [
 				{
-					"id": "3b235275-02d7-4429-b5b8-0a3efd9e1f85",
-					"type": "melee_weapon",
+					"id": "974ad68b-1d71-4902-a707-bf3144822c48",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "see B405"
+						"type": ""
 					},
-					"reach": "C",
-					"parry": "No",
-					"block": "No",
+					"accuracy": "0",
+					"range": "x3.5",
+					"rate_of_fire": "1",
+					"shots": "1",
+					"bulk": "0",
+					"recoil": "0",
 					"defaults": [
 						{
 							"type": "skill",
-							"name": "Garrote"
-						},
-						{
-							"type": "dx",
-							"modifier": -4
+							"name": "Throwing"
 						}
 					],
 					"calc": {
-						"parry": "No",
-						"block": "No",
-						"damage": "see B405"
+						"range": "x3.5"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 2,
-				"extended_weight": "0.01 lb"
+				"extended_value": 40,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "890a526d-696b-43c8-9d37-79aae8578b62",
-			"type": "equipment",
-			"description": "Gas Mask",
-			"reference": "B285",
-			"tech_level": "6",
-			"tags": [
-				"Headgear"
-			],
-			"quantity": 1,
-			"value": 100,
-			"weight": "4 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "face",
-					"amount": 2
-				},
-				{
-					"type": "dr_bonus",
-					"location": "eye",
-					"amount": 2
-				}
-			],
-			"calc": {
-				"extended_value": 100,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "403acf05-17ac-4621-a515-beec456a6494",
-			"type": "equipment",
-			"description": "Gasoline, 1 Gallon",
-			"reference": "B288",
-			"tech_level": "6",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 2,
-			"weight": "6 lb",
-			"calc": {
-				"extended_value": 2,
-				"extended_weight": "6 lb"
-			}
-		},
-		{
-			"id": "974a75e0-d127-489a-a506-4d0eb7c93609",
+			"id": "3255ab33-bff0-43af-9728-5ca1daf48896",
 			"type": "equipment",
-			"description": "Gauntlets",
-			"reference": "B284",
-			"tech_level": "2",
+			"description": "Handcuffs",
+			"reference": "B289",
+			"tech_level": "5",
 			"tags": [
-				"Gloves"
+				"Law-Enforcement",
+				"Spy Gear",
+				"Thief"
 			],
 			"quantity": 1,
-			"value": 100,
-			"weight": "2 lb",
+			"value": 40,
+			"weight": "0.5 lb",
 			"features": [
 				{
-					"type": "dr_bonus",
-					"location": "hand",
-					"amount": 4
+					"type": "skill_bonus",
+					"selection_type": "skills_with_name",
+					"name": {
+						"compare": "is",
+						"qualifier": "Escape"
+					},
+					"amount": -5
 				}
 			],
 			"calc": {
-				"extended_value": 100,
-				"extended_weight": "2 lb"
+				"extended_value": 40,
+				"extended_weight": "0.5 lb"
 			}
 		},
 		{
-			"id": "1ab1d0b8-2006-45c3-adbf-aff292fb0c0b",
+			"id": "5ead9f4e-3b96-46c6-8ee0-3a468a8f04c8",
 			"type": "equipment",
-			"description": "Gauss PDW, 4mm",
-			"reference": "B278",
-			"tech_level": "10",
-			"legality_class": "2",
+			"description": "Handgonne, .90",
+			"reference": "B279",
+			"tech_level": "3",
+			"legality_class": "3",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 3600,
-			"weight": "4.6 lb",
+			"value": 300,
+			"weight": "15 lb",
 			"weapons": [
 				{
-					"id": "11a91e2c-8751-4ca8-983a-b636011da0fc",
+					"id": "6cc3b93e-d443-4973-b727-d8ad87637753",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi-",
-						"base": "4d",
-						"armor_divisor": 3
+						"type": "pi++",
+						"base": "2d"
 					},
-					"strength": "9†",
-					"accuracy": "6+1",
-					"range": "700/2900",
-					"rate_of_fire": "16",
-					"shots": "80(3)",
-					"bulk": "-3",
-					"recoil": "2",
+					"strength": "10†",
+					"accuracy": "0",
+					"range": "100/600",
+					"rate_of_fire": "1",
+					"shots": "1(60)",
+					"bulk": "-6",
+					"recoil": "4",
 					"defaults": [
 						{
 							"type": "dx",
@@ -8553,13 +8696,13 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Submachine Gun"
+							"specialization": "Submachine Gun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
+							"specialization": "Musket"
 						},
 						{
 							"type": "skill",
@@ -8585,144 +8728,97 @@
 						}
 					],
 					"calc": {
-						"range": "700/2900",
-						"damage": "4d(3) pi-"
+						"range": "100/600",
+						"damage": "2d pi++"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 3600,
-				"extended_weight": "4.6 lb"
+				"extended_value": 300,
+				"extended_weight": "15 lb"
 			}
 		},
 		{
-			"id": "b82c5e28-c9ff-46fd-81f5-122f60048baf",
+			"id": "ed89f78f-7c95-49b9-8482-36036c081382",
 			"type": "equipment",
-			"description": "Gauss Rifle, 4mm",
-			"reference": "B279",
-			"tech_level": "10",
-			"legality_class": "2",
+			"description": "Harpoon",
+			"reference": "B276",
+			"tech_level": "2",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 7100,
-			"weight": "8.5 lb",
+			"value": 60,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "d0cf83c0-099f-4195-87e3-73effba5eb55",
+					"id": "26372e88-21ca-4bed-889f-eb88bd88daff",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi-",
-						"base": "6d+2",
-						"armor_divisor": 3
+						"type": "imp",
+						"st": "thr",
+						"base": "5"
 					},
-					"strength": "10†",
-					"accuracy": "7+2",
-					"range": "1200/4800",
-					"rate_of_fire": "12",
-					"shots": "60(3)",
-					"bulk": "-4",
-					"recoil": "2",
+					"strength": "11",
+					"usage": "Thrown",
+					"accuracy": "2",
+					"range": "x1/x1.5",
+					"rate_of_fire": "1",
+					"shots": "T(1)",
+					"bulk": "-6",
 					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
-						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
+							"name": "Thrown Weapon",
+							"specialization": "Harpoon"
 						},
 						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
+							"type": "dx",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Gun!"
+							"name": "Thrown Weapon",
+							"specialization": "Spear",
+							"modifier": -2
 						}
 					],
 					"calc": {
-						"range": "1200/4800",
-						"damage": "6d+2(3) pi-"
+						"range": "x1/x1.5",
+						"damage": "thr+5 imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 7100,
-				"extended_weight": "8.5 lb"
+				"extended_value": 60,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "daf7a0f6-7380-41ef-8220-b9a9746dbb63",
+			"id": "4457ec84-19db-4141-8a8f-20133a3d46be",
 			"type": "equipment",
-			"description": "Glaive",
-			"reference": "B272",
-			"tech_level": "1",
+			"description": "Hatchet",
+			"reference": "B271",
+			"tech_level": "0",
 			"tags": [
-				"Melee Weapon"
+				"Melee Weapon",
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 100,
-			"weight": "8 lb",
+			"value": 40,
+			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "d4787849-063d-41b8-a17e-b8b5252b4fc5",
+					"id": "08ef8af2-66fd-46d4-86a0-71132a4f7de4",
 					"type": "melee_weapon",
 					"damage": {
 						"type": "cut",
-						"st": "sw",
-						"base": "3"
+						"st": "sw"
 					},
-					"strength": "11‡",
+					"strength": "8",
 					"usage": "Swung",
-					"reach": "2,3*",
-					"parry": "0U",
+					"reach": "1",
+					"parry": "0",
 					"block": "No",
 					"defaults": [
 						{
@@ -8731,1029 +8827,686 @@
 						},
 						{
 							"type": "skill",
-							"name": "Polearm"
+							"name": "Axe/Mace"
 						},
 						{
 							"type": "skill",
-							"name": "Spear",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Staff",
+							"name": "Flail",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Two-Handed Axe/Mace",
-							"modifier": -4
+							"modifier": -3
 						}
 					],
 					"calc": {
-						"parry": "0U",
+						"parry": "0",
 						"block": "No",
-						"damage": "sw+3 cut"
+						"damage": "sw cut"
 					}
 				},
 				{
-					"id": "9d652e3f-053f-4662-9ef9-4d35b1ef88a2",
-					"type": "melee_weapon",
+					"id": "6715fd49-5971-4590-ab3d-60447807af85",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "3"
+						"type": "cut",
+						"st": "sw"
 					},
-					"strength": "11†",
-					"usage": "Thrust",
-					"reach": "1-3*",
-					"parry": "0U",
-					"block": "No",
+					"strength": "8",
+					"usage": "Thrown",
+					"accuracy": "1",
+					"range": "x1.5/x2.5",
+					"rate_of_fire": "1",
+					"shots": "T(1)",
+					"bulk": "-2",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Polearm"
-						},
-						{
-							"type": "skill",
-							"name": "Spear",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Staff",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
-							"modifier": -4
+							"name": "Thrown Weapon",
+							"specialization": "Axe/Mace"
 						}
 					],
 					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "thr+3 imp"
+						"range": "x1.5/x2.5",
+						"damage": "sw cut"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 100,
-				"extended_weight": "8 lb"
-			}
-		},
-		{
-			"id": "e1abfe2e-46cd-474c-b9c1-576137b472a5",
-			"type": "equipment",
-			"description": "Gold Coin",
-			"reference": "B264",
-			"tech_level": "1",
-			"tags": [
-				"Money: GURPS Standard Medieval Coins"
-			],
-			"quantity": 1,
-			"value": 80,
-			"weight": "0.004 lb",
-			"calc": {
-				"extended_value": 80,
-				"extended_weight": "0.004 lb"
-			}
-		},
-		{
-			"id": "83b15a74-a3d2-4b68-bf2d-994a1fe94738",
-			"type": "equipment",
-			"description": "GPS Receiver",
-			"reference": "B288",
-			"notes": "Satellite-updated, lasts 24 hours; Grants Absolute Direction (Requires Signal)",
-			"tech_level": "8",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 200,
-			"weight": "3 lb",
-			"calc": {
-				"extended_value": 200,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "1701969e-275b-4f13-a7b5-cf5c44aadda9",
-			"type": "equipment",
-			"description": "Grapnel",
-			"reference": "B288",
-			"notes": "Supports 300 lbs; throw to STx2 yards",
-			"tech_level": "5",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 20,
-			"weight": "2 lb",
-			"calc": {
-				"extended_value": 20,
+				"extended_value": 40,
 				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "945b83ab-9dfb-4e64-bb9a-8bb8fcd1b8da",
+			"id": "c3611c98-4352-4b79-a111-3fc961eafa2f",
 			"type": "equipment",
-			"description": "Great Axe",
-			"reference": "B274",
-			"tech_level": "1",
+			"description": "Heavy Blaster",
+			"reference": "B280",
+			"tech_level": "11",
+			"legality_class": "1",
 			"tags": [
-				"Melee Weapon"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 100,
-			"weight": "8 lb",
+			"value": 23000,
+			"weight": "20 lb",
 			"weapons": [
 				{
-					"id": "f6860129-d553-43d0-a82a-3bae8210a992",
-					"type": "melee_weapon",
+					"id": "c3b2955c-6d74-4113-9e6b-13fc8dec34aa",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "3"
+						"type": "burn",
+						"base": "8d",
+						"armor_divisor": 5
 					},
-					"strength": "12‡",
-					"usage": "Swung",
-					"reach": "1,2*",
-					"parry": "0U",
-					"block": "No",
+					"strength": "10†",
+					"accuracy": "10+4",
+					"range": "900/2700",
+					"rate_of_fire": "3",
+					"shots": "90(5)",
+					"bulk": "-6",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace"
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Axe/Mace",
-							"modifier": -3
+							"name": "Beam Weapons",
+							"specialization": "Pistol",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Polearm",
-							"modifier": -4
+							"name": "Beam Weapons",
+							"specialization": "Rifle"
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Flail",
+							"name": "Beam Weapons",
+							"specialization": "Projector",
 							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+3 cut"
+						"range": "900/2700",
+						"damage": "8d(5) burn"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 100,
-				"extended_weight": "8 lb"
-			}
-		},
-		{
-			"id": "99a808a1-d157-4052-9647-03ef5dc55ead",
-			"type": "equipment",
-			"description": "Greathelm",
-			"reference": "B284",
-			"notes": "No peripheral vision",
-			"tech_level": "3",
-			"legality_class": "3",
-			"tags": [
-				"Headgear"
-			],
-			"quantity": 1,
-			"value": 340,
-			"weight": "10 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "neck",
-					"amount": 7
-				},
-				{
-					"type": "dr_bonus",
-					"location": "face",
-					"amount": 7
-				},
-				{
-					"type": "dr_bonus",
-					"location": "skull",
-					"amount": 7
-				}
-			],
-			"calc": {
-				"extended_value": 340,
-				"extended_weight": "10 lb"
+				"extended_value": 23000,
+				"extended_weight": "20 lb"
 			}
 		},
 		{
-			"id": "6f8e7dc2-81c9-4a7a-ac67-8bd168c241da",
+			"id": "50e8e714-f995-42f4-956d-b5d8392bb7cb",
 			"type": "equipment",
-			"description": "Greatsword",
-			"reference": "B274",
-			"tech_level": "3",
+			"description": "Heavy Cloak",
+			"reference": "B287",
+			"tech_level": "1",
 			"tags": [
-				"Melee Weapon"
+				"Clothing"
 			],
 			"quantity": 1,
-			"value": 800,
-			"weight": "7 lb",
+			"value": 50,
+			"weight": "5 lb",
 			"weapons": [
 				{
-					"id": "1a5fe8c3-5e56-400b-bbbd-94d3489de69d",
+					"id": "231361a9-32ee-4e15-9a63-bd611fdb38b3",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "3"
+						"type": "-"
 					},
-					"strength": "12†",
-					"usage": "Swung",
-					"reach": "1,2",
-					"parry": "0",
-					"block": "No",
+					"strength": "-",
+					"reach": "-",
+					"parry": "No",
+					"block": "+0",
 					"defaults": [
 						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Sword"
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Force Sword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Sword!"
+							"type": "block",
+							"name": "Cloak"
 						}
 					],
 					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "sw+3 cut"
+						"parry": "No",
+						"block": "+0",
+						"damage": "-"
 					}
 				},
 				{
-					"id": "5ff38cbc-9977-41e9-aaae-ce5928655df1",
-					"type": "melee_weapon",
+					"id": "b6064b63-8744-42a4-a5bd-14470eee6d92",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "thr",
-						"base": "2"
+						"type": "Special"
 					},
-					"strength": "12†",
-					"usage": "Thrust",
-					"reach": "2",
-					"parry": "0",
-					"block": "No",
+					"strength": "8",
+					"usage": "Thrown",
+					"accuracy": "+1",
+					"range": "2",
+					"rate_of_fire": "1",
+					"shots": "T(1)",
+					"bulk": "-6",
 					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Sword"
+							"name": "Cloak"
 						},
 						{
 							"type": "skill",
-							"name": "Broadsword",
+							"name": "Net",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Force Sword",
+							"name": "Shield",
 							"modifier": -4
 						},
 						{
-							"type": "skill",
-							"name": "Sword!"
+							"type": "dx",
+							"modifier": -5
 						}
 					],
 					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "thr+2 cr"
+						"range": "2",
+						"damage": "Special"
 					}
 				}
 			],
+			"features": [
+				{
+					"type": "attribute_bonus",
+					"attribute": "dodge",
+					"amount": 2
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "parry",
+					"amount": 2
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "block",
+					"amount": 2
+				}
+			],
 			"calc": {
-				"extended_value": 800,
-				"extended_weight": "7 lb"
+				"extended_value": 50,
+				"extended_weight": "5 lb"
 			}
 		},
 		{
-			"id": "8ef3ab82-c779-45a3-b207-64e54c301479",
+			"id": "66febf16-cf94-4a0e-bd0c-4c6a544b41c6",
 			"type": "equipment",
-			"description": "Group Basics",
-			"reference": "B288",
-			"notes": "Basic equipment for Cooking and Survival skill for a group. Cook pot, rope, hatchet etc., for 3-8 campers.",
-			"tech_level": "0",
+			"description": "Heavy Gauntlets",
+			"reference": "B284",
+			"tech_level": "3",
+			"legality_class": "3",
 			"tags": [
-				"Camping and Survival Gear"
+				"Gloves"
 			],
 			"quantity": 1,
-			"value": 50,
-			"weight": "20 lb",
+			"value": 250,
+			"weight": "2.5 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "hand",
+					"amount": 5
+				}
+			],
 			"calc": {
-				"extended_value": 50,
-				"extended_weight": "20 lb"
+				"extended_value": 250,
+				"extended_weight": "2.5 lb"
 			}
 		},
 		{
-			"id": "718c0fec-bf5d-41ed-9861-7bac70639bfb",
+			"id": "9db42bcf-abb3-4f0c-8d87-34afee1f4337",
 			"type": "equipment",
-			"description": "Gyroc Pistol, 15mm",
-			"reference": "B278",
-			"tech_level": "9",
-			"legality_class": "3",
+			"description": "Heavy Leather Leggings",
+			"reference": "B283",
+			"tech_level": "1",
 			"tags": [
-				"Missile Weapon"
+				"Limb Armor"
 			],
 			"quantity": 1,
-			"value": 200,
-			"weight": "1 lb",
-			"weapons": [
+			"value": 60,
+			"weight": "4 lb",
+			"features": [
 				{
-					"id": "73ffabc4-536a-4f0b-b5c3-c11395eb8332",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi++",
-						"base": "6d"
-					},
-					"strength": "9",
-					"accuracy": "1",
-					"range": "1900",
-					"rate_of_fire": "3",
-					"shots": "4(3i)",
-					"bulk": "-2",
-					"recoil": "1",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "1900",
-						"damage": "6d pi++"
-					}
+					"type": "dr_bonus",
+					"location": "leg",
+					"amount": 2
 				}
 			],
 			"calc": {
-				"extended_value": 200,
-				"extended_weight": "1 lb"
+				"extended_value": 60,
+				"extended_weight": "4 lb"
 			}
 		},
 		{
-			"id": "4b13bd9f-5517-46a0-8a14-c4fd3466d023",
+			"id": "6267ead4-b298-497c-90b1-cd670c620ec9",
 			"type": "equipment",
-			"description": "Halberd",
-			"reference": "B272",
+			"description": "Heavy Leather Sleeves",
+			"reference": "B283",
+			"tech_level": "1",
+			"tags": [
+				"Limb Armor"
+			],
+			"quantity": 1,
+			"value": 50,
+			"weight": "2 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "arm",
+					"amount": 2
+				}
+			],
+			"calc": {
+				"extended_value": 50,
+				"extended_weight": "2 lb"
+			}
+		},
+		{
+			"id": "684bc457-8d50-4c54-8b55-11bf11b25141",
+			"type": "equipment",
+			"description": "Heavy Plate Arms",
+			"reference": "B283",
 			"tech_level": "3",
+			"legality_class": "3",
 			"tags": [
-				"Melee Weapon"
+				"Limb Armor"
 			],
 			"quantity": 1,
-			"value": 150,
-			"weight": "12 lb",
-			"weapons": [
+			"value": 1500,
+			"weight": "20 lb",
+			"features": [
 				{
-					"id": "fea6f598-02c9-4e54-a543-907ea1f54e24",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "5"
-					},
-					"strength": "13‡",
-					"usage": "Swung",
-					"reach": "2,3*",
-					"parry": "0U",
-					"block": "No",
+					"type": "dr_bonus",
+					"location": "arm",
+					"amount": 7
+				}
+			],
+			"calc": {
+				"extended_value": 1500,
+				"extended_weight": "20 lb"
+			}
+		},
+		{
+			"id": "90a0ca9a-ef32-499e-a1a4-c344de4db8eb",
+			"type": "equipment",
+			"description": "Heavy Plate Legs",
+			"reference": "B283",
+			"tech_level": "3",
+			"legality_class": "3",
+			"tags": [
+				"Limb Armor"
+			],
+			"quantity": 1,
+			"value": 1600,
+			"weight": "25 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "leg",
+					"amount": 7
+				}
+			],
+			"calc": {
+				"extended_value": 1600,
+				"extended_weight": "25 lb"
+			}
+		},
+		{
+			"id": "113d8e6d-e03c-4391-bf4e-3e009423fcb0",
+			"type": "equipment",
+			"description": "Heavy Steel Corselet",
+			"reference": "B283",
+			"tech_level": "3",
+			"legality_class": "3",
+			"tags": [
+				"Body Armor"
+			],
+			"quantity": 1,
+			"value": 2300,
+			"weight": "45 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "torso",
+					"amount": 7
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 7
+				},
+				{
+					"type": "dr_bonus",
+					"location": "groin",
+					"amount": 7
+				}
+			],
+			"calc": {
+				"extended_value": 2300,
+				"extended_weight": "45 lb"
+			}
+		},
+		{
+			"id": "07b1b097-414f-49da-92a2-4c62ddb3edb3",
+			"type": "equipment_container",
+			"open": true,
+			"description": "Hip Quiver",
+			"reference": "B289",
+			"notes": "Holds 20 arrows or bolts",
+			"tech_level": "0",
+			"tags": [
+				"Weapon and Combat Accessories"
+			],
+			"quantity": 1,
+			"value": 15,
+			"weight": "1 lb",
+			"calc": {
+				"extended_value": 15,
+				"extended_weight": "1 lb"
+			}
+		},
+		{
+			"id": "3c5af91b-05ff-4771-abe0-35a343618b6d",
+			"type": "equipment",
+			"description": "HMG, .50",
+			"reference": "B281",
+			"tech_level": "6",
+			"legality_class": "1",
+			"tags": [
+				"Missile Weapon"
+			],
+			"quantity": 1,
+			"value": 14000,
+			"weight": "116 lb",
+			"weapons": [
+				{
+					"id": "c6db5fc6-1af3-4f22-a792-aebace78b5fb",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "pi+",
+						"base": "13d+1"
+					},
+					"strength": "20M†",
+					"accuracy": "6",
+					"range": "1800/7400",
+					"rate_of_fire": "8!",
+					"shots": "100(5)",
+					"bulk": "-8",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Polearm"
+							"name": "Gunner",
+							"specialization": "Catapult",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Spear",
+							"name": "Gunner",
+							"specialization": "Beams",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Staff",
+							"name": "Gunner",
+							"specialization": "Cannon",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
+							"name": "Gunner",
+							"specialization": "Machine Gun"
+						},
+						{
+							"type": "skill",
+							"name": "Gunner",
+							"specialization": "Rockets",
 							"modifier": -4
 						}
 					],
 					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+5 cut"
+						"range": "1800/7400",
+						"damage": "13d+1 pi+"
 					}
-				},
+				}
+			],
+			"calc": {
+				"extended_value": 14000,
+				"extended_weight": "116 lb"
+			}
+		},
+		{
+			"id": "3bb7afd8-d0cf-433d-bdcb-f6fddd052970",
+			"type": "equipment",
+			"description": "Holdout Pistol, .380",
+			"reference": "B278",
+			"tech_level": "7",
+			"legality_class": "3",
+			"tags": [
+				"Missile Weapon"
+			],
+			"quantity": 1,
+			"value": 300,
+			"weight": "1.3 lb",
+			"weapons": [
 				{
-					"id": "35b7d686-bf2f-4d37-8ae9-17d644968a5f",
-					"type": "melee_weapon",
+					"id": "b478a6f8-a904-435f-9004-abd071548ed5",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp (may stick)",
-						"st": "sw",
-						"base": "4"
+						"type": "pi",
+						"base": "2d"
 					},
-					"strength": "13‡",
-					"usage": "Swung Hook",
-					"reach": "2,3*",
-					"parry": "0U",
-					"block": "No",
+					"strength": "8",
+					"accuracy": "1",
+					"range": "125/1500",
+					"rate_of_fire": "3",
+					"shots": "5+1(3)",
+					"bulk": "-1",
+					"recoil": "3",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Polearm"
+							"name": "Guns",
+							"specialization": "Pistol"
 						},
 						{
 							"type": "skill",
-							"name": "Spear",
-							"modifier": -4
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Staff",
-							"modifier": -4
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
-							"modifier": -4
-						}
-					],
-					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+4 imp (may stick)"
-					}
-				},
-				{
-					"id": "c4613c7b-7f1e-48da-b5f0-eb562ab2db83",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "3"
-					},
-					"strength": "12†",
-					"usage": "Thrust",
-					"reach": "1-3*",
-					"parry": "0U",
-					"block": "No",
-					"defaults": [
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
 						{
-							"type": "dx",
-							"modifier": -5
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Polearm"
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Spear",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Staff",
+							"name": "Guns",
+							"specialization": "Gyroc",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
 							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "thr+3 imp"
+						"range": "125/1500",
+						"damage": "2d pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 150,
-				"extended_weight": "12 lb"
+				"extended_value": 300,
+				"extended_weight": "1.3 lb"
 			}
 		},
 		{
-			"id": "e375d668-bb15-4609-a4d6-74597f882168",
-			"type": "equipment",
-			"description": "Hand Grenade, Black Powder",
-			"reference": "B277",
-			"notes": "Fuse 3-5",
+			"id": "1a0697ae-6be3-4a77-a114-5904d0005ea6",
+			"type": "equipment_container",
+			"open": true,
+			"description": "Holster, Belt",
+			"reference": "B289",
+			"notes": "Fits most pistols",
 			"tech_level": "5",
-			"legality_class": "2",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 5,
-			"weight": "1 lb",
-			"weapons": [
-				{
-					"id": "8a1f8cce-28fe-494a-b918-2c7e1cc9ddc9",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cr ex",
-						"base": "3d",
-						"fragmentation": "1d",
-						"fragmentation_type": "cut"
-					},
-					"accuracy": "0",
-					"range": "x3.5",
-					"rate_of_fire": "1",
-					"shots": "1",
-					"bulk": "0",
-					"recoil": "0",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Throwing"
-						}
-					],
-					"calc": {
-						"range": "x3.5",
-						"damage": "3d cr ex [1d cut]"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 5,
-				"extended_weight": "1 lb"
-			}
-		},
-		{
-			"id": "3e4c76a9-ed21-4880-a1c8-4abdd35550a5",
-			"type": "equipment",
-			"description": "Hand Grenade, Chemical",
-			"reference": "B277",
-			"notes": "Fuse 2",
-			"tech_level": "7",
-			"legality_class": "3",
 			"tags": [
-				"Missile Weapon"
+				"Weapon and Combat Accessories"
 			],
 			"quantity": 1,
-			"value": 10,
-			"weight": "1 lb",
-			"weapons": [
-				{
-					"id": "fc3c462d-a49e-45f1-8d4d-b1367bbf1f71",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "spec. (2 y)"
-					},
-					"accuracy": "0",
-					"range": "x3.5",
-					"rate_of_fire": "1",
-					"shots": "1",
-					"bulk": "0",
-					"recoil": "0",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Throwing"
-						}
-					],
-					"calc": {
-						"range": "x3.5",
-						"damage": "spec. (2 y)"
-					}
-				}
-			],
+			"value": 25,
+			"weight": "0.5 lb",
 			"calc": {
-				"extended_value": 10,
-				"extended_weight": "1 lb"
+				"extended_value": 25,
+				"extended_weight": "0.5 lb"
 			}
 		},
 		{
-			"id": "69199f35-eefe-4304-a11f-fe02fea86b34",
-			"type": "equipment",
-			"description": "Hand Grenade, Concussion",
-			"reference": "B277",
-			"notes": "Fuse 4",
-			"tech_level": "6",
-			"legality_class": "2",
+			"id": "4cd595ae-1191-4ca0-88bf-bd8a3ea9c750",
+			"type": "equipment_container",
+			"open": true,
+			"description": "Holster, Shoulder",
+			"reference": "B289",
+			"notes": "Allows use of Holdout, but gives -1 to Fast-Draw.",
+			"tech_level": "5",
 			"tags": [
-				"Missile Weapon"
+				"Weapon and Combat Accessories"
 			],
 			"quantity": 1,
-			"value": 15,
+			"value": 50,
 			"weight": "1 lb",
-			"weapons": [
-				{
-					"id": "680b046f-bbfa-4c30-a01e-f024b07feffe",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cr ex",
-						"base": "6d"
-					},
-					"accuracy": "0",
-					"range": "x3.5",
-					"rate_of_fire": "1",
-					"shots": "1",
-					"bulk": "0",
-					"recoil": "0",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Throwing"
-						}
-					],
-					"calc": {
-						"range": "x3.5",
-						"damage": "6d cr ex"
-					}
-				}
-			],
 			"calc": {
-				"extended_value": 15,
+				"extended_value": 50,
 				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "9ca04dea-8be3-48e7-889b-eee2e67e7b76",
+			"id": "f5c96d68-c257-423c-8b81-d1b5d710271a",
 			"type": "equipment",
-			"description": "Hand Grenade, Concussion",
-			"reference": "B277",
-			"notes": "Fuse 4",
+			"description": "Homing Beacon",
+			"reference": "B289",
+			"notes": "Scanner tracks at 1-mile range. 12 hrs.",
 			"tech_level": "7",
-			"legality_class": "2",
 			"tags": [
-				"Missile Weapon"
+				"Law-Enforcement",
+				"Spy Gear",
+				"Thief"
 			],
 			"quantity": 1,
 			"value": 40,
-			"weight": "1 lb",
-			"weapons": [
-				{
-					"id": "4f8f2372-6b0d-470e-b469-062af06ba1bd",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cr",
-						"base": "5dx2"
-					},
-					"accuracy": "0",
-					"range": "x3.5",
-					"rate_of_fire": "1",
-					"shots": "1",
-					"bulk": "0",
-					"recoil": "0",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Throwing"
-						}
-					],
-					"calc": {
-						"range": "x3.5",
-						"damage": "5dx2 cr"
-					}
-				}
-			],
 			"calc": {
 				"extended_value": 40,
-				"extended_weight": "1 lb"
+				"extended_weight": "0 lb"
 			}
 		},
 		{
-			"id": "03cc05c3-6fe8-4f71-a414-7e1839dcb882",
+			"id": "8adf841d-4c63-4769-9564-9fbb083b100d",
 			"type": "equipment",
-			"description": "Hand Grenade, Fragmentation",
-			"reference": "B277",
-			"notes": "Fuse 4",
-			"tech_level": "6",
-			"legality_class": "2",
+			"description": "Horseshoes, Set",
+			"reference": "B289",
+			"notes": "Shod horses get +2 HT on any rolls for stamina on long rides",
+			"tech_level": "3",
 			"tags": [
-				"Missile Weapon"
+				"Equestrian Gear"
 			],
 			"quantity": 1,
-			"value": 10,
-			"weight": "1 lb",
-			"weapons": [
-				{
-					"id": "9f0c48cd-ec23-4e42-89c7-28f99b25c814",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cr ex",
-						"base": "4d",
-						"fragmentation": "2d",
-						"fragmentation_type": "cut"
-					},
-					"accuracy": "0",
-					"range": "x3.5",
-					"rate_of_fire": "1",
-					"shots": "1",
-					"bulk": "0",
-					"recoil": "0",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Throwing"
-						}
-					],
-					"calc": {
-						"range": "x3.5",
-						"damage": "4d cr ex [2d cut]"
-					}
-				}
-			],
+			"value": 50,
+			"weight": "4 lb",
 			"calc": {
-				"extended_value": 10,
-				"extended_weight": "1 lb"
+				"extended_value": 50,
+				"extended_weight": "4 lb"
 			}
 		},
 		{
-			"id": "4f3df2a3-0d47-4ca2-b310-34152c1a9386",
+			"id": "59b8a1ae-14f3-4bb2-a001-88b08133cb6b",
 			"type": "equipment",
-			"description": "Hand Grenade, Fragmentation",
-			"reference": "B277",
-			"notes": "Fuse 4",
-			"tech_level": "7",
-			"legality_class": "2",
+			"description": "ICW Integral, 25mm",
+			"reference": "B281",
+			"tech_level": "9",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 40,
-			"weight": "1 lb",
 			"weapons": [
 				{
-					"id": "b7e5b362-ff41-4d39-8c93-17edd079d231",
+					"id": "a5d1de68-891b-411c-b311-ae1d10a5971e",
 					"type": "ranged_weapon",
 					"damage": {
 						"type": "cr ex",
-						"base": "8d",
+						"base": "7d",
 						"fragmentation": "3d",
 						"fragmentation_type": "cut"
 					},
-					"accuracy": "0",
-					"range": "x3.5",
-					"rate_of_fire": "1",
-					"shots": "1",
-					"bulk": "0",
-					"recoil": "0",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Throwing"
-						}
-					],
-					"calc": {
-						"range": "x3.5",
-						"damage": "8d cr ex [3d cut]"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "1 lb"
-			}
-		},
-		{
-			"id": "b7313471-48a6-4659-98db-3e7a15043150",
-			"type": "equipment",
-			"description": "Hand Grenade, Plasma",
-			"reference": "B277",
-			"notes": "Fuse 2",
-			"tech_level": "^",
-			"legality_class": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 100,
-			"weight": "1 lb",
-			"weapons": [
-				{
-					"id": "023a3807-290b-40fd-9628-95458e1e4330",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "burn ex",
-						"base": "6dx4"
-					},
-					"accuracy": "0",
-					"range": "x3.5",
-					"rate_of_fire": "1",
-					"shots": "1",
-					"bulk": "0",
-					"recoil": "0",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Throwing"
-						}
-					],
-					"calc": {
-						"range": "x3.5",
-						"damage": "6dx4 burn ex"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 100,
-				"extended_weight": "1 lb"
-			}
-		},
-		{
-			"id": "005304c8-5f8d-4976-ba52-db456785f77f",
-			"type": "equipment",
-			"description": "Hand Grenade, Stun",
-			"reference": "B277",
-			"notes": "Fuse 2",
-			"tech_level": "8",
-			"legality_class": "2",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 40,
-			"weight": "1 lb",
-			"weapons": [
-				{
-					"id": "974ad68b-1d71-4902-a707-bf3144822c48",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": ""
-					},
-					"accuracy": "0",
-					"range": "x3.5",
-					"rate_of_fire": "1",
-					"shots": "1",
-					"bulk": "0",
-					"recoil": "0",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Throwing"
-						}
-					],
-					"calc": {
-						"range": "x3.5"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "1 lb"
-			}
-		},
-		{
-			"id": "3255ab33-bff0-43af-9728-5ca1daf48896",
-			"type": "equipment",
-			"description": "Handcuffs",
-			"reference": "B289",
-			"tech_level": "5",
-			"tags": [
-				"Law-Enforcement",
-				"Spy Gear",
-				"Thief"
-			],
-			"quantity": 1,
-			"value": 40,
-			"weight": "0.5 lb",
-			"features": [
-				{
-					"type": "skill_bonus",
-					"selection_type": "skills_with_name",
-					"name": {
-						"compare": "is",
-						"qualifier": "Escape"
-					},
-					"amount": -5
-				}
-			],
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "0.5 lb"
-			}
-		},
-		{
-			"id": "5ead9f4e-3b96-46c6-8ee0-3a468a8f04c8",
-			"type": "equipment",
-			"description": "Handgonne, .90",
-			"reference": "B279",
-			"tech_level": "3",
-			"legality_class": "3",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 300,
-			"weight": "15 lb",
-			"weapons": [
-				{
-					"id": "6cc3b93e-d443-4973-b727-d8ad87637753",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi++",
-						"base": "2d"
-					},
-					"strength": "10†",
-					"accuracy": "0",
-					"range": "100/600",
+					"strength": "10",
+					"usage": "Fragmentation",
+					"accuracy": "4+2",
+					"range": "2200",
 					"rate_of_fire": "1",
-					"shots": "1(60)",
-					"bulk": "-6",
-					"recoil": "4",
+					"shots": "3(3)",
+					"bulk": "-",
+					"recoil": "3",
 					"defaults": [
 						{
 							"type": "dx",
@@ -9763,42 +9516,42 @@
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Pistol",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Rifle",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Shotgun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Light Machine Gun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Submachine Gun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Musket"
+							"specialization": "Musket",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
+							"specialization": "Grenade Launcher"
 						},
 						{
 							"type": "skill",
@@ -9818,2821 +9571,25 @@
 						}
 					],
 					"calc": {
-						"range": "100/600",
-						"damage": "2d pi++"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 300,
-				"extended_weight": "15 lb"
-			}
-		},
-		{
-			"id": "ed89f78f-7c95-49b9-8482-36036c081382",
-			"type": "equipment",
-			"description": "Harpoon",
-			"reference": "B276",
-			"tech_level": "2",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 60,
-			"weight": "6 lb",
-			"weapons": [
-				{
-					"id": "26372e88-21ca-4bed-889f-eb88bd88daff",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "5"
-					},
-					"strength": "11",
-					"usage": "Thrown",
-					"accuracy": "2",
-					"range": "x1/x1.5",
-					"rate_of_fire": "1",
-					"shots": "T(1)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Thrown Weapon",
-							"specialization": "Harpoon"
-						},
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Thrown Weapon",
-							"specialization": "Spear",
-							"modifier": -2
-						}
-					],
-					"calc": {
-						"range": "x1/x1.5",
-						"damage": "thr+5 imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 60,
-				"extended_weight": "6 lb"
-			}
-		},
-		{
-			"id": "4457ec84-19db-4141-8a8f-20133a3d46be",
-			"type": "equipment",
-			"description": "Hatchet",
-			"reference": "B271",
-			"tech_level": "0",
-			"tags": [
-				"Melee Weapon",
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 40,
-			"weight": "2 lb",
-			"weapons": [
-				{
-					"id": "08ef8af2-66fd-46d4-86a0-71132a4f7de4",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cut",
-						"st": "sw"
-					},
-					"strength": "8",
-					"usage": "Swung",
-					"reach": "1",
-					"parry": "0",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Axe/Mace"
-						},
-						{
-							"type": "skill",
-							"name": "Flail",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
-							"modifier": -3
-						}
-					],
-					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "sw cut"
-					}
-				},
-				{
-					"id": "6715fd49-5971-4590-ab3d-60447807af85",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cut",
-						"st": "sw"
-					},
-					"strength": "8",
-					"usage": "Thrown",
-					"accuracy": "1",
-					"range": "x1.5/x2.5",
-					"rate_of_fire": "1",
-					"shots": "T(1)",
-					"bulk": "-2",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Thrown Weapon",
-							"specialization": "Axe/Mace"
-						}
-					],
-					"calc": {
-						"range": "x1.5/x2.5",
-						"damage": "sw cut"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "c3611c98-4352-4b79-a111-3fc961eafa2f",
-			"type": "equipment",
-			"description": "Heavy Blaster",
-			"reference": "B280",
-			"tech_level": "11",
-			"legality_class": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 23000,
-			"weight": "20 lb",
-			"weapons": [
-				{
-					"id": "c3b2955c-6d74-4113-9e6b-13fc8dec34aa",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "burn",
-						"base": "8d",
-						"armor_divisor": 5
-					},
-					"strength": "10†",
-					"accuracy": "10+4",
-					"range": "900/2700",
-					"rate_of_fire": "3",
-					"shots": "90(5)",
-					"bulk": "-6",
-					"recoil": "1",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Pistol",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Rifle"
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Projector",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "900/2700",
-						"damage": "8d(5) burn"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 23000,
-				"extended_weight": "20 lb"
-			}
-		},
-		{
-			"id": "50e8e714-f995-42f4-956d-b5d8392bb7cb",
-			"type": "equipment",
-			"description": "Heavy Cloak",
-			"reference": "B287",
-			"tech_level": "1",
-			"tags": [
-				"Clothing"
-			],
-			"quantity": 1,
-			"value": 50,
-			"weight": "5 lb",
-			"weapons": [
-				{
-					"id": "231361a9-32ee-4e15-9a63-bd611fdb38b3",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "-"
-					},
-					"strength": "-",
-					"reach": "-",
-					"parry": "No",
-					"block": "+0",
-					"defaults": [
-						{
-							"type": "block",
-							"name": "Cloak"
-						}
-					],
-					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "-"
-					}
-				},
-				{
-					"id": "b6064b63-8744-42a4-a5bd-14470eee6d92",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "Special"
-					},
-					"strength": "8",
-					"usage": "Thrown",
-					"accuracy": "+1",
-					"range": "2",
-					"rate_of_fire": "1",
-					"shots": "T(1)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Cloak"
-						},
-						{
-							"type": "skill",
-							"name": "Net",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Shield",
-							"modifier": -4
-						},
-						{
-							"type": "dx",
-							"modifier": -5
-						}
-					],
-					"calc": {
-						"range": "2",
-						"damage": "Special"
-					}
-				}
-			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 2
-				}
-			],
-			"calc": {
-				"extended_value": 50,
-				"extended_weight": "5 lb"
-			}
-		},
-		{
-			"id": "66febf16-cf94-4a0e-bd0c-4c6a544b41c6",
-			"type": "equipment",
-			"description": "Heavy Gauntlets",
-			"reference": "B284",
-			"tech_level": "3",
-			"legality_class": "3",
-			"tags": [
-				"Gloves"
-			],
-			"quantity": 1,
-			"value": 250,
-			"weight": "2.5 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "hand",
-					"amount": 5
-				}
-			],
-			"calc": {
-				"extended_value": 250,
-				"extended_weight": "2.5 lb"
-			}
-		},
-		{
-			"id": "9db42bcf-abb3-4f0c-8d87-34afee1f4337",
-			"type": "equipment",
-			"description": "Heavy Leather Leggings",
-			"reference": "B283",
-			"tech_level": "1",
-			"tags": [
-				"Limb Armor"
-			],
-			"quantity": 1,
-			"value": 60,
-			"weight": "4 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "leg",
-					"amount": 2
-				}
-			],
-			"calc": {
-				"extended_value": 60,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "6267ead4-b298-497c-90b1-cd670c620ec9",
-			"type": "equipment",
-			"description": "Heavy Leather Sleeves",
-			"reference": "B283",
-			"tech_level": "1",
-			"tags": [
-				"Limb Armor"
-			],
-			"quantity": 1,
-			"value": 50,
-			"weight": "2 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "arm",
-					"amount": 2
-				}
-			],
-			"calc": {
-				"extended_value": 50,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "684bc457-8d50-4c54-8b55-11bf11b25141",
-			"type": "equipment",
-			"description": "Heavy Plate Arms",
-			"reference": "B283",
-			"tech_level": "3",
-			"legality_class": "3",
-			"tags": [
-				"Limb Armor"
-			],
-			"quantity": 1,
-			"value": 1500,
-			"weight": "20 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "arm",
-					"amount": 7
-				}
-			],
-			"calc": {
-				"extended_value": 1500,
-				"extended_weight": "20 lb"
-			}
-		},
-		{
-			"id": "90a0ca9a-ef32-499e-a1a4-c344de4db8eb",
-			"type": "equipment",
-			"description": "Heavy Plate Legs",
-			"reference": "B283",
-			"tech_level": "3",
-			"legality_class": "3",
-			"tags": [
-				"Limb Armor"
-			],
-			"quantity": 1,
-			"value": 1600,
-			"weight": "25 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "leg",
-					"amount": 7
-				}
-			],
-			"calc": {
-				"extended_value": 1600,
-				"extended_weight": "25 lb"
-			}
-		},
-		{
-			"id": "113d8e6d-e03c-4391-bf4e-3e009423fcb0",
-			"type": "equipment",
-			"description": "Heavy Steel Corselet",
-			"reference": "B283",
-			"tech_level": "3",
-			"legality_class": "3",
-			"tags": [
-				"Body Armor"
-			],
-			"quantity": 1,
-			"value": 2300,
-			"weight": "45 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 7
-				},
-				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 7
-				},
-				{
-					"type": "dr_bonus",
-					"location": "groin",
-					"amount": 7
-				}
-			],
-			"calc": {
-				"extended_value": 2300,
-				"extended_weight": "45 lb"
-			}
-		},
-		{
-			"id": "07b1b097-414f-49da-92a2-4c62ddb3edb3",
-			"type": "equipment_container",
-			"open": true,
-			"description": "Hip Quiver",
-			"reference": "B289",
-			"notes": "Holds 20 arrows or bolts",
-			"tech_level": "0",
-			"tags": [
-				"Weapon and Combat Accessories"
-			],
-			"quantity": 1,
-			"value": 15,
-			"weight": "1 lb",
-			"calc": {
-				"extended_value": 15,
-				"extended_weight": "1 lb"
-			}
-		},
-		{
-			"id": "3c5af91b-05ff-4771-abe0-35a343618b6d",
-			"type": "equipment",
-			"description": "HMG, .50",
-			"reference": "B281",
-			"tech_level": "6",
-			"legality_class": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 14000,
-			"weight": "116 lb",
-			"weapons": [
-				{
-					"id": "c6db5fc6-1af3-4f22-a792-aebace78b5fb",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi+",
-						"base": "13d+1"
-					},
-					"strength": "20M†",
-					"accuracy": "6",
-					"range": "1800/7400",
-					"rate_of_fire": "8!",
-					"shots": "100(5)",
-					"bulk": "-8",
-					"recoil": "2",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gunner",
-							"specialization": "Catapult",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gunner",
-							"specialization": "Beams",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gunner",
-							"specialization": "Cannon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gunner",
-							"specialization": "Machine Gun"
-						},
-						{
-							"type": "skill",
-							"name": "Gunner",
-							"specialization": "Rockets",
-							"modifier": -4
-						}
-					],
-					"calc": {
-						"range": "1800/7400",
-						"damage": "13d+1 pi+"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 14000,
-				"extended_weight": "116 lb"
-			}
-		},
-		{
-			"id": "3bb7afd8-d0cf-433d-bdcb-f6fddd052970",
-			"type": "equipment",
-			"description": "Holdout Pistol, .380",
-			"reference": "B278",
-			"tech_level": "7",
-			"legality_class": "3",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 300,
-			"weight": "1.3 lb",
-			"weapons": [
-				{
-					"id": "b478a6f8-a904-435f-9004-abd071548ed5",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi",
-						"base": "2d"
-					},
-					"strength": "8",
-					"accuracy": "1",
-					"range": "125/1500",
-					"rate_of_fire": "3",
-					"shots": "5+1(3)",
-					"bulk": "-1",
-					"recoil": "3",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "125/1500",
-						"damage": "2d pi"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 300,
-				"extended_weight": "1.3 lb"
-			}
-		},
-		{
-			"id": "1a0697ae-6be3-4a77-a114-5904d0005ea6",
-			"type": "equipment_container",
-			"open": true,
-			"description": "Holster, Belt",
-			"reference": "B289",
-			"notes": "Fits most pistols",
-			"tech_level": "5",
-			"tags": [
-				"Weapon and Combat Accessories"
-			],
-			"quantity": 1,
-			"value": 25,
-			"weight": "0.5 lb",
-			"calc": {
-				"extended_value": 25,
-				"extended_weight": "0.5 lb"
-			}
-		},
-		{
-			"id": "4cd595ae-1191-4ca0-88bf-bd8a3ea9c750",
-			"type": "equipment_container",
-			"open": true,
-			"description": "Holster, Shoulder",
-			"reference": "B289",
-			"notes": "Allows use of Holdout, but gives -1 to Fast-Draw.",
-			"tech_level": "5",
-			"tags": [
-				"Weapon and Combat Accessories"
-			],
-			"quantity": 1,
-			"value": 50,
-			"weight": "1 lb",
-			"calc": {
-				"extended_value": 50,
-				"extended_weight": "1 lb"
-			}
-		},
-		{
-			"id": "f5c96d68-c257-423c-8b81-d1b5d710271a",
-			"type": "equipment",
-			"description": "Homing Beacon",
-			"reference": "B289",
-			"notes": "Scanner tracks at 1-mile range. 12 hrs.",
-			"tech_level": "7",
-			"tags": [
-				"Law-Enforcement",
-				"Spy Gear",
-				"Thief"
-			],
-			"quantity": 1,
-			"value": 40,
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "8adf841d-4c63-4769-9564-9fbb083b100d",
-			"type": "equipment",
-			"description": "Horseshoes, Set",
-			"reference": "B289",
-			"notes": "Shod horses get +2 HT on any rolls for stamina on long rides",
-			"tech_level": "3",
-			"tags": [
-				"Equestrian Gear"
-			],
-			"quantity": 1,
-			"value": 50,
-			"weight": "4 lb",
-			"calc": {
-				"extended_value": 50,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "59b8a1ae-14f3-4bb2-a001-88b08133cb6b",
-			"type": "equipment",
-			"description": "ICW Integral, 25mm",
-			"reference": "B281",
-			"tech_level": "9",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"weapons": [
-				{
-					"id": "a5d1de68-891b-411c-b311-ae1d10a5971e",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cr ex",
-						"base": "7d",
-						"fragmentation": "3d",
-						"fragmentation_type": "cut"
-					},
-					"strength": "10",
-					"usage": "Fragmentation",
-					"accuracy": "4+2",
-					"range": "2200",
-					"rate_of_fire": "1",
-					"shots": "3(3)",
-					"bulk": "-",
-					"recoil": "3",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "2200",
-						"damage": "7d cr ex [3d cut]"
-					}
-				},
-				{
-					"id": "f6e308bd-b329-467c-9991-492931463245",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cr ex",
-						"base": "4d"
-					},
-					"strength": "10",
-					"usage": "Concussion",
-					"accuracy": "4+2",
-					"range": "2200",
-					"rate_of_fire": "1",
-					"shots": "3(3)",
-					"bulk": "-",
-					"recoil": "3",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "2200",
-						"damage": "4d cr ex"
-					}
-				},
-				{
-					"id": "dffb9927-5257-45c5-8a88-10aac478f198",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "HT-5 aff (10 yd)"
-					},
-					"strength": "10",
-					"usage": "Stun",
-					"accuracy": "4+2",
-					"range": "2200",
-					"rate_of_fire": "1",
-					"shots": "3(3)",
-					"bulk": "-",
-					"recoil": "3",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "2200",
-						"damage": "HT-5 aff (10 yd)"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 0,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "23ad0ec1-8978-4a20-9452-c9101eb63126",
-			"type": "equipment",
-			"description": "ICW, 6.8mm",
-			"reference": "B279",
-			"tech_level": "9",
-			"legality_class": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 7000,
-			"weight": "12 lb",
-			"weapons": [
-				{
-					"id": "8c7799f1-1ea4-4e13-8608-722bf04be138",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi",
-						"base": "6d"
-					},
-					"strength": "10†",
-					"accuracy": "4+2",
-					"range": "700/4000",
-					"rate_of_fire": "15",
-					"shots": "25+1(3)",
-					"bulk": "-5",
-					"recoil": "2",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "700/4000",
-						"damage": "6d pi"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 7000,
-				"extended_weight": "12 lb"
-			}
-		},
-		{
-			"id": "fea91f4f-a428-4766-9cb1-b747c1fb8e91",
-			"type": "equipment",
-			"description": "Integral, 25mm",
-			"reference": "B281",
-			"tech_level": "9",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"weapons": [
-				{
-					"id": "a88029ea-2ffd-4407-9719-776bbec5dbf7",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cr ex",
-						"base": "7d",
-						"fragmentation": "3d",
-						"fragmentation_type": "cut"
-					},
-					"strength": "10",
-					"accuracy": "4+2",
-					"range": "2200",
-					"rate_of_fire": "1",
-					"shots": "3(3)",
-					"bulk": "-",
-					"recoil": "3",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "2200",
-						"damage": "7d cr ex [3d cut]"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 0,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "2a781e12-6166-41be-bf75-e676e1481117",
-			"type": "equipment",
-			"description": "Iron Spike/Piton",
-			"reference": "B288",
-			"tech_level": "2",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 1,
-			"weight": "0.5 lb",
-			"calc": {
-				"extended_value": 1,
-				"extended_weight": "0.5 lb"
-			}
-		},
-		{
-			"id": "61eb403c-be94-46e7-a9dc-904a8b5b2f28",
-			"type": "equipment",
-			"description": "Javelin",
-			"reference": "B273",
-			"tech_level": "1",
-			"tags": [
-				"AmmoType:Javelin",
-				"Melee Weapon",
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 30,
-			"weight": "2 lb",
-			"weapons": [
-				{
-					"id": "707acb6e-2ee2-49ae-a12d-86e8a805256b",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "1"
-					},
-					"strength": "6",
-					"usage": "Thrust",
-					"reach": "1",
-					"parry": "0",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Spear"
-						},
-						{
-							"type": "skill",
-							"name": "Polearm",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Staff",
-							"modifier": -2
-						}
-					],
-					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "thr+1 imp"
-					}
-				},
-				{
-					"id": "fb94724e-fb6c-48d9-85b2-5c95a3a66a53",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "1"
-					},
-					"strength": "6",
-					"usage": "Thrown",
-					"accuracy": "+3",
-					"range": "x1.5/x2.5",
-					"rate_of_fire": "1",
-					"shots": "T(1)",
-					"bulk": "-4",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Thrown Weapon",
-							"specialization": "Spear"
-						},
-						{
-							"type": "skill",
-							"name": "Spear Thrower",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Thrown Weapon",
-							"specialization": "Harpoon",
-							"modifier": -2
-						}
-					],
-					"calc": {
-						"range": "x1.5/x2.5",
-						"damage": "thr+1 imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 30,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "bf30e156-eea6-44d7-b2d4-336e610abc0a",
-			"type": "equipment",
-			"description": "Katana",
-			"reference": "B271",
-			"tech_level": "3",
-			"tags": [
-				"Melee Weapon"
-			],
-			"quantity": 1,
-			"value": 650,
-			"weight": "5 lb",
-			"weapons": [
-				{
-					"id": "3b7716ac-1c5f-4d10-b6f6-253c24f8008e",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "1"
-					},
-					"strength": "11",
-					"usage": "Swung",
-					"usage_notes": "1-handed",
-					"reach": "1,2",
-					"parry": "0",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Force Sword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword"
-						},
-						{
-							"type": "skill",
-							"name": "Rapier",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Saber",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Shortsword",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Sword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Sword!"
-						}
-					],
-					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "sw+1 cut"
-					}
-				},
-				{
-					"id": "7cbca692-ed7b-47c1-9c13-25123a07e39d",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "1"
-					},
-					"strength": "11",
-					"usage": "Thrust",
-					"usage_notes": "1-handed",
-					"reach": "1",
-					"parry": "0",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Force Sword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword"
-						},
-						{
-							"type": "skill",
-							"name": "Rapier",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Saber",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Shortsword",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Sword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Sword!"
-						}
-					],
-					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "thr+1 imp"
-					}
-				},
-				{
-					"id": "8099d176-5b0a-4ca1-90c6-59f0cbcbdc9f",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "2"
-					},
-					"strength": "10†",
-					"usage": "Swung",
-					"usage_notes": "2-handed",
-					"reach": "1,2",
-					"parry": "0",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Sword"
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Force Sword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Sword!"
-						}
-					],
-					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "sw+2 cut"
-					}
-				},
-				{
-					"id": "4d888243-1baa-4d11-8e46-22f5fa4dfb56",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "1"
-					},
-					"strength": "10†",
-					"usage": "Thrust",
-					"usage_notes": "2-handed",
-					"reach": "1",
-					"parry": "0",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Sword"
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Force Sword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Sword!"
-						}
-					],
-					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "thr+1 imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 650,
-				"extended_weight": "5 lb"
-			}
-		},
-		{
-			"id": "d7487b63-258b-4021-8619-6de51fc18e6a",
-			"type": "equipment",
-			"description": "Kerosene, 1 Gallon",
-			"reference": "B288",
-			"tech_level": "6",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 2,
-			"weight": "6 lb",
-			"calc": {
-				"extended_value": 2,
-				"extended_weight": "6 lb"
-			}
-		},
-		{
-			"id": "9632779b-3134-48e8-b5e8-e9b680445854",
-			"type": "equipment",
-			"description": "Knitting Needles, Pair",
-			"reference": "B289",
-			"tech_level": "3",
-			"tags": [
-				"Tools"
-			],
-			"quantity": 1,
-			"value": 5,
-			"calc": {
-				"extended_value": 5,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "81a4eff8-781f-42aa-94ae-ddacf54f147a",
-			"type": "equipment",
-			"description": "Kusari",
-			"reference": "B272",
-			"tech_level": "3",
-			"tags": [
-				"Melee Weapon"
-			],
-			"quantity": 1,
-			"value": 70,
-			"weight": "5 lb",
-			"weapons": [
-				{
-					"id": "8313307f-0714-489c-8815-eba3a44f3a5b",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "sw",
-						"base": "2"
-					},
-					"strength": "11",
-					"usage": "Swung",
-					"usage_notes": "Attempts to parry this weapon are at -4 and fencing weapons may not parry it at all; attempts to block this weapon are at -2",
-					"reach": "1-4*",
-					"parry": "-2U",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -6
-						},
-						{
-							"type": "skill",
-							"name": "Kusari"
-						},
-						{
-							"type": "skill",
-							"name": "Monowire Whip",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Flail",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Whip",
-							"modifier": -3
-						}
-					],
-					"calc": {
-						"parry": "-2U",
-						"block": "No",
-						"damage": "sw+2 cr"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 70,
-				"extended_weight": "5 lb"
-			}
-		},
-		{
-			"id": "21b11a47-5ad1-40b9-a192-91d29fa076a0",
-			"type": "equipment",
-			"description": "Lance",
-			"reference": "B272",
-			"tech_level": "2",
-			"tags": [
-				"Melee Weapon"
-			],
-			"quantity": 1,
-			"value": 60,
-			"weight": "6 lb",
-			"weapons": [
-				{
-					"id": "69c62554-ae4a-4e2f-b26b-f0ee1d66bda8",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "3"
-					},
-					"strength": "12",
-					"usage": "Thrust",
-					"reach": "4",
-					"parry": "No",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Spear",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Lance"
-						}
-					],
-					"calc": {
-						"parry": "No",
-						"block": "No",
-						"damage": "thr+3 imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 60,
-				"extended_weight": "6 lb"
-			}
-		},
-		{
-			"id": "055d90d4-f642-41cd-9e52-5d60402b723e",
-			"type": "equipment",
-			"description": "Lantern",
-			"reference": "B288",
-			"notes": "Uses 1 pint of oil per 24 hours",
-			"tech_level": "2",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 20,
-			"weight": "2 lb",
-			"calc": {
-				"extended_value": 20,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "0c0d9c88-a69c-4159-a3b9-4bb99de0ba59",
-			"type": "equipment_container",
-			"open": true,
-			"description": "Lanyard, Leather",
-			"reference": "B289",
-			"notes": "Lets you retrieve a dropped weapon on a DX roll. Each attempt requires a Ready maneuver. Can be cut: -6 to hit, DR 2, HP 2.",
-			"tech_level": "0",
-			"tags": [
-				"Weapon and Combat Accessories"
-			],
-			"quantity": 1,
-			"value": 1,
-			"calc": {
-				"extended_value": 1,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "95520baa-147d-4630-aa8a-272216e2760f",
-			"type": "equipment_container",
-			"open": true,
-			"description": "Lanyard, Woven Steel",
-			"reference": "B289",
-			"notes": "Lets you retrieve a dropped weapon on a DX roll. Each attempt requires a Ready maneuver. Can be cut: -6 to hit, DR 6, HP 4.",
-			"tech_level": "6",
-			"tags": [
-				"Weapon and Combat Accessories"
-			],
-			"quantity": 1,
-			"value": 15,
-			"calc": {
-				"extended_value": 15,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "193b1213-5db9-4a69-a876-c7e16027188f",
-			"type": "equipment",
-			"description": "Large Knife",
-			"reference": "B272",
-			"tech_level": "0",
-			"tags": [
-				"Melee Weapon",
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 40,
-			"weight": "1 lb",
-			"weapons": [
-				{
-					"id": "6fe06673-89a4-4f1a-a415-51ae243c9cb0",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "-2"
-					},
-					"strength": "6",
-					"usage": "Swung",
-					"reach": "C,1",
-					"parry": "-1",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Knife"
-						},
-						{
-							"type": "skill",
-							"name": "Force Sword",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Main-Gauche",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Shortsword",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Sword!"
-						}
-					],
-					"calc": {
-						"parry": "-1",
-						"block": "No",
-						"damage": "sw-2 cut"
-					}
-				},
-				{
-					"id": "3f42a716-3051-497f-b287-912095dffcd5",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr"
-					},
-					"strength": "6",
-					"usage": "Thrust",
-					"reach": "C",
-					"parry": "-1",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Knife"
-						},
-						{
-							"type": "skill",
-							"name": "Force Sword",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Main-Gauche",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Shortsword",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Sword!"
-						}
-					],
-					"calc": {
-						"parry": "-1",
-						"block": "No",
-						"damage": "thr imp"
-					}
-				},
-				{
-					"id": "ce852649-71ad-4350-b4c7-7d71931c4971",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr"
-					},
-					"strength": "6",
-					"usage": "Thrown",
-					"accuracy": "+0",
-					"range": "x0.8/x1.5",
-					"rate_of_fire": "1",
-					"shots": "T(1)",
-					"bulk": "-2",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Thrown Weapon",
-							"specialization": "Knife"
-						}
-					],
-					"calc": {
-						"range": "x0.8/x1.5",
-						"damage": "thr imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "1 lb"
-			}
-		},
-		{
-			"id": "dcd6a7b3-c390-48eb-a853-fdd4f97126df",
-			"type": "equipment",
-			"description": "Large Net",
-			"reference": "B276",
-			"tech_level": "0",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 40,
-			"weight": "20 lb",
-			"weapons": [
-				{
-					"id": "7ead9760-81c0-4126-a098-abdbf6f90633",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "see B411"
-					},
-					"strength": "11",
-					"accuracy": "1",
-					"range": "spec",
-					"rate_of_fire": "1",
-					"shots": "T(1)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Net"
-						},
-						{
-							"type": "skill",
-							"name": "Cloak",
-							"modifier": -5
-						}
-					],
-					"calc": {
-						"range": "spec",
-						"damage": "see B411"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "20 lb"
-			}
-		},
-		{
-			"id": "e668e0a6-1ac3-45ec-96ce-ba7e49f51d84",
-			"type": "equipment",
-			"description": "Large Shield",
-			"reference": "B287",
-			"tech_level": "1",
-			"tags": [
-				"Shield"
-			],
-			"quantity": 1,
-			"value": 90,
-			"weight": "25 lb",
-			"weapons": [
-				{
-					"id": "80b71d57-c5a9-4286-8cc1-e2ddcee800a8",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "thr"
-					},
-					"strength": "0",
-					"usage": "Shield Bash",
-					"reach": "1",
-					"parry": "No",
-					"block": "+0",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Shield",
-							"specialization": "Buckler",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Shield",
-							"specialization": "Force Shield",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Shield",
-							"specialization": "Shield"
-						}
-					],
-					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "thr cr"
-					}
-				}
-			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 3
-				}
-			],
-			"calc": {
-				"extended_value": 90,
-				"extended_weight": "25 lb"
-			}
-		},
-		{
-			"id": "9e94c02a-71bb-454b-b6f6-4f1876f509d9",
-			"type": "equipment",
-			"description": "Large Shield with Spike",
-			"reference": "B287",
-			"tech_level": "1",
-			"tags": [
-				"Shield"
-			],
-			"quantity": 1,
-			"value": 110,
-			"weight": "30 lb",
-			"weapons": [
-				{
-					"id": "8b7d835b-196c-4de5-a000-6fd3e98f9e7c",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "thr",
-						"base": "1"
-					},
-					"strength": "0",
-					"usage": "Shield Bash",
-					"reach": "1",
-					"parry": "No",
-					"block": "+0",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Shield",
-							"specialization": "Buckler",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Shield",
-							"specialization": "Force Shield",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Shield",
-							"specialization": "Shield"
-						}
-					],
-					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "thr+1 cr"
-					}
-				}
-			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 3
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 3
-				}
-			],
-			"calc": {
-				"extended_value": 110,
-				"extended_weight": "30 lb"
-			}
-		},
-		{
-			"id": "1bba6454-ce3a-4e08-9af6-7546c199a7a2",
-			"type": "equipment",
-			"description": "Lariat",
-			"reference": "B276",
-			"tech_level": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 40,
-			"weight": "3 lb",
-			"weapons": [
-				{
-					"id": "5c61395c-9bab-4ed4-b368-9e2e38a015d6",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "see B411"
-					},
-					"strength": "7†",
-					"accuracy": "0",
-					"range": "spec",
-					"rate_of_fire": "1",
-					"shots": "T(spec)",
-					"bulk": "-2",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Lasso"
-						}
-					],
-					"calc": {
-						"range": "spec",
-						"damage": "see B411"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "14a17acf-4a2f-443a-920f-fff7236893f0",
-			"type": "equipment",
-			"description": "Laser Microphone",
-			"reference": "B289",
-			"notes": "Eavesdrop through glass. 300-yd. range.",
-			"tech_level": "8",
-			"tags": [
-				"Law-Enforcement",
-				"Spy Gear",
-				"Thief"
-			],
-			"quantity": 1,
-			"value": 500,
-			"weight": "2 lb",
-			"calc": {
-				"extended_value": 500,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "41b3444c-9a26-46c5-ba78-5612c6cbca8c",
-			"type": "equipment",
-			"description": "Laser Pistol",
-			"reference": "B280",
-			"tech_level": "10",
-			"legality_class": "3",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 2800,
-			"weight": "3.3 lb",
-			"weapons": [
-				{
-					"id": "7c82e735-c39f-4ea6-a096-33d18a47fce0",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "burn",
-						"base": "3d",
-						"armor_divisor": 2
-					},
-					"strength": "6",
-					"accuracy": "6",
-					"range": "250/750",
-					"rate_of_fire": "10",
-					"shots": "400(3)",
-					"bulk": "-2",
-					"recoil": "1",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Pistol"
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Rifle",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Projector",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "250/750",
-						"damage": "3d(2) burn"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 2800,
-				"extended_weight": "3.3 lb"
-			}
-		},
-		{
-			"id": "7fec071c-716e-4831-92bf-90cdd4238765",
-			"type": "equipment",
-			"description": "Laser Rifle",
-			"reference": "B280",
-			"tech_level": "10",
-			"legality_class": "2",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 10000,
-			"weight": "10 lb",
-			"weapons": [
-				{
-					"id": "1acb0b5f-f667-4735-a6ae-4f95b15b5f1e",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "burn",
-						"base": "5d",
-						"armor_divisor": 2
-					},
-					"strength": "7†",
-					"accuracy": "12+2",
-					"range": "700/2100",
-					"rate_of_fire": "10",
-					"shots": "150(3)",
-					"bulk": "-4",
-					"recoil": "1",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Pistol",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Rifle"
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Projector",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "700/2100",
-						"damage": "5d(2) burn"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 10000,
-				"extended_weight": "10 lb"
-			}
-		},
-		{
-			"id": "8bee3f09-78f3-47d4-bef5-a84a23fa0074",
-			"type": "equipment",
-			"description": "Laser Sight",
-			"reference": "B289",
-			"notes": "+1 to skill; see Laser Sights (B412). 6 hrs.",
-			"tech_level": "8",
-			"tags": [
-				"Weapon and Combat Accessories"
-			],
-			"quantity": 1,
-			"value": 100,
-			"calc": {
-				"extended_value": 100,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "42d9e464-801a-429b-8a8c-d2d6467baad0",
-			"type": "equipment",
-			"description": "Laser Sniper Rifle",
-			"reference": "B280",
-			"tech_level": "9",
-			"legality_class": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 20000,
-			"weight": "20 lb",
-			"weapons": [
-				{
-					"id": "1b492dee-e2be-4647-b098-92a4c464e6b1",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "burn",
-						"base": "5d",
-						"armor_divisor": 2
-					},
-					"strength": "10†",
-					"accuracy": "12+2",
-					"range": "1100/3300",
-					"rate_of_fire": "3",
-					"shots": "75(3)",
-					"bulk": "-8",
-					"recoil": "1",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Pistol",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Rifle"
-						},
-						{
-							"type": "skill",
-							"name": "Beam Weapons",
-							"specialization": "Projector",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "1100/3300",
-						"damage": "5d(2) burn"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 20000,
-				"extended_weight": "20 lb"
-			}
-		},
-		{
-			"id": "731ecabc-94b5-4dad-9b17-e7dac2655624",
-			"type": "equipment",
-			"description": "LAW, 84mm",
-			"reference": "B281",
-			"tech_level": "8",
-			"legality_class": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 750,
-			"weight": "14.7 lb",
-			"weapons": [
-				{
-					"id": "6beafad8-c25e-4b40-bf7b-74e00caf8dd8",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cr ex",
-						"base": "6dx6",
-						"armor_divisor": 10
-					},
-					"strength": "10†",
-					"accuracy": "3",
-					"range": "330/2300",
-					"rate_of_fire": "1",
-					"shots": "1(-)",
-					"bulk": "-5",
-					"recoil": "1",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon"
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "330/2300",
-						"damage": "6dx6(10) cr ex"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 750,
-				"extended_weight": "14.7 lb"
-			}
-		},
-		{
-			"id": "8da53d73-c624-4f33-b9e8-30c3ed64d63e",
-			"type": "equipment",
-			"description": "Lead Pellet (Prodd)",
-			"reference": "B276",
-			"tech_level": "2",
-			"tags": [
-				"AmmoType:Prodd",
-				"Ammunition",
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 0.1,
-			"weight": "0.06 lb",
-			"calc": {
-				"extended_value": 0.1,
-				"extended_weight": "0.06 lb"
-			}
-		},
-		{
-			"id": "efcbbdf2-431b-4388-a2d7-2e003eb341a6",
-			"type": "equipment",
-			"description": "Lead Pellet (Sling)",
-			"reference": "B276",
-			"notes": "Gives +1 damage, double range",
-			"tech_level": "2",
-			"tags": [
-				"AmmoType:Sling",
-				"Ammunition",
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 0.1,
-			"weight": "0.05 lb",
-			"calc": {
-				"extended_value": 0.1,
-				"extended_weight": "0.05 lb"
-			}
-		},
-		{
-			"id": "adb76193-a473-4869-bf41-8b59186700bb",
-			"type": "equipment",
-			"description": "Leather Armor",
-			"reference": "B283",
-			"tech_level": "1",
-			"tags": [
-				"Body Armor"
-			],
-			"quantity": 1,
-			"value": 100,
-			"weight": "10 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 2
-				},
-				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 2
-				},
-				{
-					"type": "dr_bonus",
-					"location": "groin",
-					"amount": 2
-				}
-			],
-			"calc": {
-				"extended_value": 100,
-				"extended_weight": "10 lb"
-			}
-		},
-		{
-			"id": "d63ed2a8-bb6f-48fc-85d9-a153f9d4f209",
-			"type": "equipment",
-			"description": "Leather Cap",
-			"reference": "B284",
-			"notes": "Flexible",
-			"tech_level": "1",
-			"tags": [
-				"Headgear"
-			],
-			"quantity": 1,
-			"value": 32,
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "skull",
-					"amount": 1
-				}
-			],
-			"calc": {
-				"extended_value": 32,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "61adda9f-0e5d-4b9f-850c-10af2bd8de70",
-			"type": "equipment",
-			"description": "Leather Gloves",
-			"reference": "B284",
-			"notes": "Flexible",
-			"tech_level": "1",
-			"tags": [
-				"Gloves"
-			],
-			"quantity": 1,
-			"value": 30,
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "hand",
-					"amount": 2
-				}
-			],
-			"calc": {
-				"extended_value": 30,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "c59c7612-9b24-48ea-930c-1dc1a1561f37",
-			"type": "equipment",
-			"description": "Leather Helm",
-			"reference": "B284",
-			"tech_level": "1",
-			"tags": [
-				"Headgear"
-			],
-			"quantity": 1,
-			"value": 20,
-			"weight": "0.5 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "skull",
-					"amount": 2
-				},
-				{
-					"type": "dr_bonus",
-					"location": "face",
-					"amount": 2
-				}
-			],
-			"calc": {
-				"extended_value": 20,
-				"extended_weight": "0.5 lb"
-			}
-		},
-		{
-			"id": "d9004e6a-a9d3-4157-9593-514a7490f757",
-			"type": "equipment",
-			"description": "Leather Jacket",
-			"reference": "B283",
-			"notes": "Flexible, concealable",
-			"tech_level": "1",
-			"tags": [
-				"Body Armor"
-			],
-			"quantity": 1,
-			"value": 50,
-			"weight": "4 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 1
-				},
-				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 1
-				},
-				{
-					"type": "dr_bonus",
-					"location": "arm",
-					"amount": 1
-				}
-			],
-			"calc": {
-				"extended_value": 50,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "45f62c17-563d-44fd-89b6-ebf101a622bc",
-			"type": "equipment",
-			"description": "Leather Leggings",
-			"reference": "B283",
-			"notes": "Flexible, concealable",
-			"tech_level": "1",
-			"tags": [
-				"Limb Armor"
-			],
-			"quantity": 1,
-			"value": 40,
-			"weight": "2 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "leg",
-					"amount": 1
-				}
-			],
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "a761b2e6-2181-478b-a212-6bb41f7d5fa6",
-			"type": "equipment",
-			"description": "Leather Pants",
-			"reference": "B283",
-			"notes": "Flexible, concealable",
-			"tech_level": "1",
-			"tags": [
-				"Limb Armor"
-			],
-			"quantity": 1,
-			"value": 40,
-			"weight": "3 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "groin",
-					"amount": 1
-				},
-				{
-					"type": "dr_bonus",
-					"location": "leg",
-					"amount": 1
-				}
-			],
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "82e9c394-d65e-42d1-85ea-7fcca4a81184",
-			"type": "equipment",
-			"description": "Legionary Helmet",
-			"reference": "B284",
-			"tech_level": "2",
-			"legality_class": "3",
-			"tags": [
-				"Headgear"
-			],
-			"quantity": 1,
-			"value": 150,
-			"weight": "6 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "skull",
-					"amount": 4
-				},
-				{
-					"type": "dr_bonus",
-					"location": "face",
-					"amount": 4
-				}
-			],
-			"calc": {
-				"extended_value": 150,
-				"extended_weight": "6 lb"
-			}
-		},
-		{
-			"id": "4dc07041-259a-4990-9ec1-138f46fd257e",
-			"type": "equipment",
-			"description": "Lever-Action Carbine, .30",
-			"reference": "B279",
-			"tech_level": "5",
-			"legality_class": "3",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 300,
-			"weight": "7 lb",
-			"weapons": [
+						"range": "2200",
+						"damage": "7d cr ex [3d cut]"
+					}
+				},
 				{
-					"id": "947d7127-a444-4436-baad-32ce95205272",
+					"id": "f6e308bd-b329-467c-9991-492931463245",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "5d"
+						"type": "cr ex",
+						"base": "4d"
 					},
-					"strength": "10†",
-					"accuracy": "4",
-					"range": "450/3000",
+					"strength": "10",
+					"usage": "Concussion",
+					"accuracy": "4+2",
+					"range": "2200",
 					"rate_of_fire": "1",
-					"shots": "6+1(3i)",
-					"bulk": "-4",
-					"recoil": "2",
+					"shots": "3(3)",
+					"bulk": "-",
+					"recoil": "3",
 					"defaults": [
 						{
 							"type": "dx",
@@ -12642,43 +9599,125 @@
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Pistol",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Rifle"
+							"specialization": "Rifle",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Shotgun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Light Machine Gun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Submachine Gun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Musket",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Grenade Launcher",
+							"specialization": "Grenade Launcher"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
+						}
+					],
+					"calc": {
+						"range": "2200",
+						"damage": "4d cr ex"
+					}
+				},
+				{
+					"id": "dffb9927-5257-45c5-8a88-10aac478f198",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "HT-5 aff (10 yd)"
+					},
+					"strength": "10",
+					"usage": "Stun",
+					"accuracy": "4+2",
+					"range": "2200",
+					"rate_of_fire": "1",
+					"shots": "3(3)",
+					"bulk": "-",
+					"recoil": "3",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Shotgun",
 							"modifier": -4
 						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher"
+						},
 						{
 							"type": "skill",
 							"name": "Guns",
@@ -12697,58 +9736,44 @@
 						}
 					],
 					"calc": {
-						"range": "450/3000",
-						"damage": "5d pi"
+						"range": "2200",
+						"damage": "HT-5 aff (10 yd)"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 300,
-				"extended_weight": "7 lb"
-			}
-		},
-		{
-			"id": "1faaa7ba-267d-4ded-a03f-ff851c52942f",
-			"type": "equipment",
-			"description": "Life Jacket",
-			"reference": "B288",
-			"notes": "Floats up to 350 lbs.",
-			"tech_level": "6",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 100,
-			"weight": "6 lb",
-			"calc": {
-				"extended_value": 100,
-				"extended_weight": "6 lb"
+				"extended_value": 0,
+				"extended_weight": "0 lb"
 			}
 		},
 		{
-			"id": "b4a0a0dd-cad1-4b46-ad4d-50c0c87e35c4",
+			"id": "23ad0ec1-8978-4a20-9452-c9101eb63126",
 			"type": "equipment",
-			"description": "Light Buckler",
-			"reference": "B287",
-			"tech_level": "1",
+			"description": "ICW, 6.8mm",
+			"reference": "B279",
+			"tech_level": "9",
+			"legality_class": "1",
 			"tags": [
-				"Shield"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 25,
-			"weight": "2 lb",
+			"value": 7000,
+			"weight": "12 lb",
 			"weapons": [
 				{
-					"id": "b4b414f8-495f-450a-b6c5-d46705ef9c2d",
-					"type": "melee_weapon",
+					"id": "8c7799f1-1ea4-4e13-8608-722bf04be138",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "thr"
+						"type": "pi",
+						"base": "6d"
 					},
-					"strength": "0",
-					"reach": "1",
-					"parry": "No",
-					"block": "+0",
+					"strength": "10†",
+					"accuracy": "4+2",
+					"range": "700/4000",
+					"rate_of_fire": "15",
+					"shots": "25+1(3)",
+					"bulk": "-5",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
@@ -12756,76 +9781,100 @@
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Shield",
+							"name": "Guns",
+							"specialization": "Pistol",
 							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Force Shield",
+							"name": "Guns",
+							"specialization": "Rifle"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Shotgun",
 							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Buckler"
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "thr cr"
+						"range": "700/4000",
+						"damage": "6d pi"
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 1
-				}
-			],
 			"calc": {
-				"extended_value": 25,
-				"extended_weight": "2 lb"
+				"extended_value": 7000,
+				"extended_weight": "12 lb"
 			}
 		},
 		{
-			"id": "25023e6a-7512-456b-8f37-5167956f80b9",
+			"id": "fea91f4f-a428-4766-9cb1-b747c1fb8e91",
 			"type": "equipment",
-			"description": "Light Buckler with Spike",
-			"reference": "B287",
-			"tech_level": "1",
+			"description": "Integral, 25mm",
+			"reference": "B281",
+			"tech_level": "9",
 			"tags": [
-				"Shield"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 45,
-			"weight": "7 lb",
 			"weapons": [
 				{
-					"id": "5a322b0b-1f9b-4ee4-9af9-66ca6d41474a",
-					"type": "melee_weapon",
+					"id": "a88029ea-2ffd-4407-9719-776bbec5dbf7",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "thr",
-						"base": "1"
+						"type": "cr ex",
+						"base": "7d",
+						"fragmentation": "3d",
+						"fragmentation_type": "cut"
 					},
-					"strength": "0",
-					"reach": "1",
-					"parry": "No",
-					"block": "+0",
+					"strength": "10",
+					"accuracy": "4+2",
+					"range": "2200",
+					"rate_of_fire": "1",
+					"shots": "3(3)",
+					"bulk": "-",
+					"recoil": "3",
 					"defaults": [
 						{
 							"type": "dx",
@@ -12833,171 +9882,217 @@
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Shield",
-							"modifier": -2
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Force Shield",
-							"modifier": -2
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Buckler"
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "thr+1 cr"
+						"range": "2200",
+						"damage": "7d cr ex [3d cut]"
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 1
-				}
+			"calc": {
+				"extended_value": 0,
+				"extended_weight": "0 lb"
+			}
+		},
+		{
+			"id": "2a781e12-6166-41be-bf75-e676e1481117",
+			"type": "equipment",
+			"description": "Iron Spike/Piton",
+			"reference": "B288",
+			"tech_level": "2",
+			"tags": [
+				"Camping and Survival Gear"
 			],
+			"quantity": 1,
+			"value": 1,
+			"weight": "0.5 lb",
 			"calc": {
-				"extended_value": 45,
-				"extended_weight": "7 lb"
+				"extended_value": 1,
+				"extended_weight": "0.5 lb"
 			}
 		},
 		{
-			"id": "9897dd28-709a-41ed-be47-244b9d6b663a",
+			"id": "61eb403c-be94-46e7-a9dc-904a8b5b2f28",
 			"type": "equipment",
-			"description": "Light Cloak",
-			"reference": "B287",
+			"description": "Javelin",
+			"reference": "B273",
 			"tech_level": "1",
 			"tags": [
-				"Clothing"
+				"AmmoType:Javelin",
+				"Melee Weapon",
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 20,
+			"value": 30,
 			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "82f4656c-74ca-47a6-a5e5-208a54a4bf3e",
+					"id": "707acb6e-2ee2-49ae-a12d-86e8a805256b",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "-"
+						"type": "imp",
+						"st": "thr",
+						"base": "1"
 					},
-					"strength": "-",
-					"reach": "-",
-					"parry": "No",
-					"block": "+0",
+					"strength": "6",
+					"usage": "Thrust",
+					"reach": "1",
+					"parry": "0",
+					"block": "No",
 					"defaults": [
 						{
-							"type": "block",
-							"name": "Cloak"
+							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Spear"
+						},
+						{
+							"type": "skill",
+							"name": "Polearm",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Staff",
+							"modifier": -2
 						}
 					],
 					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "-"
+						"parry": "0",
+						"block": "No",
+						"damage": "thr+1 imp"
 					}
 				},
 				{
-					"id": "011f5041-1acd-4e0d-835d-f14eb04d86d2",
+					"id": "fb94724e-fb6c-48d9-85b2-5c95a3a66a53",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "Special"
+						"type": "imp",
+						"st": "thr",
+						"base": "1"
 					},
-					"strength": "5",
+					"strength": "6",
 					"usage": "Thrown",
-					"accuracy": "+1",
-					"range": "2",
+					"accuracy": "+3",
+					"range": "x1.5/x2.5",
 					"rate_of_fire": "1",
 					"shots": "T(1)",
 					"bulk": "-4",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Cloak"
+							"name": "Thrown Weapon",
+							"specialization": "Spear"
 						},
 						{
 							"type": "skill",
-							"name": "Net",
+							"name": "Spear Thrower",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"modifier": -4
+							"name": "Thrown Weapon",
+							"specialization": "Harpoon",
+							"modifier": -2
 						}
 					],
 					"calc": {
-						"range": "2",
-						"damage": "Special"
+						"range": "x1.5/x2.5",
+						"damage": "thr+1 imp"
 					}
 				}
 			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 1
-				}
-			],
 			"calc": {
-				"extended_value": 20,
+				"extended_value": 30,
 				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "4fe16008-c0e5-453b-b6de-ab2d47678dd0",
+			"id": "bf30e156-eea6-44d7-b2d4-336e610abc0a",
 			"type": "equipment",
-			"description": "Light Club",
+			"description": "Katana",
 			"reference": "B271",
-			"tech_level": "0",
+			"tech_level": "3",
 			"tags": [
 				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 5,
-			"weight": "3 lb",
+			"value": 650,
+			"weight": "5 lb",
 			"weapons": [
 				{
-					"id": "3865e69a-4d81-406e-844d-e8cc2b0bcddb",
+					"id": "3b7716ac-1c5f-4d10-b6f6-253c24f8008e",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cr",
+						"type": "cut",
 						"st": "sw",
 						"base": "1"
 					},
-					"strength": "10",
+					"strength": "11",
 					"usage": "Swung",
-					"reach": "1",
+					"usage_notes": "1-handed",
+					"reach": "1,2",
 					"parry": "0",
 					"block": "No",
 					"defaults": [
@@ -13042,19 +10137,20 @@
 					"calc": {
 						"parry": "0",
 						"block": "No",
-						"damage": "sw+1 cr"
+						"damage": "sw+1 cut"
 					}
 				},
 				{
-					"id": "480b3768-4946-4e04-b117-3d1b843b36f3",
+					"id": "7cbca692-ed7b-47c1-9c13-25123a07e39d",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cr",
+						"type": "imp",
 						"st": "thr",
 						"base": "1"
 					},
-					"strength": "10",
+					"strength": "11",
 					"usage": "Thrust",
+					"usage_notes": "1-handed",
 					"reach": "1",
 					"parry": "0",
 					"block": "No",
@@ -13100,384 +10196,225 @@
 					"calc": {
 						"parry": "0",
 						"block": "No",
-						"damage": "thr+1 cr"
+						"damage": "thr+1 imp"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 5,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "84b24820-ffec-4e27-9d24-9bf1841cd712",
-			"type": "equipment",
-			"description": "Light Scale Armor",
-			"reference": "B283",
-			"tech_level": "2",
-			"tags": [
-				"Body Armor"
-			],
-			"quantity": 1,
-			"value": 150,
-			"weight": "15 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 3
 				},
 				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 3
-				}
-			],
-			"calc": {
-				"extended_value": 150,
-				"extended_weight": "15 lb"
-			}
-		},
-		{
-			"id": "14db8275-310b-447c-9902-91bd888797a7",
-			"type": "equipment",
-			"description": "Light Shield",
-			"reference": "B287",
-			"tech_level": "1",
-			"tags": [
-				"Shield"
-			],
-			"quantity": 1,
-			"value": 25,
-			"weight": "2 lb",
-			"weapons": [
-				{
-					"id": "0618a376-0a92-49df-abb3-65a8f2fc3b96",
+					"id": "8099d176-5b0a-4ca1-90c6-59f0cbcbdc9f",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "thr"
+						"type": "cut",
+						"st": "sw",
+						"base": "2"
 					},
-					"strength": "0",
-					"usage": "Shield Bash",
-					"reach": "1",
-					"parry": "No",
-					"block": "+0",
+					"strength": "10†",
+					"usage": "Swung",
+					"usage_notes": "2-handed",
+					"reach": "1,2",
+					"parry": "0",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Shield",
-							"specialization": "Buckler",
-							"modifier": -2
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Force Shield",
-							"modifier": -2
+							"name": "Two-Handed Sword"
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Shield"
-						}
-					],
-					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "thr cr"
-					}
-				}
-			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 1
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 1
-				}
-			],
-			"calc": {
-				"extended_value": 25,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "6e40f71f-bbb8-4668-ab74-3c51fcc2b57a",
-			"type": "equipment",
-			"description": "Light Shield with Spike",
-			"reference": "B287",
-			"tech_level": "1",
-			"tags": [
-				"Shield"
-			],
-			"quantity": 1,
-			"value": 45,
-			"weight": "7 lb",
-			"weapons": [
-				{
-					"id": "dd86e590-368d-4f6e-8422-901fdbc0c716",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "thr",
-						"base": "1"
-					},
-					"strength": "0",
-					"usage": "Shield Bash",
-					"reach": "1",
-					"parry": "No",
-					"block": "+0",
-					"defaults": [
-						{
-							"type": "dx",
+							"name": "Broadsword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Buckler",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Shield",
-							"specialization": "Force Shield",
-							"modifier": -2
+							"name": "Force Sword",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Shield"
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "thr+1 cr"
+						"parry": "0",
+						"block": "No",
+						"damage": "sw+2 cut"
 					}
-				}
-			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 2
 				},
 				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 2
-				}
-			],
-			"calc": {
-				"extended_value": 45,
-				"extended_weight": "7 lb"
-			}
-		},
-		{
-			"id": "f6e1f935-cd69-4f10-a5e0-b0b586c0944b",
-			"type": "equipment",
-			"description": "LMG, 7.62mm",
-			"reference": "B281",
-			"tech_level": "6",
-			"legality_class": "1",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 6600,
-			"weight": "30 lb",
-			"weapons": [
-				{
-					"id": "836f48f1-031d-40c6-bb00-47f280f55ede",
-					"type": "ranged_weapon",
+					"id": "4d888243-1baa-4d11-8e46-22f5fa4dfb56",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "7d"
+						"type": "imp",
+						"st": "thr",
+						"base": "1"
 					},
-					"strength": "13B†",
-					"accuracy": "5",
-					"range": "1000/4200",
-					"rate_of_fire": "15!",
-					"shots": "100(5)",
-					"bulk": "-6",
-					"recoil": "2",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
-						},
+					"strength": "10†",
+					"usage": "Thrust",
+					"usage_notes": "2-handed",
+					"reach": "1",
+					"parry": "0",
+					"block": "No",
+					"defaults": [
 						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
+							"type": "dx",
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
+							"name": "Two-Handed Sword"
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
+							"name": "Broadsword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
+							"name": "Force Sword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Gun!"
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "1000/4200",
-						"damage": "7d pi"
+						"parry": "0",
+						"block": "No",
+						"damage": "thr+1 imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 6600,
-				"extended_weight": "30 lb"
+				"extended_value": 650,
+				"extended_weight": "5 lb"
 			}
 		},
 		{
-			"id": "22132718-3cfb-47ef-8d51-885630ad3595",
+			"id": "d7487b63-258b-4021-8619-6de51fc18e6a",
 			"type": "equipment",
-			"description": "Lockpicks",
+			"description": "Kerosene, 1 Gallon",
+			"reference": "B288",
+			"tech_level": "6",
+			"tags": [
+				"Camping and Survival Gear"
+			],
+			"quantity": 1,
+			"value": 2,
+			"weight": "6 lb",
+			"calc": {
+				"extended_value": 2,
+				"extended_weight": "6 lb"
+			}
+		},
+		{
+			"id": "9632779b-3134-48e8-b5e8-e9b680445854",
+			"type": "equipment",
+			"description": "Knitting Needles, Pair",
 			"reference": "B289",
-			"notes": "Basic equipment for Lockpicking skill",
 			"tech_level": "3",
 			"tags": [
-				"Law-Enforcement",
-				"Spy Gear",
-				"Thief"
+				"Tools"
 			],
 			"quantity": 1,
-			"value": 50,
+			"value": 5,
 			"calc": {
-				"extended_value": 50,
+				"extended_value": 5,
 				"extended_weight": "0 lb"
 			}
 		},
 		{
-			"id": "85326fe5-7a04-4dab-9850-5a5b616de040",
+			"id": "81a4eff8-781f-42aa-94ae-ddacf54f147a",
 			"type": "equipment",
-			"description": "Long Spear",
-			"reference": "B273",
-			"tech_level": "2",
+			"description": "Kusari",
+			"reference": "B272",
+			"tech_level": "3",
 			"tags": [
 				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 60,
+			"value": 70,
 			"weight": "5 lb",
 			"weapons": [
 				{
-					"id": "1d36612d-fa72-47d7-b738-781ef216a18d",
+					"id": "8313307f-0714-489c-8815-eba3a44f3a5b",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"st": "thr",
+						"type": "cr",
+						"st": "sw",
 						"base": "2"
 					},
-					"strength": "10",
-					"usage": "Thrust",
-					"reach": "2,3*",
-					"parry": "0U",
+					"strength": "11",
+					"usage": "Swung",
+					"usage_notes": "Attempts to parry this weapon are at -4 and fencing weapons may not parry it at all; attempts to block this weapon are at -2",
+					"reach": "1-4*",
+					"parry": "-2U",
 					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -6
 						},
 						{
 							"type": "skill",
-							"name": "Spear"
+							"name": "Kusari"
 						},
 						{
 							"type": "skill",
-							"name": "Polearm",
+							"name": "Monowire Whip",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Flail",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Staff",
-							"modifier": -2
+							"name": "Whip",
+							"modifier": -3
 						}
 					],
 					"calc": {
-						"parry": "0U",
+						"parry": "-2U",
 						"block": "No",
-						"damage": "thr+2 imp"
+						"damage": "sw+2 cr"
 					}
-				},
+				}
+			],
+			"calc": {
+				"extended_value": 70,
+				"extended_weight": "5 lb"
+			}
+		},
+		{
+			"id": "21b11a47-5ad1-40b9-a192-91d29fa076a0",
+			"type": "equipment",
+			"description": "Lance",
+			"reference": "B272",
+			"tech_level": "2",
+			"tags": [
+				"Melee Weapon"
+			],
+			"quantity": 1,
+			"value": 60,
+			"weight": "6 lb",
+			"weapons": [
 				{
-					"id": "f44c24e9-3193-4ced-8349-3dc3dac4e970",
+					"id": "69c62554-ae4a-4e2f-b26b-f0ee1d66bda8",
 					"type": "melee_weapon",
 					"damage": {
 						"type": "imp",
 						"st": "thr",
 						"base": "3"
 					},
-					"strength": "10†",
+					"strength": "12",
 					"usage": "Thrust",
-					"reach": "2,3*",
-					"parry": "0",
+					"reach": "4",
+					"parry": "No",
 					"block": "No",
 					"defaults": [
 						{
@@ -13486,21 +10423,16 @@
 						},
 						{
 							"type": "skill",
-							"name": "Spear"
-						},
-						{
-							"type": "skill",
-							"name": "Polearm",
-							"modifier": -4
+							"name": "Spear",
+							"modifier": -3
 						},
 						{
 							"type": "skill",
-							"name": "Staff",
-							"modifier": -2
+							"name": "Lance"
 						}
 					],
 					"calc": {
-						"parry": "0",
+						"parry": "No",
 						"block": "No",
 						"damage": "thr+3 imp"
 					}
@@ -13508,636 +10440,737 @@
 			],
 			"calc": {
 				"extended_value": 60,
-				"extended_weight": "5 lb"
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "ed6a89d0-5636-4c2a-9319-db5ab3a37f2a",
+			"id": "055d90d4-f642-41cd-9e52-5d60402b723e",
 			"type": "equipment",
-			"description": "Longbow (ST11)",
-			"reference": "B275",
+			"description": "Lantern",
+			"reference": "B288",
+			"notes": "Uses 1 pint of oil per 24 hours",
+			"tech_level": "2",
+			"tags": [
+				"Camping and Survival Gear"
+			],
+			"quantity": 1,
+			"value": 20,
+			"weight": "2 lb",
+			"calc": {
+				"extended_value": 20,
+				"extended_weight": "2 lb"
+			}
+		},
+		{
+			"id": "0c0d9c88-a69c-4159-a3b9-4bb99de0ba59",
+			"type": "equipment_container",
+			"open": true,
+			"description": "Lanyard, Leather",
+			"reference": "B289",
+			"notes": "Lets you retrieve a dropped weapon on a DX roll. Each attempt requires a Ready maneuver. Can be cut: -6 to hit, DR 2, HP 2.",
 			"tech_level": "0",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Weapon and Combat Accessories"
 			],
 			"quantity": 1,
-			"value": 200,
-			"weight": "3 lb",
+			"value": 1,
+			"calc": {
+				"extended_value": 1,
+				"extended_weight": "0 lb"
+			}
+		},
+		{
+			"id": "95520baa-147d-4630-aa8a-272216e2760f",
+			"type": "equipment_container",
+			"open": true,
+			"description": "Lanyard, Woven Steel",
+			"reference": "B289",
+			"notes": "Lets you retrieve a dropped weapon on a DX roll. Each attempt requires a Ready maneuver. Can be cut: -6 to hit, DR 6, HP 4.",
+			"tech_level": "6",
+			"tags": [
+				"Weapon and Combat Accessories"
+			],
+			"quantity": 1,
+			"value": 15,
+			"calc": {
+				"extended_value": 15,
+				"extended_weight": "0 lb"
+			}
+		},
+		{
+			"id": "193b1213-5db9-4a69-a876-c7e16027188f",
+			"type": "equipment",
+			"description": "Large Knife",
+			"reference": "B272",
+			"tech_level": "0",
+			"tags": [
+				"Melee Weapon",
+				"Missile Weapon"
+			],
+			"quantity": 1,
+			"value": 40,
+			"weight": "1 lb",
 			"weapons": [
 				{
-					"id": "8759c6ab-39fa-475c-9378-5329ad63a91c",
-					"type": "ranged_weapon",
+					"id": "6fe06673-89a4-4f1a-a415-51ae243c9cb0",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+1"
+						"type": "cut",
+						"st": "sw",
+						"base": "-2"
 					},
-					"strength": "11†",
-					"accuracy": "3",
-					"range": "165/220",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-8",
+					"strength": "6",
+					"usage": "Swung",
+					"reach": "C,1",
+					"parry": "-1",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Knife"
+						},
+						{
+							"type": "skill",
+							"name": "Force Sword",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Main-Gauche",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Shortsword",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "165/220",
-						"damage": "1d+1 imp"
+						"parry": "-1",
+						"block": "No",
+						"damage": "sw-2 cut"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 200,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "952d953f-8c41-4372-aba0-a8d6e7eecfe6",
-			"type": "equipment",
-			"description": "Longbow (ST12)",
-			"reference": "B275",
-			"tech_level": "0",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
-			],
-			"quantity": 1,
-			"value": 220,
-			"weight": "3 lb",
-			"weapons": [
+				},
 				{
-					"id": "25e5c87a-2bf3-454d-9af9-192d67c8ff21",
-					"type": "ranged_weapon",
+					"id": "3f42a716-3051-497f-b287-912095dffcd5",
+					"type": "melee_weapon",
 					"damage": {
 						"type": "imp",
-						"base": "1d+1"
+						"st": "thr"
 					},
-					"strength": "12†",
-					"accuracy": "3",
-					"range": "180/240",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-8",
+					"strength": "6",
+					"usage": "Thrust",
+					"reach": "C",
+					"parry": "-1",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Knife"
+						},
+						{
+							"type": "skill",
+							"name": "Force Sword",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Main-Gauche",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Shortsword",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "180/240",
-						"damage": "1d+1 imp"
+						"parry": "-1",
+						"block": "No",
+						"damage": "thr imp"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 220,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "f1185dc5-1867-47b0-951a-ccab158b2262",
-			"type": "equipment",
-			"description": "Longbow (ST13)",
-			"reference": "B275",
-			"tech_level": "0",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
-			],
-			"quantity": 1,
-			"value": 240,
-			"weight": "3 lb",
-			"weapons": [
+				},
 				{
-					"id": "cb9a6840-f056-422f-9272-b6f9e9da82d3",
+					"id": "ce852649-71ad-4350-b4c7-7d71931c4971",
 					"type": "ranged_weapon",
 					"damage": {
 						"type": "imp",
-						"base": "1d+2"
+						"st": "thr"
 					},
-					"strength": "13†",
-					"accuracy": "3",
-					"range": "195/260",
+					"strength": "6",
+					"usage": "Thrown",
+					"accuracy": "+0",
+					"range": "x0.8/x1.5",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-8",
+					"shots": "T(1)",
+					"bulk": "-2",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Thrown Weapon",
+							"specialization": "Knife"
 						}
 					],
 					"calc": {
-						"range": "195/260",
-						"damage": "1d+2 imp"
+						"range": "x0.8/x1.5",
+						"damage": "thr imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 240,
-				"extended_weight": "3 lb"
+				"extended_value": 40,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "474422d5-f081-4ee3-b09d-f2689dcca8a8",
+			"id": "dcd6a7b3-c390-48eb-a853-fdd4f97126df",
 			"type": "equipment",
-			"description": "Longbow (ST14)",
-			"reference": "B275",
+			"description": "Large Net",
+			"reference": "B276",
 			"tech_level": "0",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 260,
-			"weight": "3 lb",
+			"value": 40,
+			"weight": "20 lb",
 			"weapons": [
 				{
-					"id": "ec22891d-1fec-4350-9ee7-3bb4f1b83122",
+					"id": "7ead9760-81c0-4126-a098-abdbf6f90633",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+2"
+						"type": "see B411"
 					},
-					"strength": "14†",
-					"accuracy": "3",
-					"range": "210/280",
+					"strength": "11",
+					"accuracy": "1",
+					"range": "spec",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-8",
+					"shots": "T(1)",
+					"bulk": "-6",
 					"defaults": [
 						{
-							"type": "dx",
-							"modifier": -5
+							"type": "skill",
+							"name": "Net"
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Cloak",
+							"modifier": -5
 						}
 					],
 					"calc": {
-						"range": "210/280",
-						"damage": "1d+2 imp"
+						"range": "spec",
+						"damage": "see B411"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 260,
-				"extended_weight": "3 lb"
+				"extended_value": 40,
+				"extended_weight": "20 lb"
 			}
 		},
 		{
-			"id": "ae5cd24d-7898-4871-a0af-5646dbfa6f72",
+			"id": "e668e0a6-1ac3-45ec-96ce-ba7e49f51d84",
 			"type": "equipment",
-			"description": "Longbow (ST15)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Large Shield",
+			"reference": "B287",
+			"tech_level": "1",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Shield"
 			],
 			"quantity": 1,
-			"value": 280,
-			"weight": "3 lb",
+			"value": 90,
+			"weight": "25 lb",
 			"weapons": [
 				{
-					"id": "6831183c-1653-4a06-b67b-ceb402a96fe0",
-					"type": "ranged_weapon",
+					"id": "80b71d57-c5a9-4286-8cc1-e2ddcee800a8",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+3"
+						"type": "cr",
+						"st": "thr"
 					},
-					"strength": "15†",
-					"accuracy": "3",
-					"range": "225/300",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-8",
+					"strength": "0",
+					"usage": "Shield Bash",
+					"reach": "1",
+					"parry": "No",
+					"block": "+0",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Shield",
+							"specialization": "Buckler",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Shield",
+							"specialization": "Force Shield",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Shield",
+							"specialization": "Shield"
 						}
 					],
 					"calc": {
-						"range": "225/300",
-						"damage": "1d+3 imp"
+						"parry": "No",
+						"block": "+0",
+						"damage": "thr cr"
 					}
 				}
 			],
+			"features": [
+				{
+					"type": "attribute_bonus",
+					"attribute": "dodge",
+					"amount": 3
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "parry",
+					"amount": 3
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "block",
+					"amount": 3
+				}
+			],
 			"calc": {
-				"extended_value": 280,
-				"extended_weight": "3 lb"
+				"extended_value": 90,
+				"extended_weight": "25 lb"
 			}
 		},
 		{
-			"id": "64041edc-8b7e-46d6-9e0b-08fbb36f21e7",
+			"id": "9e94c02a-71bb-454b-b6f6-4f1876f509d9",
 			"type": "equipment",
-			"description": "Longbow (ST16)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Large Shield with Spike",
+			"reference": "B287",
+			"tech_level": "1",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Shield"
 			],
 			"quantity": 1,
-			"value": 300,
-			"weight": "3 lb",
+			"value": 110,
+			"weight": "30 lb",
 			"weapons": [
 				{
-					"id": "5f642c3d-1db7-400a-a0a2-85c688524b55",
-					"type": "ranged_weapon",
+					"id": "8b7d835b-196c-4de5-a000-6fd3e98f9e7c",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+3"
+						"type": "cr",
+						"st": "thr",
+						"base": "1"
 					},
-					"strength": "16†",
-					"accuracy": "3",
-					"range": "240/320",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-8",
+					"strength": "0",
+					"usage": "Shield Bash",
+					"reach": "1",
+					"parry": "No",
+					"block": "+0",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Shield",
+							"specialization": "Buckler",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Shield",
+							"specialization": "Force Shield",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Shield",
+							"specialization": "Shield"
 						}
 					],
 					"calc": {
-						"range": "240/320",
-						"damage": "1d+3 imp"
+						"parry": "No",
+						"block": "+0",
+						"damage": "thr+1 cr"
 					}
 				}
 			],
+			"features": [
+				{
+					"type": "attribute_bonus",
+					"attribute": "dodge",
+					"amount": 3
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "parry",
+					"amount": 3
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "block",
+					"amount": 3
+				}
+			],
 			"calc": {
-				"extended_value": 300,
-				"extended_weight": "3 lb"
+				"extended_value": 110,
+				"extended_weight": "30 lb"
 			}
 		},
 		{
-			"id": "4d10026a-0ee0-4292-b50f-e9f3139532af",
+			"id": "1bba6454-ce3a-4e08-9af6-7546c199a7a2",
 			"type": "equipment",
-			"description": "Longbow (ST17)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Lariat",
+			"reference": "B276",
+			"tech_level": "1",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 320,
+			"value": 40,
 			"weight": "3 lb",
 			"weapons": [
 				{
-					"id": "b1701b92-9a30-45e2-bb50-7d60fd0712de",
+					"id": "5c61395c-9bab-4ed4-b368-9e2e38a015d6",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+4"
+						"type": "see B411"
 					},
-					"strength": "17†",
-					"accuracy": "3",
-					"range": "255/340",
+					"strength": "7†",
+					"accuracy": "0",
+					"range": "spec",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-8",
+					"shots": "T(spec)",
+					"bulk": "-2",
 					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Lasso"
 						}
 					],
 					"calc": {
-						"range": "255/340",
-						"damage": "1d+4 imp"
+						"range": "spec",
+						"damage": "see B411"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 320,
+				"extended_value": 40,
 				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "de86bdfb-a96c-458b-9f70-33aec800cc57",
+			"id": "14a17acf-4a2f-443a-920f-fff7236893f0",
 			"type": "equipment",
-			"description": "Longbow (ST18)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Laser Microphone",
+			"reference": "B289",
+			"notes": "Eavesdrop through glass. 300-yd. range.",
+			"tech_level": "8",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Law-Enforcement",
+				"Spy Gear",
+				"Thief"
 			],
 			"quantity": 1,
-			"value": 340,
-			"weight": "3 lb",
-			"weapons": [
-				{
-					"id": "249eca39-8180-4f32-98fa-ed93d44f1ad6",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+4"
-					},
-					"strength": "18†",
-					"accuracy": "3",
-					"range": "270/360",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-8",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "270/360",
-						"damage": "1d+4 imp"
-					}
-				}
-			],
+			"value": 500,
+			"weight": "2 lb",
 			"calc": {
-				"extended_value": 340,
-				"extended_weight": "3 lb"
+				"extended_value": 500,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "70c2a847-3386-45ff-adc8-0f8fae62a4ad",
+			"id": "41b3444c-9a26-46c5-ba78-5612c6cbca8c",
 			"type": "equipment",
-			"description": "Longbow (ST19)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Laser Pistol",
+			"reference": "B280",
+			"tech_level": "10",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 360,
-			"weight": "3 lb",
+			"value": 2800,
+			"weight": "3.3 lb",
 			"weapons": [
 				{
-					"id": "06608250-764b-44ce-b69c-c30eb436ca4a",
+					"id": "7c82e735-c39f-4ea6-a096-33d18a47fce0",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d+1"
+						"type": "burn",
+						"base": "3d",
+						"armor_divisor": 2
 					},
-					"strength": "19†",
-					"accuracy": "3",
-					"range": "285/380",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-8",
+					"strength": "6",
+					"accuracy": "6",
+					"range": "250/750",
+					"rate_of_fire": "10",
+					"shots": "400(3)",
+					"bulk": "-2",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Pistol"
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Rifle",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Projector",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "285/380",
-						"damage": "2d+1 imp"
+						"range": "250/750",
+						"damage": "3d(2) burn"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 360,
-				"extended_weight": "3 lb"
+				"extended_value": 2800,
+				"extended_weight": "3.3 lb"
 			}
 		},
 		{
-			"id": "59a288c6-55f7-48aa-836e-51a09d107ece",
+			"id": "7fec071c-716e-4831-92bf-90cdd4238765",
 			"type": "equipment",
-			"description": "Longbow (ST20)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Laser Rifle",
+			"reference": "B280",
+			"tech_level": "10",
+			"legality_class": "2",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 380,
-			"weight": "3 lb",
+			"value": 10000,
+			"weight": "10 lb",
 			"weapons": [
 				{
-					"id": "6bc17e70-0955-4361-b0e5-e5e671af80e7",
+					"id": "1acb0b5f-f667-4735-a6ae-4f95b15b5f1e",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d+1"
+						"type": "burn",
+						"base": "5d",
+						"armor_divisor": 2
 					},
-					"strength": "20†",
-					"accuracy": "3",
-					"range": "300/400",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-8",
+					"strength": "7†",
+					"accuracy": "12+2",
+					"range": "700/2100",
+					"rate_of_fire": "10",
+					"shots": "150(3)",
+					"bulk": "-4",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Pistol",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Rifle"
+						},
+						{
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Projector",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "300/400",
-						"damage": "2d+1 imp"
+						"range": "700/2100",
+						"damage": "5d(2) burn"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 380,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "194c649c-bd70-479c-a222-02a540dfce47",
-			"type": "equipment",
-			"description": "Lorica Segmentata",
-			"reference": "B283",
-			"tech_level": "2",
-			"legality_class": "3",
-			"tags": [
-				"Body Armor"
-			],
-			"quantity": 1,
-			"value": 680,
-			"weight": "26 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 5
-				},
-				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 5
-				}
+				"extended_value": 10000,
+				"extended_weight": "10 lb"
+			}
+		},
+		{
+			"id": "8bee3f09-78f3-47d4-bef5-a84a23fa0074",
+			"type": "equipment",
+			"description": "Laser Sight",
+			"reference": "B289",
+			"notes": "+1 to skill; see Laser Sights (B412). 6 hrs.",
+			"tech_level": "8",
+			"tags": [
+				"Weapon and Combat Accessories"
 			],
+			"quantity": 1,
+			"value": 100,
 			"calc": {
-				"extended_value": 680,
-				"extended_weight": "26 lb"
+				"extended_value": 100,
+				"extended_weight": "0 lb"
 			}
 		},
 		{
-			"id": "76b78338-e7df-45f4-91d5-1217fb50e277",
+			"id": "42d9e464-801a-429b-8a8c-d2d6467baad0",
 			"type": "equipment",
-			"description": "Mace",
-			"reference": "B271",
-			"tech_level": "2",
+			"description": "Laser Sniper Rifle",
+			"reference": "B280",
+			"tech_level": "9",
+			"legality_class": "1",
 			"tags": [
-				"Melee Weapon",
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 50,
-			"weight": "5 lb",
+			"value": 20000,
+			"weight": "20 lb",
 			"weapons": [
 				{
-					"id": "446e19d4-cb30-46c6-a160-2c7a31728d89",
-					"type": "melee_weapon",
+					"id": "1b492dee-e2be-4647-b098-92a4c464e6b1",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "sw",
-						"base": "3"
+						"type": "burn",
+						"base": "5d",
+						"armor_divisor": 2
 					},
-					"strength": "12",
-					"usage": "Swung",
-					"reach": "1",
-					"parry": "0U",
-					"block": "No",
+					"strength": "10†",
+					"accuracy": "12+2",
+					"range": "1100/3300",
+					"rate_of_fire": "3",
+					"shots": "75(3)",
+					"bulk": "-8",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Axe/Mace"
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Flail",
+							"name": "Beam Weapons",
+							"specialization": "Pistol",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
-							"modifier": -3
-						}
-					],
-					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+3 cr"
-					}
-				},
-				{
-					"id": "72831d23-632b-4769-94e4-b3cbbed96690",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "sw",
-						"base": "3"
-					},
-					"strength": "12",
-					"accuracy": "1",
-					"range": "x0.5/x1",
-					"rate_of_fire": "1",
-					"shots": "T(1)",
-					"bulk": "-4",
-					"defaults": [
+							"name": "Beam Weapons",
+							"specialization": "Rifle"
+						},
 						{
-							"type": "dx",
+							"type": "skill",
+							"name": "Beam Weapons",
+							"specialization": "Projector",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Thrown Weapon",
-							"specialization": "Axe/Mace"
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "x0.5/x1",
-						"damage": "sw+3 cr"
+						"range": "1100/3300",
+						"damage": "5d(2) burn"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 50,
-				"extended_weight": "5 lb"
+				"extended_value": 20000,
+				"extended_weight": "20 lb"
 			}
 		},
 		{
-			"id": "5309c05a-282a-49e5-a639-e41465ded993",
+			"id": "731ecabc-94b5-4dad-9b17-e7dac2655624",
 			"type": "equipment",
-			"description": "Machine Pistol, 9mm",
-			"reference": "B278",
-			"tech_level": "7",
-			"legality_class": "2",
+			"description": "LAW, 84mm",
+			"reference": "B281",
+			"tech_level": "8",
+			"legality_class": "1",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 900,
-			"weight": "5.5 lb",
+			"value": 750,
+			"weight": "14.7 lb",
 			"weapons": [
 				{
-					"id": "8555d80a-7946-46b0-9770-d76d355cc46d",
+					"id": "6beafad8-c25e-4b40-bf7b-74e00caf8dd8",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "2d+2"
+						"type": "cr ex",
+						"base": "6dx6",
+						"armor_divisor": 10
 					},
-					"strength": "12",
-					"accuracy": "2",
-					"range": "160/1900",
-					"rate_of_fire": "20",
-					"shots": "25+1(3)",
-					"bulk": "-3",
-					"recoil": "3",
+					"strength": "10†",
+					"accuracy": "3",
+					"range": "330/2300",
+					"rate_of_fire": "1",
+					"shots": "1(-)",
+					"bulk": "-5",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
@@ -14147,36 +11180,37 @@
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Pistol",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Rifle",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Shotgun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Light Machine Gun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Submachine Gun"
+							"specialization": "Submachine Gun",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Musket",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
@@ -14193,8 +11227,7 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
+							"specialization": "Light Anti-Armor Weapon"
 						},
 						{
 							"type": "skill",
@@ -14202,281 +11235,314 @@
 						}
 					],
 					"calc": {
-						"range": "160/1900",
-						"damage": "2d+2 pi"
+						"range": "330/2300",
+						"damage": "6dx6(10) cr ex"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 900,
-				"extended_weight": "5.5 lb"
+				"extended_value": 750,
+				"extended_weight": "14.7 lb"
+			}
+		},
+		{
+			"id": "8da53d73-c624-4f33-b9e8-30c3ed64d63e",
+			"type": "equipment",
+			"description": "Lead Pellet (Prodd)",
+			"reference": "B276",
+			"tech_level": "2",
+			"tags": [
+				"AmmoType:Prodd",
+				"Ammunition",
+				"Missile Weapon"
+			],
+			"quantity": 1,
+			"value": 0.1,
+			"weight": "0.06 lb",
+			"calc": {
+				"extended_value": 0.1,
+				"extended_weight": "0.06 lb"
+			}
+		},
+		{
+			"id": "efcbbdf2-431b-4388-a2d7-2e003eb341a6",
+			"type": "equipment",
+			"description": "Lead Pellet (Sling)",
+			"reference": "B276",
+			"notes": "Gives +1 damage, double range",
+			"tech_level": "2",
+			"tags": [
+				"AmmoType:Sling",
+				"Ammunition",
+				"Missile Weapon"
+			],
+			"quantity": 1,
+			"value": 0.1,
+			"weight": "0.05 lb",
+			"calc": {
+				"extended_value": 0.1,
+				"extended_weight": "0.05 lb"
+			}
+		},
+		{
+			"id": "adb76193-a473-4869-bf41-8b59186700bb",
+			"type": "equipment",
+			"description": "Leather Armor",
+			"reference": "B283",
+			"tech_level": "1",
+			"tags": [
+				"Body Armor"
+			],
+			"quantity": 1,
+			"value": 100,
+			"weight": "10 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "torso",
+					"amount": 2
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 2
+				},
+				{
+					"type": "dr_bonus",
+					"location": "groin",
+					"amount": 2
+				}
+			],
+			"calc": {
+				"extended_value": 100,
+				"extended_weight": "10 lb"
+			}
+		},
+		{
+			"id": "d63ed2a8-bb6f-48fc-85d9-a153f9d4f209",
+			"type": "equipment",
+			"description": "Leather Cap",
+			"reference": "B284",
+			"notes": "Flexible",
+			"tech_level": "1",
+			"tags": [
+				"Headgear"
+			],
+			"quantity": 1,
+			"value": 32,
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "skull",
+					"amount": 1
+				}
+			],
+			"calc": {
+				"extended_value": 32,
+				"extended_weight": "0 lb"
 			}
 		},
 		{
-			"id": "385eeeb1-aea0-47e7-abb4-9afbcf910925",
+			"id": "61adda9f-0e5d-4b9f-850c-10af2bd8de70",
 			"type": "equipment",
-			"description": "Mail Coif",
+			"description": "Leather Gloves",
 			"reference": "B284",
 			"notes": "Flexible",
-			"tech_level": "2",
-			"legality_class": "3",
+			"tech_level": "1",
 			"tags": [
-				"Headgear"
+				"Gloves"
 			],
 			"quantity": 1,
-			"value": 55,
-			"weight": "4 lb",
+			"value": 30,
 			"features": [
 				{
 					"type": "dr_bonus",
-					"location": "skull",
-					"amount": 4
-				},
-				{
-					"type": "dr_bonus",
-					"location": "neck",
-					"amount": 4
-				},
+					"location": "hand",
+					"amount": 2
+				}
+			],
+			"calc": {
+				"extended_value": 30,
+				"extended_weight": "0 lb"
+			}
+		},
+		{
+			"id": "c59c7612-9b24-48ea-930c-1dc1a1561f37",
+			"type": "equipment",
+			"description": "Leather Helm",
+			"reference": "B284",
+			"tech_level": "1",
+			"tags": [
+				"Headgear"
+			],
+			"quantity": 1,
+			"value": 20,
+			"weight": "0.5 lb",
+			"features": [
 				{
 					"type": "dr_bonus",
 					"location": "skull",
-					"specialization": "crushing",
-					"amount": -2
+					"amount": 2
 				},
 				{
 					"type": "dr_bonus",
-					"location": "neck",
-					"specialization": "crushing",
-					"amount": -2
+					"location": "face",
+					"amount": 2
 				}
 			],
 			"calc": {
-				"extended_value": 55,
-				"extended_weight": "4 lb"
+				"extended_value": 20,
+				"extended_weight": "0.5 lb"
 			}
 		},
 		{
-			"id": "5a7af382-f3d8-432b-b028-4f0b317d11e6",
+			"id": "d9004e6a-a9d3-4157-9593-514a7490f757",
 			"type": "equipment",
-			"description": "Mail Hauberk",
+			"description": "Leather Jacket",
 			"reference": "B283",
-			"notes": "Flexible",
-			"tech_level": "2",
-			"legality_class": "3",
+			"notes": "Flexible, concealable",
+			"tech_level": "1",
 			"tags": [
 				"Body Armor"
 			],
 			"quantity": 1,
-			"value": 230,
-			"weight": "25 lb",
+			"value": 50,
+			"weight": "4 lb",
 			"features": [
 				{
 					"type": "dr_bonus",
 					"location": "torso",
-					"amount": 4
-				},
-				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 4
-				},
-				{
-					"type": "dr_bonus",
-					"location": "groin",
-					"amount": 4
-				},
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"specialization": "crushing",
-					"amount": -2
+					"amount": 1
 				},
 				{
 					"type": "dr_bonus",
 					"location": "vitals",
-					"specialization": "crushing",
-					"amount": -2
+					"amount": 1
 				},
 				{
 					"type": "dr_bonus",
-					"location": "groin",
-					"specialization": "crushing",
-					"amount": -2
+					"location": "arm",
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 230,
-				"extended_weight": "25 lb"
+				"extended_value": 50,
+				"extended_weight": "4 lb"
 			}
 		},
 		{
-			"id": "e2359914-a9ab-4ea7-be49-e75915c7ef01",
+			"id": "45f62c17-563d-44fd-89b6-ebf101a622bc",
 			"type": "equipment",
-			"description": "Mail Leggings",
+			"description": "Leather Leggings",
 			"reference": "B283",
-			"notes": "Flexible",
-			"tech_level": "2",
-			"legality_class": "3",
+			"notes": "Flexible, concealable",
+			"tech_level": "1",
 			"tags": [
 				"Limb Armor"
 			],
 			"quantity": 1,
-			"value": 110,
-			"weight": "15 lb",
+			"value": 40,
+			"weight": "2 lb",
 			"features": [
 				{
 					"type": "dr_bonus",
 					"location": "leg",
-					"amount": 4
-				},
-				{
-					"type": "dr_bonus",
-					"location": "leg",
-					"specialization": "crushing",
-					"amount": -2
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 110,
-				"extended_weight": "15 lb"
+				"extended_value": 40,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "7fad5741-f26e-4b5e-a5ef-e1c08ebffb93",
+			"id": "a761b2e6-2181-478b-a212-6bb41f7d5fa6",
 			"type": "equipment",
-			"description": "Mail Shirt",
+			"description": "Leather Pants",
 			"reference": "B283",
 			"notes": "Flexible, concealable",
-			"tech_level": "2",
+			"tech_level": "1",
 			"tags": [
-				"Body Armor"
+				"Limb Armor"
 			],
 			"quantity": 1,
-			"value": 150,
-			"weight": "16 lb",
+			"value": 40,
+			"weight": "3 lb",
 			"features": [
 				{
 					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 4
-				},
-				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 4
-				},
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"specialization": "crushing",
-					"amount": -2
+					"location": "groin",
+					"amount": 1
 				},
 				{
 					"type": "dr_bonus",
-					"location": "vitals",
-					"specialization": "crushing",
-					"amount": -2
+					"location": "leg",
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 150,
-				"extended_weight": "16 lb"
+				"extended_value": 40,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "745dbaad-b4df-4f05-b8ac-bf224b1877b2",
+			"id": "82e9c394-d65e-42d1-85ea-7fcca4a81184",
 			"type": "equipment",
-			"description": "Mail Sleeves",
-			"reference": "B283",
-			"notes": "Flexible",
+			"description": "Legionary Helmet",
+			"reference": "B284",
 			"tech_level": "2",
 			"legality_class": "3",
 			"tags": [
-				"Limb Armor"
+				"Headgear"
 			],
 			"quantity": 1,
-			"value": 70,
-			"weight": "9 lb",
+			"value": 150,
+			"weight": "6 lb",
 			"features": [
 				{
 					"type": "dr_bonus",
-					"location": "arm",
+					"location": "skull",
 					"amount": 4
 				},
 				{
 					"type": "dr_bonus",
-					"location": "arm",
-					"specialization": "crushing",
-					"amount": -2
+					"location": "face",
+					"amount": 4
 				}
 			],
 			"calc": {
-				"extended_value": 70,
-				"extended_weight": "9 lb"
-			}
-		},
-		{
-			"id": "4daffac3-5719-44a0-a0fd-2c756d5cbe86",
-			"type": "equipment",
-			"description": "Match, Single, Waterproof",
-			"reference": "B288",
-			"tech_level": "6",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 0.3,
-			"weight": "0.001 lb",
-			"calc": {
-				"extended_value": 0.3,
-				"extended_weight": "0.001 lb"
-			}
-		},
-		{
-			"id": "2d42970e-e7c0-4e35-b4ec-207c6e9cb232",
-			"type": "equipment",
-			"description": "Matches, Waterproof",
-			"reference": "B288",
-			"notes": "Box of 50",
-			"tech_level": "6",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 1.5,
-			"weight": "0.051 lb",
-			"calc": {
-				"extended_value": 1.5,
-				"extended_weight": "0.051 lb"
+				"extended_value": 150,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "43d7737f-d473-47f2-8930-93f653439adf",
+			"id": "4dc07041-259a-4990-9ec1-138f46fd257e",
 			"type": "equipment",
-			"description": "Matchlock Musket, .80",
+			"description": "Lever-Action Carbine, .30",
 			"reference": "B279",
-			"tech_level": "4",
+			"tech_level": "5",
+			"legality_class": "3",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 150,
-			"weight": "20 lb",
+			"value": 300,
+			"weight": "7 lb",
 			"weapons": [
 				{
-					"id": "a2b78cc0-5d6d-4f22-a454-47d180d338ff",
+					"id": "947d7127-a444-4436-baad-32ce95205272",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi++",
-						"base": "4d"
+						"type": "pi",
+						"base": "5d"
 					},
-					"strength": "10R†",
-					"accuracy": "2",
-					"range": "100/600",
+					"strength": "10†",
+					"accuracy": "4",
+					"range": "450/3000",
 					"rate_of_fire": "1",
-					"shots": "1(60)",
-					"bulk": "-6",
-					"recoil": "3",
+					"shots": "6+1(3i)",
+					"bulk": "-4",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
@@ -14491,8 +11557,7 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -2
+							"specialization": "Rifle"
 						},
 						{
 							"type": "skill",
@@ -14515,7 +11580,8 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Musket"
+							"specialization": "Musket",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
@@ -14541,94 +11607,49 @@
 						}
 					],
 					"calc": {
-						"range": "100/600",
-						"damage": "4d pi++"
+						"range": "450/3000",
+						"damage": "5d pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 150,
-				"extended_weight": "20 lb"
+				"extended_value": 300,
+				"extended_weight": "7 lb"
 			}
 		},
 		{
-			"id": "23640e67-b554-49f1-a7e9-d6cbe9a8670b",
+			"id": "1faaa7ba-267d-4ded-a03f-ff851c52942f",
 			"type": "equipment",
-			"description": "Maul",
-			"reference": "B274",
-			"tech_level": "0",
+			"description": "Life Jacket",
+			"reference": "B288",
+			"notes": "Floats up to 350 lbs.",
+			"tech_level": "6",
 			"tags": [
-				"Melee Weapon"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 80,
-			"weight": "12 lb",
-			"weapons": [
-				{
-					"id": "a381d818-2974-407e-823d-1db893882778",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "sw",
-						"base": "4"
-					},
-					"strength": "13‡",
-					"usage": "Swung",
-					"reach": "1,2*",
-					"parry": "0U",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Axe/Mace"
-						},
-						{
-							"type": "skill",
-							"name": "Axe/Mace",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Polearm",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Flail",
-							"modifier": -4
-						}
-					],
-					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+4 cr"
-					}
-				}
-			],
+			"value": 100,
+			"weight": "6 lb",
 			"calc": {
-				"extended_value": 80,
-				"extended_weight": "12 lb"
+				"extended_value": 100,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "91776d7d-5f92-4b4b-8615-ef3931a1ae08",
+			"id": "b4a0a0dd-cad1-4b46-ad4d-50c0c87e35c4",
 			"type": "equipment",
-			"description": "Medium Buckler",
+			"description": "Light Buckler",
 			"reference": "B287",
 			"tech_level": "1",
 			"tags": [
 				"Shield"
 			],
 			"quantity": 1,
-			"value": 60,
-			"weight": "15 lb",
+			"value": 25,
+			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "cdc6889b-1f28-4744-adb5-4090f1c6b971",
+					"id": "b4b414f8-495f-450a-b6c5-d46705ef9c2d",
 					"type": "melee_weapon",
 					"damage": {
 						"type": "cr",
@@ -14672,39 +11693,39 @@
 				{
 					"type": "attribute_bonus",
 					"attribute": "dodge",
-					"amount": 2
+					"amount": 1
 				},
 				{
 					"type": "attribute_bonus",
 					"attribute": "parry",
-					"amount": 2
+					"amount": 1
 				},
 				{
 					"type": "attribute_bonus",
 					"attribute": "block",
-					"amount": 2
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 60,
-				"extended_weight": "15 lb"
+				"extended_value": 25,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "f73b3114-c273-47da-b40d-165671484055",
+			"id": "25023e6a-7512-456b-8f37-5167956f80b9",
 			"type": "equipment",
-			"description": "Medium Buckler with Spike",
+			"description": "Light Buckler with Spike",
 			"reference": "B287",
 			"tech_level": "1",
 			"tags": [
 				"Shield"
 			],
 			"quantity": 1,
-			"value": 80,
-			"weight": "20 lb",
+			"value": 45,
+			"weight": "7 lb",
 			"weapons": [
 				{
-					"id": "e6f1db3e-745e-43c5-8936-7ca59799b973",
+					"id": "5a322b0b-1f9b-4ee4-9af9-66ca6d41474a",
 					"type": "melee_weapon",
 					"damage": {
 						"type": "cr",
@@ -14749,74 +11770,95 @@
 				{
 					"type": "attribute_bonus",
 					"attribute": "dodge",
-					"amount": 2
+					"amount": 1
 				},
 				{
 					"type": "attribute_bonus",
 					"attribute": "parry",
-					"amount": 2
+					"amount": 1
 				},
 				{
 					"type": "attribute_bonus",
 					"attribute": "block",
-					"amount": 2
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 80,
-				"extended_weight": "20 lb"
+				"extended_value": 45,
+				"extended_weight": "7 lb"
 			}
 		},
 		{
-			"id": "38d7564b-46a6-4b89-9297-b237c432969a",
+			"id": "9897dd28-709a-41ed-be47-244b9d6b663a",
 			"type": "equipment",
-			"description": "Medium Shield",
+			"description": "Light Cloak",
 			"reference": "B287",
 			"tech_level": "1",
 			"tags": [
-				"Shield"
+				"Clothing"
 			],
 			"quantity": 1,
-			"value": 60,
-			"weight": "15 lb",
+			"value": 20,
+			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "6e671ffc-1163-4bf0-b5c7-e2ca9868be51",
+					"id": "82f4656c-74ca-47a6-a5e5-208a54a4bf3e",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "thr"
+						"type": "-"
 					},
-					"strength": "0",
-					"usage": "Shield Bash",
-					"reach": "1",
+					"strength": "-",
+					"reach": "-",
 					"parry": "No",
 					"block": "+0",
+					"defaults": [
+						{
+							"type": "block",
+							"name": "Cloak"
+						}
+					],
+					"calc": {
+						"parry": "No",
+						"block": "+0",
+						"damage": "-"
+					}
+				},
+				{
+					"id": "011f5041-1acd-4e0d-835d-f14eb04d86d2",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "Special"
+					},
+					"strength": "5",
+					"usage": "Thrown",
+					"accuracy": "+1",
+					"range": "2",
+					"rate_of_fire": "1",
+					"shots": "T(1)",
+					"bulk": "-4",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -4
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Buckler"
+							"name": "Cloak"
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Force Shield"
+							"name": "Net",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Shield",
-							"specialization": "Shield"
+							"modifier": -4
 						}
 					],
 					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "thr cr"
+						"range": "2",
+						"damage": "Special"
 					}
 				}
 			],
@@ -14824,590 +11866,488 @@
 				{
 					"type": "attribute_bonus",
 					"attribute": "dodge",
-					"amount": 2
+					"amount": 1
 				},
 				{
 					"type": "attribute_bonus",
 					"attribute": "parry",
-					"amount": 2
+					"amount": 1
 				},
 				{
 					"type": "attribute_bonus",
 					"attribute": "block",
-					"amount": 2
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 60,
-				"extended_weight": "15 lb"
+				"extended_value": 20,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "5b8e6ea4-3586-422a-8a17-2627c0d345a1",
+			"id": "4fe16008-c0e5-453b-b6de-ab2d47678dd0",
 			"type": "equipment",
-			"description": "Medium Shield with Spike",
-			"reference": "B287",
-			"tech_level": "1",
+			"description": "Light Club",
+			"reference": "B271",
+			"tech_level": "0",
 			"tags": [
-				"Shield"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 80,
-			"weight": "20 lb",
+			"value": 5,
+			"weight": "3 lb",
 			"weapons": [
 				{
-					"id": "8a59a243-4c88-4b8c-95f2-64d0246068d2",
+					"id": "3865e69a-4d81-406e-844d-e8cc2b0bcddb",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "cr",
+						"st": "sw",
+						"base": "1"
+					},
+					"strength": "10",
+					"usage": "Swung",
+					"reach": "1",
+					"parry": "0",
+					"block": "No",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Force Sword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Broadsword"
+						},
+						{
+							"type": "skill",
+							"name": "Rapier",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Saber",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Shortsword",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Sword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
+						}
+					],
+					"calc": {
+						"parry": "0",
+						"block": "No",
+						"damage": "sw+1 cr"
+					}
+				},
+				{
+					"id": "480b3768-4946-4e04-b117-3d1b843b36f3",
 					"type": "melee_weapon",
 					"damage": {
 						"type": "cr",
 						"st": "thr",
 						"base": "1"
 					},
-					"strength": "0",
-					"usage": "Shield Bash",
+					"strength": "10",
+					"usage": "Thrust",
 					"reach": "1",
-					"parry": "No",
-					"block": "+0",
+					"parry": "0",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Force Sword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Buckler",
-							"modifier": -2
+							"name": "Broadsword"
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Force Shield",
-							"modifier": -2
+							"name": "Rapier",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Shield",
-							"specialization": "Shield"
-						}
-					],
-					"calc": {
-						"parry": "No",
-						"block": "+0",
-						"damage": "thr+1 cr"
-					}
-				}
-			],
-			"features": [
-				{
-					"type": "attribute_bonus",
-					"attribute": "dodge",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "parry",
-					"amount": 2
-				},
-				{
-					"type": "attribute_bonus",
-					"attribute": "block",
-					"amount": 2
-				}
-			],
-			"calc": {
-				"extended_value": 80,
-				"extended_weight": "20 lb"
-			}
-		},
-		{
-			"id": "80a9fc6e-7ddb-4482-9d0c-7a5e8b3a9c2a",
-			"type": "equipment",
-			"description": "Melee Net",
-			"reference": "B276",
-			"tech_level": "2",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 20,
-			"weight": "5 lb",
-			"weapons": [
-				{
-					"id": "8a04a1f4-3e62-46e2-9c8a-5aff7b29acba",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "see B411"
-					},
-					"strength": "8",
-					"accuracy": "1",
-					"range": "spec",
-					"rate_of_fire": "1",
-					"shots": "T(1)",
-					"bulk": "-4",
-					"defaults": [
+							"name": "Saber",
+							"modifier": -4
+						},
 						{
 							"type": "skill",
-							"name": "Net"
+							"name": "Shortsword",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Cloak",
-							"modifier": -5
+							"name": "Two-Handed Sword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "spec",
-						"damage": "see B411"
+						"parry": "0",
+						"block": "No",
+						"damage": "thr+1 cr"
 					}
 				}
 			],
-			"calc": {
-				"extended_value": 20,
-				"extended_weight": "5 lb"
-			}
-		},
-		{
-			"id": "2d81debe-6404-4e50-8ae6-265f54543c5c",
-			"type": "equipment",
-			"description": "Metal Detector Wand",
-			"reference": "B289",
-			"notes": "+3 to find metal items. 8 hrs.",
-			"tech_level": "7",
-			"tags": [
-				"Optics and Sensors"
-			],
-			"quantity": 1,
-			"value": 50,
-			"weight": "3 lb",
-			"calc": {
-				"extended_value": 50,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "d3ce3024-4a58-4e27-8e17-f48d42305224",
-			"type": "equipment",
-			"description": "Mini-Camera, Digital",
-			"reference": "B289",
-			"notes": "Stores pictures on optical disk.",
-			"tech_level": "8",
-			"tags": [
-				"Optics and Sensors"
-			],
-			"quantity": 1,
-			"value": 500,
-			"calc": {
-				"extended_value": 500,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "f68fd32a-de9f-4fbc-bea4-e8837e72bc90",
-			"type": "equipment",
-			"description": "Mini-Recorder",
-			"reference": "B288",
-			"notes": "Palm-sized, with 3-hour tape",
-			"tech_level": "7",
-			"tags": [
-				"Communications and Information Gear"
-			],
-			"quantity": 1,
-			"value": 200,
-			"weight": "0.5 lb",
-			"calc": {
-				"extended_value": 200,
-				"extended_weight": "0.5 lb"
-			}
-		},
-		{
-			"id": "80bbcaec-694b-468f-b861-1b2d857296f7",
-			"type": "equipment",
-			"description": "Mini-Recorder, Digital",
-			"reference": "B288",
-			"notes": "Palm-sized, 3 hrs. recording time",
-			"tech_level": "8",
-			"tags": [
-				"Communications and Information Gear"
-			],
-			"quantity": 1,
-			"calc": {
-				"extended_value": 0,
-				"extended_weight": "0 lb"
-			}
-		},
-		{
-			"id": "206783bd-56c7-47bc-b6f8-d79a87671e37",
-			"type": "equipment",
-			"description": "Mini-Recorder-Tape",
-			"reference": "B288",
-			"notes": "3-hour tape",
-			"tech_level": "7",
-			"tags": [
-				"Communications and Information Gear"
-			],
-			"quantity": 1,
-			"value": 5,
 			"calc": {
 				"extended_value": 5,
-				"extended_weight": "0 lb"
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "e397c046-6eee-41e2-b06f-5442c70efe4c",
+			"id": "84b24820-ffec-4e27-9d24-9bf1841cd712",
 			"type": "equipment",
-			"description": "Molotov Cocktail",
-			"reference": "B277",
-			"notes": "Fuse spec.",
-			"tech_level": "6",
-			"legality_class": "3",
+			"description": "Light Scale Armor",
+			"reference": "B283",
+			"tech_level": "2",
 			"tags": [
-				"Missile Weapon"
+				"Body Armor"
 			],
 			"quantity": 1,
-			"weight": "1 lb",
-			"weapons": [
+			"value": 150,
+			"weight": "15 lb",
+			"features": [
 				{
-					"id": "8539779e-dafc-4b94-a8e6-4b96e6bba2b8",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "spec. (1 y)"
-					},
-					"accuracy": "0",
-					"range": "x3.5",
-					"rate_of_fire": "1",
-					"shots": "1",
-					"bulk": "0",
-					"recoil": "0",
-					"defaults": [
-						{
-							"type": "skill",
-							"name": "Throwing"
-						}
-					],
-					"calc": {
-						"range": "x3.5",
-						"damage": "spec. (1 y)"
-					}
+					"type": "dr_bonus",
+					"location": "torso",
+					"amount": 3
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 3
 				}
 			],
 			"calc": {
-				"extended_value": 0,
-				"extended_weight": "1 lb"
+				"extended_value": 150,
+				"extended_weight": "15 lb"
 			}
 		},
 		{
-			"id": "2199917d-0b0c-4858-8203-37f38ac383ce",
+			"id": "14db8275-310b-447c-9902-91bd888797a7",
 			"type": "equipment",
-			"description": "Monowire Whip",
-			"reference": "B272",
-			"tech_level": "^",
+			"description": "Light Shield",
+			"reference": "B287",
+			"tech_level": "1",
 			"tags": [
-				"Melee Weapon"
+				"Shield"
 			],
 			"quantity": 1,
-			"value": 900,
-			"weight": "0.5 lb",
+			"value": 25,
+			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "01345620-2cb3-4754-94ad-02745b25cca0",
+					"id": "0618a376-0a92-49df-abb3-65a8f2fc3b96",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "1d-2",
-						"armor_divisor": 10
+						"type": "cr",
+						"st": "thr"
 					},
-					"strength": "5",
-					"reach": "1-7*",
-					"parry": "-2U",
-					"block": "No",
+					"strength": "0",
+					"usage": "Shield Bash",
+					"reach": "1",
+					"parry": "No",
+					"block": "+0",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -6
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Monowire Whip"
+							"name": "Shield",
+							"specialization": "Buckler",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Kusari",
-							"modifier": -3
+							"name": "Shield",
+							"specialization": "Force Shield",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Whip",
-							"modifier": -3
+							"name": "Shield",
+							"specialization": "Shield"
 						}
 					],
 					"calc": {
-						"parry": "-2U",
-						"block": "No",
-						"damage": "sw+1d-2(10) cut"
+						"parry": "No",
+						"block": "+0",
+						"damage": "thr cr"
 					}
 				}
 			],
+			"features": [
+				{
+					"type": "attribute_bonus",
+					"attribute": "dodge",
+					"amount": 1
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "parry",
+					"amount": 1
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "block",
+					"amount": 1
+				}
+			],
 			"calc": {
-				"extended_value": 900,
-				"extended_weight": "0.5 lb"
+				"extended_value": 25,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "08292e5d-ba57-4a9a-845b-f3cdf3db9f69",
+			"id": "6e40f71f-bbb8-4668-ab74-3c51fcc2b57a",
 			"type": "equipment",
-			"description": "Morningstar",
-			"reference": "B272",
-			"tech_level": "3",
+			"description": "Light Shield with Spike",
+			"reference": "B287",
+			"tech_level": "1",
 			"tags": [
-				"Melee Weapon"
+				"Shield"
 			],
 			"quantity": 1,
-			"value": 80,
-			"weight": "6 lb",
+			"value": 45,
+			"weight": "7 lb",
 			"weapons": [
 				{
-					"id": "882f3807-fe47-427a-b2c7-745b9263866c",
+					"id": "dd86e590-368d-4f6e-8422-901fdbc0c716",
 					"type": "melee_weapon",
 					"damage": {
 						"type": "cr",
-						"st": "sw",
-						"base": "3"
+						"st": "thr",
+						"base": "1"
 					},
-					"strength": "12",
-					"usage": "Swung",
-					"usage_notes": "Attempts to parry this weapon are at -4 and fencing weapons may not parry it at all; attempts to block this weapon are at -2",
+					"strength": "0",
+					"usage": "Shield Bash",
 					"reach": "1",
-					"parry": "0U",
-					"block": "No",
+					"parry": "No",
+					"block": "+0",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -6
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Flail"
+							"name": "Shield",
+							"specialization": "Buckler",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Axe/Mace",
-							"modifier": -4
+							"name": "Shield",
+							"specialization": "Force Shield",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Flail",
-							"modifier": -3
+							"name": "Shield",
+							"specialization": "Shield"
 						}
 					],
 					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+3 cr"
+						"parry": "No",
+						"block": "+0",
+						"damage": "thr+1 cr"
 					}
 				}
 			],
+			"features": [
+				{
+					"type": "attribute_bonus",
+					"attribute": "dodge",
+					"amount": 2
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "parry",
+					"amount": 2
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "block",
+					"amount": 2
+				}
+			],
 			"calc": {
-				"extended_value": 80,
-				"extended_weight": "6 lb"
+				"extended_value": 45,
+				"extended_weight": "7 lb"
 			}
 		},
 		{
-			"id": "446500a8-c65f-4edd-a08d-a204530928ba",
+			"id": "f6e1f935-cd69-4f10-a5e0-b0b586c0944b",
 			"type": "equipment",
-			"description": "Naginata",
-			"reference": "B272",
-			"tech_level": "2",
+			"description": "LMG, 7.62mm",
+			"reference": "B281",
+			"tech_level": "6",
+			"legality_class": "1",
 			"tags": [
-				"Melee Weapon"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 100,
-			"weight": "6 lb",
+			"value": 6600,
+			"weight": "30 lb",
 			"weapons": [
 				{
-					"id": "a91628a9-2868-44d0-8e4b-3cc7e33ef9b5",
-					"type": "melee_weapon",
+					"id": "836f48f1-031d-40c6-bb00-47f280f55ede",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "2"
+						"type": "pi",
+						"base": "7d"
 					},
-					"strength": "9†",
-					"usage": "Swung",
-					"usage_notes": "The sharp end, Polearm",
-					"reach": "1,2*",
-					"parry": "0U",
-					"block": "No",
+					"strength": "13B†",
+					"accuracy": "5",
+					"range": "1000/4200",
+					"rate_of_fire": "15!",
+					"shots": "100(5)",
+					"bulk": "-6",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Polearm"
-						},
-						{
-							"type": "skill",
-							"name": "Spear",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Staff",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
-							"modifier": -4
-						}
-					],
-					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+2 cut"
-					}
-				},
-				{
-					"id": "b717054f-0296-489c-85d0-3771e28e57cf",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "3"
-					},
-					"strength": "9†",
-					"usage": "Thrust",
-					"usage_notes": "The sharp end, Polearm",
-					"reach": "2",
-					"parry": "0",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Polearm"
-						},
-						{
-							"type": "skill",
-							"name": "Spear",
-							"modifier": -4
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Staff",
-							"modifier": -4
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
-							"modifier": -4
-						}
-					],
-					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "thr+3 imp"
-					}
-				},
-				{
-					"id": "015f8ef5-2014-4bc3-b563-35b6d4f1fe46",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "sw",
-						"base": "2"
-					},
-					"strength": "9†",
-					"usage": "Swung",
-					"usage_notes": "The blunt end",
-					"reach": "1,2",
-					"parry": "0U",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Staff"
+							"name": "Guns",
+							"specialization": "Light Machine Gun"
 						},
 						{
 							"type": "skill",
-							"name": "Polearm",
-							"modifier": -4
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Spear",
+							"name": "Guns",
+							"specialization": "Musket",
 							"modifier": -2
-						}
-					],
-					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+2 cr"
-					}
-				},
-				{
-					"id": "4dd49169-5dea-4510-ab5e-77755f4d046f",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "thr",
-						"base": "2"
-					},
-					"strength": "9†",
-					"usage": "Thrust",
-					"usage_notes": "The blunt end",
-					"reach": "1,2",
-					"parry": "0",
-					"block": "No",
-					"defaults": [
+						},
 						{
-							"type": "dx",
-							"modifier": -5
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Staff"
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Polearm",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Spear",
-							"modifier": -2
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "thr+2 cr"
+						"range": "1000/4200",
+						"damage": "7d pi"
 					}
-				},
+				}
+			],
+			"calc": {
+				"extended_value": 6600,
+				"extended_weight": "30 lb"
+			}
+		},
+		{
+			"id": "22132718-3cfb-47ef-8d51-885630ad3595",
+			"type": "equipment",
+			"description": "Lockpicks",
+			"reference": "B289",
+			"notes": "Basic equipment for Lockpicking skill",
+			"tech_level": "3",
+			"tags": [
+				"Law-Enforcement",
+				"Spy Gear",
+				"Thief"
+			],
+			"quantity": 1,
+			"value": 50,
+			"calc": {
+				"extended_value": 50,
+				"extended_weight": "0 lb"
+			}
+		},
+		{
+			"id": "85326fe5-7a04-4dab-9850-5a5b616de040",
+			"type": "equipment",
+			"description": "Long Spear",
+			"reference": "B273",
+			"tech_level": "2",
+			"tags": [
+				"Melee Weapon"
+			],
+			"quantity": 1,
+			"value": 60,
+			"weight": "5 lb",
+			"weapons": [
 				{
-					"id": "c41e9d0f-1637-4932-be20-4d14377f0743",
+					"id": "1d36612d-fa72-47d7-b738-781ef216a18d",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "3"
+						"type": "imp",
+						"st": "thr",
+						"base": "2"
 					},
-					"strength": "9†",
-					"usage": "Swung",
-					"usage_notes": "Two-handed sword",
-					"reach": "2",
+					"strength": "10",
+					"usage": "Thrust",
+					"reach": "2,3*",
 					"parry": "0U",
 					"block": "No",
 					"defaults": [
@@ -15417,41 +12357,36 @@
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Sword"
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword",
-							"modifier": -4
+							"name": "Spear"
 						},
 						{
 							"type": "skill",
-							"name": "Force Sword",
+							"name": "Polearm",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Sword!"
+							"name": "Staff",
+							"modifier": -2
 						}
 					],
 					"calc": {
 						"parry": "0U",
 						"block": "No",
-						"damage": "sw+3 cut"
+						"damage": "thr+2 imp"
 					}
 				},
 				{
-					"id": "0d3877ae-d343-466b-b498-ce3f85794f8c",
+					"id": "f44c24e9-3193-4ced-8349-3dc3dac4e970",
 					"type": "melee_weapon",
 					"damage": {
 						"type": "imp",
 						"st": "thr",
 						"base": "3"
 					},
-					"strength": "9†",
+					"strength": "10†",
 					"usage": "Thrust",
-					"usage_notes": "Two-handed sword",
-					"reach": "2",
+					"reach": "2,3*",
 					"parry": "0",
 					"block": "No",
 					"defaults": [
@@ -15461,21 +12396,17 @@
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Sword"
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword",
-							"modifier": -4
+							"name": "Spear"
 						},
 						{
 							"type": "skill",
-							"name": "Force Sword",
+							"name": "Polearm",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Sword!"
+							"name": "Staff",
+							"modifier": -2
 						}
 					],
 					"calc": {
@@ -15486,246 +12417,207 @@
 				}
 			],
 			"calc": {
-				"extended_value": 100,
-				"extended_weight": "6 lb"
-			}
-		},
-		{
-			"id": "32fe758f-a69d-4244-94a0-3b75cd9bee3a",
-			"type": "equipment",
-			"description": "Nanobug",
-			"reference": "B289",
-			"notes": "Pinhead-sized audio-visual bug (-10 to spot)",
-			"tech_level": "8",
-			"tags": [
-				"Law-Enforcement",
-				"Spy Gear",
-				"Thief"
-			],
-			"quantity": 1,
-			"value": 100,
-			"calc": {
-				"extended_value": 100,
-				"extended_weight": "0 lb"
+				"extended_value": 60,
+				"extended_weight": "5 lb"
 			}
 		},
 		{
-			"id": "b1a2ade4-5008-4d89-9574-a725ae7a8f0d",
+			"id": "ed6a89d0-5636-4c2a-9319-db5ab3a37f2a",
 			"type": "equipment",
-			"description": "NBC Suit",
-			"reference": "B285",
-			"tech_level": "7",
+			"description": "Longbow",
+			"reference": "B275",
+			"tech_level": "0",
 			"tags": [
-				"Environment Suits"
+				"Missile Weapon",
+				"UsesAmmoType:Arrow"
 			],
+			"rated_strength": 11,
 			"quantity": 1,
-			"value": 150,
-			"weight": "3.5 lb",
-			"prereqs": {
-				"type": "prereq_list",
-				"all": true,
-				"prereqs": [
-					{
-						"type": "skill_prereq",
-						"has": true,
-						"name": {
-							"compare": "is",
-							"qualifier": "nbc suit"
-						}
-					}
-				]
-			},
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "skull",
-					"amount": 1
-				},
-				{
-					"type": "dr_bonus",
-					"location": "neck",
-					"amount": 1
-				},
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 1
-				},
-				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 1
-				},
-				{
-					"type": "dr_bonus",
-					"location": "groin",
-					"amount": 1
-				},
-				{
-					"type": "dr_bonus",
-					"location": "arm",
-					"amount": 1
-				},
-				{
-					"type": "dr_bonus",
-					"location": "hand",
-					"amount": 1
-				},
-				{
-					"type": "dr_bonus",
-					"location": "leg",
-					"amount": 1
-				},
+			"value": 200,
+			"weight": "3 lb",
+			"weapons": [
 				{
-					"type": "dr_bonus",
-					"location": "foot",
-					"amount": 1
+					"id": "8759c6ab-39fa-475c-9378-5329ad63a91c",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "imp",
+						"st": "thr",
+						"base": "2"
+					},
+					"strength": "11†",
+					"accuracy": "3",
+					"range": "x15/x20",
+					"rate_of_fire": "1",
+					"shots": "1(2)",
+					"bulk": "-8",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Bow"
+						}
+					],
+					"calc": {
+						"range": "x15/x20",
+						"damage": "thr+2 imp"
+					}
 				}
 			],
 			"calc": {
-				"extended_value": 150,
-				"extended_weight": "3.5 lb"
+				"extended_value": 200,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "7644647f-2a35-4775-8738-74ecb3c2168f",
+			"id": "194c649c-bd70-479c-a222-02a540dfce47",
 			"type": "equipment",
-			"description": "Night Vision Goggles",
-			"reference": "B289",
-			"notes": "Give Night Vision 9. 8 hrs.",
-			"tech_level": "8",
+			"description": "Lorica Segmentata",
+			"reference": "B283",
+			"tech_level": "2",
+			"legality_class": "3",
 			"tags": [
-				"Optics and Sensors"
+				"Body Armor"
 			],
 			"quantity": 1,
-			"value": 600,
-			"weight": "2 lb",
+			"value": 680,
+			"weight": "26 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "torso",
+					"amount": 5
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 5
+				}
+			],
 			"calc": {
-				"extended_value": 600,
-				"extended_weight": "2 lb"
+				"extended_value": 680,
+				"extended_weight": "26 lb"
 			}
 		},
 		{
-			"id": "ba28f6c7-4c8c-46d8-8cad-5db971451ebf",
+			"id": "76b78338-e7df-45f4-91d5-1217fb50e277",
 			"type": "equipment",
-			"description": "Nunchaku",
-			"reference": "B272",
-			"tech_level": "3",
+			"description": "Mace",
+			"reference": "B271",
+			"tech_level": "2",
 			"tags": [
-				"Melee Weapon"
+				"Melee Weapon",
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 20,
-			"weight": "2 lb",
+			"value": 50,
+			"weight": "5 lb",
 			"weapons": [
 				{
-					"id": "d6b68540-bdf2-4d9b-b68c-dcd3bc1b514d",
+					"id": "446e19d4-cb30-46c6-a160-2c7a31728d89",
 					"type": "melee_weapon",
 					"damage": {
 						"type": "cr",
 						"st": "sw",
-						"base": "1"
+						"base": "3"
 					},
-					"strength": "7",
+					"strength": "12",
 					"usage": "Swung",
-					"usage_notes": "Attempts to parry this weapon are at -2 and fencing weapons may not parry it at all; attempts to block this weapon are at -1",
 					"reach": "1",
 					"parry": "0U",
 					"block": "No",
 					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -5
+						},
 						{
 							"type": "skill",
-							"name": "Flail"
+							"name": "Axe/Mace"
 						},
 						{
 							"type": "skill",
-							"name": "Axe/Mace",
+							"name": "Flail",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Flail",
+							"name": "Two-Handed Axe/Mace",
 							"modifier": -3
-						},
-						{
-							"type": "dx",
-							"modifier": -6
 						}
 					],
 					"calc": {
 						"parry": "0U",
 						"block": "No",
-						"damage": "sw+1 cr"
+						"damage": "sw+3 cr"
+					}
+				},
+				{
+					"id": "72831d23-632b-4769-94e4-b3cbbed96690",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "cr",
+						"st": "sw",
+						"base": "3"
+					},
+					"strength": "12",
+					"accuracy": "1",
+					"range": "x0.5/x1",
+					"rate_of_fire": "1",
+					"shots": "T(1)",
+					"bulk": "-4",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Thrown Weapon",
+							"specialization": "Axe/Mace"
+						}
+					],
+					"calc": {
+						"range": "x0.5/x1",
+						"damage": "sw+3 cr"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 20,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "2d780bd0-acf1-444b-bfff-6e45121889b1",
-			"type": "equipment",
-			"description": "Oil, Lantern, 1 Pint",
-			"reference": "B288",
-			"tech_level": "2",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 2,
-			"weight": "1 lb",
-			"calc": {
-				"extended_value": 2,
-				"extended_weight": "1 lb"
-			}
-		},
-		{
-			"id": "efb4c06f-b4ef-4403-9cc8-0a7c3d48fa15",
-			"type": "equipment",
-			"description": "Parachute",
-			"reference": "B288",
-			"tech_level": "6",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 1000,
-			"weight": "30 lb",
-			"calc": {
-				"extended_value": 1000,
-				"extended_weight": "30 lb"
+				"extended_value": 50,
+				"extended_weight": "5 lb"
 			}
 		},
 		{
-			"id": "c919e84b-fa78-4bed-b97c-6fcc9d5e2e7a",
+			"id": "5309c05a-282a-49e5-a639-e41465ded993",
 			"type": "equipment",
-			"description": "PDW, 4.6mm",
+			"description": "Machine Pistol, 9mm",
 			"reference": "B278",
-			"tech_level": "8",
+			"tech_level": "7",
 			"legality_class": "2",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 800,
-			"weight": "3.9 lb",
+			"value": 900,
+			"weight": "5.5 lb",
 			"weapons": [
 				{
-					"id": "bc426378-e6d8-4ffd-a56e-22381bb1e10c",
+					"id": "8555d80a-7946-46b0-9770-d76d355cc46d",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi-",
-						"base": "4d+1"
+						"type": "pi",
+						"base": "2d+2"
 					},
-					"strength": "7†",
-					"accuracy": "3",
-					"range": "200/2000",
-					"rate_of_fire": "15",
-					"shots": "20+1(3)",
+					"strength": "12",
+					"accuracy": "2",
+					"range": "160/1900",
+					"rate_of_fire": "20",
+					"shots": "25+1(3)",
 					"bulk": "-3",
-					"recoil": "2",
+					"recoil": "3",
 					"defaults": [
 						{
 							"type": "dx",
@@ -15781,483 +12673,290 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
-						}
-					],
-					"calc": {
-						"range": "200/2000",
-						"damage": "4d+1 pi-"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 800,
-				"extended_weight": "3.9 lb"
-			}
-		},
-		{
-			"id": "b5bb2b27-5828-42d2-b117-0a88db0f1fbf",
-			"type": "equipment",
-			"description": "Personal Basics",
-			"reference": "B288",
-			"notes": "Minimum gear for camping: -2 to any Survival roll without it. Includes utensils, tinderbox or flint and steel, towel, etc., as TL permits.",
-			"tech_level": "0",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 5,
-			"weight": "1 lb",
-			"calc": {
-				"extended_value": 5,
-				"extended_weight": "1 lb"
-			}
-		},
-		{
-			"id": "9c37c2a9-2488-459f-bfbf-f0945b3fdc2b",
-			"type": "equipment",
-			"description": "Pick",
-			"reference": "B271",
-			"notes": "May get stuck",
-			"tech_level": "3",
-			"tags": [
-				"Melee Weapon"
-			],
-			"quantity": 1,
-			"value": 70,
-			"weight": "3 lb",
-			"weapons": [
-				{
-					"id": "2b078e64-f32d-4600-b197-528e67e0ec2a",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "sw",
-						"base": "1"
-					},
-					"strength": "10",
-					"usage": "Swung",
-					"reach": "1",
-					"parry": "0U",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Axe/Mace"
-						},
-						{
-							"type": "skill",
-							"name": "Flail",
+							"specialization": "Light Anti-Armor Weapon",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
-							"modifier": -3
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+1 imp"
+						"range": "160/1900",
+						"damage": "2d+2 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 70,
-				"extended_weight": "3 lb"
+				"extended_value": 900,
+				"extended_weight": "5.5 lb"
 			}
 		},
 		{
-			"id": "fb4d9188-c4d9-4d82-9c1d-49dbc83e22a4",
+			"id": "385eeeb1-aea0-47e7-abb4-9afbcf910925",
 			"type": "equipment",
-			"description": "Pickaxe",
-			"reference": "B289",
-			"notes": "Improves digging speed",
+			"description": "Mail Coif",
+			"reference": "B284",
+			"notes": "Flexible",
 			"tech_level": "2",
+			"legality_class": "3",
 			"tags": [
-				"Tools"
-			],
-			"quantity": 1,
-			"value": 15,
-			"weight": "8 lb",
-			"calc": {
-				"extended_value": 15,
-				"extended_weight": "8 lb"
-			}
-		},
-		{
-			"id": "fc58ab4e-4b06-4fbc-bfb9-6efaf6decc52",
-			"type": "equipment",
-			"description": "Pistol Crossbow (ST7)",
-			"reference": "B276",
-			"tech_level": "3",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Headgear"
 			],
 			"quantity": 1,
-			"value": 150,
+			"value": 55,
 			"weight": "4 lb",
-			"weapons": [
+			"features": [
 				{
-					"id": "5e3257b7-30d3-431d-8f2a-e6bc491f02e2",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d-1"
-					},
-					"strength": "7",
-					"accuracy": "1",
-					"range": "105/140",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "105/140",
-						"damage": "1d-1 imp"
-					}
+					"type": "dr_bonus",
+					"location": "skull",
+					"amount": 4
+				},
+				{
+					"type": "dr_bonus",
+					"location": "neck",
+					"amount": 4
+				},
+				{
+					"type": "dr_bonus",
+					"location": "skull",
+					"specialization": "crushing",
+					"amount": -2
+				},
+				{
+					"type": "dr_bonus",
+					"location": "neck",
+					"specialization": "crushing",
+					"amount": -2
 				}
 			],
 			"calc": {
-				"extended_value": 150,
+				"extended_value": 55,
 				"extended_weight": "4 lb"
 			}
 		},
 		{
-			"id": "04e0b545-a451-4162-af60-9f600c7be2bd",
+			"id": "5a7af382-f3d8-432b-b028-4f0b317d11e6",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST8)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Mail Hauberk",
+			"reference": "B283",
+			"notes": "Flexible",
+			"tech_level": "2",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Body Armor"
 			],
 			"quantity": 1,
-			"value": 165,
-			"weight": "4 lb",
-			"weapons": [
+			"value": 230,
+			"weight": "25 lb",
+			"features": [
 				{
-					"id": "83ad71e5-018d-4bbb-b30d-9d5797ebaf75",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d-1"
-					},
-					"strength": "8",
-					"accuracy": "1",
-					"range": "120/160",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "120/160",
-						"damage": "1d-1 imp"
-					}
+					"type": "dr_bonus",
+					"location": "torso",
+					"amount": 4
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 4
+				},
+				{
+					"type": "dr_bonus",
+					"location": "groin",
+					"amount": 4
+				},
+				{
+					"type": "dr_bonus",
+					"location": "torso",
+					"specialization": "crushing",
+					"amount": -2
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"specialization": "crushing",
+					"amount": -2
+				},
+				{
+					"type": "dr_bonus",
+					"location": "groin",
+					"specialization": "crushing",
+					"amount": -2
 				}
 			],
 			"calc": {
-				"extended_value": 165,
-				"extended_weight": "4 lb"
+				"extended_value": 230,
+				"extended_weight": "25 lb"
 			}
 		},
 		{
-			"id": "93d06c7e-9864-49f4-8c9d-3f69fff6fffa",
+			"id": "e2359914-a9ab-4ea7-be49-e75915c7ef01",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST9)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Mail Leggings",
+			"reference": "B283",
+			"notes": "Flexible",
+			"tech_level": "2",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Limb Armor"
 			],
 			"quantity": 1,
-			"value": 180,
-			"weight": "4 lb",
-			"weapons": [
+			"value": 110,
+			"weight": "15 lb",
+			"features": [
 				{
-					"id": "cd25dc0a-fd52-4dc6-b363-c623a9bd937b",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d"
-					},
-					"strength": "9",
-					"accuracy": "1",
-					"range": "135/180",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "135/180",
-						"damage": "1d imp"
-					}
+					"type": "dr_bonus",
+					"location": "leg",
+					"amount": 4
+				},
+				{
+					"type": "dr_bonus",
+					"location": "leg",
+					"specialization": "crushing",
+					"amount": -2
 				}
 			],
 			"calc": {
-				"extended_value": 180,
-				"extended_weight": "4 lb"
+				"extended_value": 110,
+				"extended_weight": "15 lb"
 			}
 		},
 		{
-			"id": "9e942559-efcb-414f-9e6a-9f3f01d562e0",
+			"id": "7fad5741-f26e-4b5e-a5ef-e1c08ebffb93",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST10)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Mail Shirt",
+			"reference": "B283",
+			"notes": "Flexible, concealable",
+			"tech_level": "2",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Body Armor"
 			],
 			"quantity": 1,
-			"value": 195,
-			"weight": "4 lb",
-			"weapons": [
+			"value": 150,
+			"weight": "16 lb",
+			"features": [
 				{
-					"id": "8507d767-eb14-4a43-8104-fd8a35ba29c7",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d"
-					},
-					"strength": "10",
-					"accuracy": "1",
-					"range": "150/200",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "150/200",
-						"damage": "1d imp"
-					}
+					"type": "dr_bonus",
+					"location": "torso",
+					"amount": 4
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 4
+				},
+				{
+					"type": "dr_bonus",
+					"location": "torso",
+					"specialization": "crushing",
+					"amount": -2
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"specialization": "crushing",
+					"amount": -2
 				}
 			],
 			"calc": {
-				"extended_value": 195,
-				"extended_weight": "4 lb"
+				"extended_value": 150,
+				"extended_weight": "16 lb"
 			}
 		},
 		{
-			"id": "d90083f9-6c7c-4593-aec3-70c094444e5c",
+			"id": "745dbaad-b4df-4f05-b8ac-bf224b1877b2",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST11)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Mail Sleeves",
+			"reference": "B283",
+			"notes": "Flexible",
+			"tech_level": "2",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Limb Armor"
 			],
 			"quantity": 1,
-			"value": 210,
-			"weight": "4 lb",
-			"weapons": [
+			"value": 70,
+			"weight": "9 lb",
+			"features": [
 				{
-					"id": "e3fb4b0f-68d3-420f-a054-3650311678e6",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+1"
-					},
-					"strength": "11",
-					"accuracy": "1",
-					"range": "165/220",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "165/220",
-						"damage": "1d+1 imp"
-					}
+					"type": "dr_bonus",
+					"location": "arm",
+					"amount": 4
+				},
+				{
+					"type": "dr_bonus",
+					"location": "arm",
+					"specialization": "crushing",
+					"amount": -2
 				}
 			],
 			"calc": {
-				"extended_value": 210,
-				"extended_weight": "4 lb"
+				"extended_value": 70,
+				"extended_weight": "9 lb"
 			}
 		},
 		{
-			"id": "5fdf9742-1066-4e7a-a9c4-f97054ade5e3",
+			"id": "4daffac3-5719-44a0-a0fd-2c756d5cbe86",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST12)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Match, Single, Waterproof",
+			"reference": "B288",
+			"tech_level": "6",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 225,
-			"weight": "4 lb",
-			"weapons": [
-				{
-					"id": "c1591e3d-a8fb-4936-86cf-3876cd922570",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+1"
-					},
-					"strength": "12",
-					"accuracy": "1",
-					"range": "180/240",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "180/240",
-						"damage": "1d+1 imp"
-					}
-				}
-			],
+			"value": 0.3,
+			"weight": "0.001 lb",
 			"calc": {
-				"extended_value": 225,
-				"extended_weight": "4 lb"
+				"extended_value": 0.3,
+				"extended_weight": "0.001 lb"
 			}
 		},
 		{
-			"id": "f7a45b1f-a093-46da-9208-bf2221540ead",
+			"id": "2d42970e-e7c0-4e35-b4ec-207c6e9cb232",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST13)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Matches, Waterproof",
+			"reference": "B288",
+			"notes": "Box of 50",
+			"tech_level": "6",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 240,
-			"weight": "4 lb",
-			"weapons": [
-				{
-					"id": "941540a0-7fdb-40ce-b561-9fc202c4675c",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+2"
-					},
-					"strength": "13",
-					"accuracy": "1",
-					"range": "195/260",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "195/260",
-						"damage": "1d+2 imp"
-					}
-				}
-			],
+			"value": 1.5,
+			"weight": "0.051 lb",
 			"calc": {
-				"extended_value": 240,
-				"extended_weight": "4 lb"
+				"extended_value": 1.5,
+				"extended_weight": "0.051 lb"
 			}
 		},
 		{
-			"id": "b05e5bfd-8b9d-4832-add6-f21592397d43",
+			"id": "43d7737f-d473-47f2-8930-93f653439adf",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST14)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Matchlock Musket, .80",
+			"reference": "B279",
+			"tech_level": "4",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 255,
-			"weight": "4 lb",
+			"value": 150,
+			"weight": "20 lb",
 			"weapons": [
 				{
-					"id": "5aa6eeda-eda4-4322-ae0b-125971475677",
+					"id": "a2b78cc0-5d6d-4f22-a454-47d180d338ff",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+2"
+						"type": "pi++",
+						"base": "4d"
 					},
-					"strength": "14",
-					"accuracy": "1",
-					"range": "210/280",
+					"strength": "10R†",
+					"accuracy": "2",
+					"range": "100/600",
 					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
+					"shots": "1(60)",
+					"bulk": "-6",
+					"recoil": "3",
 					"defaults": [
 						{
 							"type": "dx",
@@ -16265,191 +12964,160 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "210/280",
-						"damage": "1d+2 imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 255,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "6a578f96-7a49-49fe-851f-d67a071af296",
-			"type": "equipment",
-			"description": "Pistol Crossbow (ST15)",
-			"reference": "B276",
-			"tech_level": "3",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
-			],
-			"quantity": 1,
-			"value": 270,
-			"weight": "4 lb",
-			"weapons": [
-				{
-					"id": "66fb2980-d71e-4370-a916-1ee9cc7bf35e",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+3"
-					},
-					"strength": "15",
-					"accuracy": "1",
-					"range": "225/300",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
-					"defaults": [
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -2
+						},
 						{
-							"type": "dx",
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "225/300",
-						"damage": "1d+3 imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 270,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "63ebe6ec-9812-4901-aeda-b6c63548bef2",
-			"type": "equipment",
-			"description": "Pistol Crossbow (ST16)",
-			"reference": "B276",
-			"tech_level": "3",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
-			],
-			"quantity": 1,
-			"value": 285,
-			"weight": "4 lb",
-			"weapons": [
-				{
-					"id": "6b8a4af8-6295-4c8d-b59c-c8f2175231b0",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d+3"
-					},
-					"strength": "16",
-					"accuracy": "1",
-					"range": "240/320",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
-					"defaults": [
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
 						{
-							"type": "dx",
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "240/320",
-						"damage": "1d+3 imp"
+						"range": "100/600",
+						"damage": "4d pi++"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 285,
-				"extended_weight": "4 lb"
+				"extended_value": 150,
+				"extended_weight": "20 lb"
 			}
 		},
 		{
-			"id": "2ea7a4cd-189c-40a8-86eb-ceffecca7fe7",
+			"id": "23640e67-b554-49f1-a7e9-d6cbe9a8670b",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST17)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Maul",
+			"reference": "B274",
+			"tech_level": "0",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 300,
-			"weight": "4 lb",
+			"value": 80,
+			"weight": "12 lb",
 			"weapons": [
 				{
-					"id": "2b3e9ada-1061-4e54-b2d3-682956d245d8",
-					"type": "ranged_weapon",
+					"id": "a381d818-2974-407e-823d-1db893882778",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d"
+						"type": "cr",
+						"st": "sw",
+						"base": "4"
 					},
-					"strength": "17",
-					"accuracy": "1",
-					"range": "255/340",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
+					"strength": "13‡",
+					"usage": "Swung",
+					"reach": "1,2*",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Axe/Mace"
+						},
+						{
+							"type": "skill",
+							"name": "Axe/Mace",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Polearm",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Two-Handed Flail",
+							"modifier": -4
 						}
 					],
 					"calc": {
-						"range": "255/340",
-						"damage": "2d imp"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+4 cr"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 300,
-				"extended_weight": "4 lb"
+				"extended_value": 80,
+				"extended_weight": "12 lb"
 			}
 		},
 		{
-			"id": "bc2fd485-8d8c-4fc0-88c2-b4d21cd39d9f",
+			"id": "91776d7d-5f92-4b4b-8615-ef3931a1ae08",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST18)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Medium Buckler",
+			"reference": "B287",
+			"tech_level": "1",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Shield"
 			],
 			"quantity": 1,
-			"value": 315,
-			"weight": "4 lb",
+			"value": 60,
+			"weight": "15 lb",
 			"weapons": [
 				{
-					"id": "734eb45b-6232-4312-9b61-b27434424e1b",
-					"type": "ranged_weapon",
+					"id": "cdc6889b-1f28-4744-adb5-4090f1c6b971",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d"
+						"type": "cr",
+						"st": "thr"
 					},
-					"strength": "18",
-					"accuracy": "1",
-					"range": "270/360",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
+					"strength": "0",
+					"reach": "1",
+					"parry": "No",
+					"block": "+0",
 					"defaults": [
 						{
 							"type": "dx",
@@ -16457,47 +13125,76 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Shield",
+							"specialization": "Shield",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Shield",
+							"specialization": "Force Shield",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Shield",
+							"specialization": "Buckler"
 						}
 					],
 					"calc": {
-						"range": "270/360",
-						"damage": "2d imp"
+						"parry": "No",
+						"block": "+0",
+						"damage": "thr cr"
 					}
 				}
 			],
+			"features": [
+				{
+					"type": "attribute_bonus",
+					"attribute": "dodge",
+					"amount": 2
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "parry",
+					"amount": 2
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "block",
+					"amount": 2
+				}
+			],
 			"calc": {
-				"extended_value": 315,
-				"extended_weight": "4 lb"
+				"extended_value": 60,
+				"extended_weight": "15 lb"
 			}
 		},
 		{
-			"id": "502808e1-2c8f-46b8-8b78-3a785c08b8f5",
+			"id": "f73b3114-c273-47da-b40d-165671484055",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST19)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Medium Buckler with Spike",
+			"reference": "B287",
+			"tech_level": "1",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Shield"
 			],
 			"quantity": 1,
-			"value": 330,
-			"weight": "4 lb",
+			"value": 80,
+			"weight": "20 lb",
 			"weapons": [
 				{
-					"id": "f3b4d4ec-e149-4170-a9b7-1a72184d3900",
-					"type": "ranged_weapon",
+					"id": "e6f1db3e-745e-43c5-8936-7ca59799b973",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d+1"
+						"type": "cr",
+						"st": "thr",
+						"base": "1"
 					},
-					"strength": "19",
-					"accuracy": "1",
-					"range": "285/380",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
+					"strength": "0",
+					"reach": "1",
+					"parry": "No",
+					"block": "+0",
 					"defaults": [
 						{
 							"type": "dx",
@@ -16505,47 +13202,76 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Shield",
+							"specialization": "Shield",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Shield",
+							"specialization": "Force Shield",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Shield",
+							"specialization": "Buckler"
 						}
 					],
 					"calc": {
-						"range": "285/380",
-						"damage": "2d+1 imp"
+						"parry": "No",
+						"block": "+0",
+						"damage": "thr+1 cr"
 					}
 				}
 			],
+			"features": [
+				{
+					"type": "attribute_bonus",
+					"attribute": "dodge",
+					"amount": 2
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "parry",
+					"amount": 2
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "block",
+					"amount": 2
+				}
+			],
 			"calc": {
-				"extended_value": 330,
-				"extended_weight": "4 lb"
+				"extended_value": 80,
+				"extended_weight": "20 lb"
 			}
 		},
 		{
-			"id": "fdc71c5e-461d-44d5-ae7f-3f6619a3ec25",
+			"id": "38d7564b-46a6-4b89-9297-b237c432969a",
 			"type": "equipment",
-			"description": "Pistol Crossbow (ST20)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Medium Shield",
+			"reference": "B287",
+			"tech_level": "1",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Bolt"
+				"Shield"
 			],
 			"quantity": 1,
-			"value": 345,
-			"weight": "4 lb",
+			"value": 60,
+			"weight": "15 lb",
 			"weapons": [
 				{
-					"id": "c751424d-2a73-465d-afb6-0124479cd00f",
-					"type": "ranged_weapon",
+					"id": "6e671ffc-1163-4bf0-b5c7-e2ca9868be51",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d+1"
+						"type": "cr",
+						"st": "thr"
 					},
-					"strength": "20",
-					"accuracy": "1",
-					"range": "300/400",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-4",
+					"strength": "0",
+					"usage": "Shield Bash",
+					"reach": "1",
+					"parry": "No",
+					"block": "+0",
 					"defaults": [
 						{
 							"type": "dx",
@@ -16553,833 +13279,933 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Shield",
+							"specialization": "Buckler"
+						},
+						{
+							"type": "skill",
+							"name": "Shield",
+							"specialization": "Force Shield"
+						},
+						{
+							"type": "skill",
+							"name": "Shield",
+							"specialization": "Shield"
 						}
 					],
 					"calc": {
-						"range": "300/400",
-						"damage": "2d+1 imp"
+						"parry": "No",
+						"block": "+0",
+						"damage": "thr cr"
 					}
 				}
 			],
-			"calc": {
-				"extended_value": 345,
-				"extended_weight": "4 lb"
-			}
-		},
-		{
-			"id": "2233ed4f-6b04-43df-b759-ad7465fbce89",
-			"type": "equipment",
-			"description": "Plate Arms",
-			"reference": "B283",
-			"tech_level": "3",
-			"legality_class": "3",
-			"tags": [
-				"Limb Armor"
-			],
-			"quantity": 1,
-			"value": 1000,
-			"weight": "15 lb",
 			"features": [
 				{
-					"type": "dr_bonus",
-					"location": "arm",
-					"amount": 6
-				}
-			],
-			"calc": {
-				"extended_value": 1000,
-				"extended_weight": "15 lb"
-			}
-		},
-		{
-			"id": "cf4a327d-0b0f-4d0f-aa05-b202073611d0",
-			"type": "equipment",
-			"description": "Plate Legs",
-			"reference": "B283",
-			"tech_level": "3",
-			"legality_class": "3",
-			"tags": [
-				"Limb Armor"
-			],
-			"quantity": 1,
-			"value": 1100,
-			"weight": "20 lb",
-			"features": [
+					"type": "attribute_bonus",
+					"attribute": "dodge",
+					"amount": 2
+				},
 				{
-					"type": "dr_bonus",
-					"location": "leg",
-					"amount": 6
+					"type": "attribute_bonus",
+					"attribute": "parry",
+					"amount": 2
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "block",
+					"amount": 2
 				}
 			],
 			"calc": {
-				"extended_value": 1100,
-				"extended_weight": "20 lb"
-			}
-		},
-		{
-			"id": "c45aa7d6-6bec-4c8c-be04-03b67291381b",
-			"type": "equipment",
-			"description": "Plow, Iron",
-			"reference": "B289",
-			"notes": "Works rough soils",
-			"tech_level": "2",
-			"tags": [
-				"Tools"
-			],
-			"quantity": 1,
-			"value": 220,
-			"weight": "120 lb",
-			"calc": {
-				"extended_value": 220,
-				"extended_weight": "120 lb"
+				"extended_value": 60,
+				"extended_weight": "15 lb"
 			}
 		},
 		{
-			"id": "6a0814cf-565f-4c70-8e04-0620bb193693",
+			"id": "5b8e6ea4-3586-422a-8a17-2627c0d345a1",
 			"type": "equipment",
-			"description": "Plow, Wooden",
-			"reference": "B289",
-			"notes": "Pulled by oxen",
+			"description": "Medium Shield with Spike",
+			"reference": "B287",
 			"tech_level": "1",
 			"tags": [
-				"Tools"
-			],
-			"quantity": 1,
-			"value": 55,
-			"weight": "60 lb",
-			"calc": {
-				"extended_value": 55,
-				"extended_weight": "60 lb"
-			}
-		},
-		{
-			"id": "b6cdb4bc-8233-47c0-a372-4c302e743a2b",
-			"type": "equipment",
-			"description": "Pole, 6'",
-			"reference": "B288",
-			"tech_level": "0",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 5,
-			"weight": "3 lb",
-			"calc": {
-				"extended_value": 5,
-				"extended_weight": "3 lb"
-			}
-		},
-		{
-			"id": "fdb0a736-7e10-4885-9773-b99730da5121",
-			"type": "equipment",
-			"description": "Pole, 10'",
-			"reference": "B288",
-			"tech_level": "0",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 8,
-			"weight": "5 lb",
-			"calc": {
-				"extended_value": 8,
-				"extended_weight": "5 lb"
-			}
-		},
-		{
-			"id": "a80507f2-f16e-4299-98ee-3cdb1bb2a00c",
-			"type": "equipment",
-			"description": "Poleaxe",
-			"reference": "B272",
-			"tech_level": "3",
-			"tags": [
-				"Melee Weapon"
+				"Shield"
 			],
 			"quantity": 1,
-			"value": 120,
-			"weight": "10 lb",
+			"value": 80,
+			"weight": "20 lb",
 			"weapons": [
 				{
-					"id": "d73fe4ab-819b-44e9-846b-8e4c6ba4d775",
+					"id": "8a59a243-4c88-4b8c-95f2-64d0246068d2",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "4"
+						"type": "cr",
+						"st": "thr",
+						"base": "1"
 					},
-					"strength": "12‡",
-					"usage": "Swung",
-					"reach": "2,3*",
-					"parry": "0U",
-					"block": "No",
+					"strength": "0",
+					"usage": "Shield Bash",
+					"reach": "1",
+					"parry": "No",
+					"block": "+0",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Polearm"
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Spear",
-							"modifier": -4
+							"name": "Shield",
+							"specialization": "Buckler",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Staff",
-							"modifier": -4
+							"name": "Shield",
+							"specialization": "Force Shield",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
-							"modifier": -4
+							"name": "Shield",
+							"specialization": "Shield"
 						}
 					],
 					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+4 cut"
+						"parry": "No",
+						"block": "+0",
+						"damage": "thr+1 cr"
 					}
+				}
+			],
+			"features": [
+				{
+					"type": "attribute_bonus",
+					"attribute": "dodge",
+					"amount": 2
 				},
 				{
-					"id": "d4226613-a7ee-468f-9bbe-be1154d40687",
-					"type": "melee_weapon",
+					"type": "attribute_bonus",
+					"attribute": "parry",
+					"amount": 2
+				},
+				{
+					"type": "attribute_bonus",
+					"attribute": "block",
+					"amount": 2
+				}
+			],
+			"calc": {
+				"extended_value": 80,
+				"extended_weight": "20 lb"
+			}
+		},
+		{
+			"id": "80a9fc6e-7ddb-4482-9d0c-7a5e8b3a9c2a",
+			"type": "equipment",
+			"description": "Melee Net",
+			"reference": "B276",
+			"tech_level": "2",
+			"tags": [
+				"Missile Weapon"
+			],
+			"quantity": 1,
+			"value": 20,
+			"weight": "5 lb",
+			"weapons": [
+				{
+					"id": "8a04a1f4-3e62-46e2-9c8a-5aff7b29acba",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "sw",
-						"base": "4"
+						"type": "see B411"
 					},
-					"strength": "12‡",
-					"usage": "Swung",
-					"reach": "2,3*",
-					"parry": "0U",
-					"block": "No",
+					"strength": "8",
+					"accuracy": "1",
+					"range": "spec",
+					"rate_of_fire": "1",
+					"shots": "T(1)",
+					"bulk": "-4",
 					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Polearm"
-						},
 						{
 							"type": "skill",
-							"name": "Spear",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Staff",
-							"modifier": -4
+							"name": "Net"
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Axe/Mace",
-							"modifier": -4
+							"name": "Cloak",
+							"modifier": -5
 						}
 					],
 					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+4 cr"
+						"range": "spec",
+						"damage": "see B411"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 120,
-				"extended_weight": "10 lb"
-			}
-		},
-		{
-			"id": "b90d149c-028d-48bb-8034-458058f7d01c",
-			"type": "equipment",
-			"description": "Portable Tool Kit, Armoury",
-			"reference": "B289",
-			"tech_level": "1",
-			"tags": [
-				"Tools"
-			],
-			"quantity": 1,
-			"value": 600,
-			"weight": "20 lb",
-			"calc": {
-				"extended_value": 600,
-				"extended_weight": "20 lb"
-			}
-		},
-		{
-			"id": "90eb9460-0e07-48e5-afd7-d7716c21945e",
-			"type": "equipment",
-			"description": "Portable Tool Kit, Carpentry",
-			"reference": "B289",
-			"tech_level": "1",
-			"tags": [
-				"Tools"
-			],
-			"quantity": 1,
-			"value": 300,
-			"weight": "20 lb",
-			"calc": {
-				"extended_value": 300,
-				"extended_weight": "20 lb"
+				"extended_value": 20,
+				"extended_weight": "5 lb"
 			}
 		},
 		{
-			"id": "92df7f4e-c572-45ba-8afd-c84ce7ce2b0d",
+			"id": "2d81debe-6404-4e50-8ae6-265f54543c5c",
 			"type": "equipment",
-			"description": "Portable Tool Kit, Electrician",
+			"description": "Metal Detector Wand",
 			"reference": "B289",
-			"tech_level": "6",
+			"notes": "+3 to find metal items. 8 hrs.",
+			"tech_level": "7",
 			"tags": [
-				"Tools"
+				"Optics and Sensors"
 			],
 			"quantity": 1,
-			"value": 600,
-			"weight": "20 lb",
+			"value": 50,
+			"weight": "3 lb",
 			"calc": {
-				"extended_value": 600,
-				"extended_weight": "20 lb"
+				"extended_value": 50,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "919d4139-9a5e-422f-90e2-b067bab75f8a",
+			"id": "d3ce3024-4a58-4e27-8e17-f48d42305224",
 			"type": "equipment",
-			"description": "Portable Tool Kit, Electronics Repair",
+			"description": "Mini-Camera, Digital",
 			"reference": "B289",
-			"tech_level": "6",
+			"notes": "Stores pictures on optical disk.",
+			"tech_level": "8",
 			"tags": [
-				"Tools"
+				"Optics and Sensors"
 			],
 			"quantity": 1,
-			"value": 1200,
-			"weight": "10 lb",
+			"value": 500,
 			"calc": {
-				"extended_value": 1200,
-				"extended_weight": "10 lb"
+				"extended_value": 500,
+				"extended_weight": "0 lb"
 			}
 		},
 		{
-			"id": "e812c666-9627-4794-88d1-3944a4c13983",
+			"id": "f68fd32a-de9f-4fbc-bea4-e8837e72bc90",
 			"type": "equipment",
-			"description": "Portable Tool Kit, Explosives",
-			"reference": "B289",
-			"tech_level": "5",
+			"description": "Mini-Recorder",
+			"reference": "B288",
+			"notes": "Palm-sized, with 3-hour tape",
+			"tech_level": "7",
 			"tags": [
-				"Tools"
+				"Communications and Information Gear"
 			],
 			"quantity": 1,
-			"value": 600,
-			"weight": "20 lb",
+			"value": 200,
+			"weight": "0.5 lb",
 			"calc": {
-				"extended_value": 600,
-				"extended_weight": "20 lb"
+				"extended_value": 200,
+				"extended_weight": "0.5 lb"
 			}
 		},
 		{
-			"id": "3181b571-ac1e-42c2-8319-8f3e491dc76d",
+			"id": "80bbcaec-694b-468f-b861-1b2d857296f7",
 			"type": "equipment",
-			"description": "Portable Tool Kit, Machinist",
-			"reference": "B289",
-			"tech_level": "5",
+			"description": "Mini-Recorder, Digital",
+			"reference": "B288",
+			"notes": "Palm-sized, 3 hrs. recording time",
+			"tech_level": "8",
 			"tags": [
-				"Tools"
+				"Communications and Information Gear"
 			],
 			"quantity": 1,
-			"value": 600,
-			"weight": "20 lb",
 			"calc": {
-				"extended_value": 600,
-				"extended_weight": "20 lb"
+				"extended_value": 0,
+				"extended_weight": "0 lb"
 			}
 		},
 		{
-			"id": "cbe3492b-ca4c-4670-a271-918ac7090de1",
+			"id": "206783bd-56c7-47bc-b6f8-d79a87671e37",
 			"type": "equipment",
-			"description": "Portable Tool Kit, Mechanic",
-			"reference": "B289",
-			"tech_level": "5",
+			"description": "Mini-Recorder-Tape",
+			"reference": "B288",
+			"notes": "3-hour tape",
+			"tech_level": "7",
 			"tags": [
-				"Tools"
+				"Communications and Information Gear"
 			],
 			"quantity": 1,
-			"value": 600,
-			"weight": "20 lb",
+			"value": 5,
 			"calc": {
-				"extended_value": 600,
-				"extended_weight": "20 lb"
+				"extended_value": 5,
+				"extended_weight": "0 lb"
 			}
 		},
 		{
-			"id": "c3af1c20-4356-4a4f-a260-6680def1283e",
+			"id": "e397c046-6eee-41e2-b06f-5442c70efe4c",
 			"type": "equipment",
-			"description": "Pot-Helm",
-			"reference": "B284",
-			"tech_level": "3",
+			"description": "Molotov Cocktail",
+			"reference": "B277",
+			"notes": "Fuse spec.",
+			"tech_level": "6",
+			"legality_class": "3",
 			"tags": [
-				"Headgear"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 100,
-			"weight": "5 lb",
-			"features": [
+			"weight": "1 lb",
+			"weapons": [
 				{
-					"type": "dr_bonus",
-					"location": "skull",
-					"amount": 4
+					"id": "8539779e-dafc-4b94-a8e6-4b96e6bba2b8",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "spec. (1 y)"
+					},
+					"accuracy": "0",
+					"range": "x3.5",
+					"rate_of_fire": "1",
+					"shots": "1",
+					"bulk": "0",
+					"recoil": "0",
+					"defaults": [
+						{
+							"type": "skill",
+							"name": "Throwing"
+						}
+					],
+					"calc": {
+						"range": "x3.5",
+						"damage": "spec. (1 y)"
+					}
 				}
 			],
 			"calc": {
-				"extended_value": 100,
-				"extended_weight": "5 lb"
+				"extended_value": 0,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "ee5e53a9-fe3e-455a-bf95-2b0351eff420",
-			"type": "equipment_container",
-			"open": true,
-			"description": "Pouch, Small",
-			"reference": "B288",
-			"tech_level": "1",
+			"id": "2199917d-0b0c-4858-8203-37f38ac383ce",
+			"type": "equipment",
+			"description": "Monowire Whip",
+			"reference": "B272",
+			"tech_level": "^",
 			"tags": [
-				"Camping and Survival Gear"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 10,
+			"value": 900,
 			"weight": "0.5 lb",
-			"prereqs": {
-				"type": "prereq_list",
-				"all": true,
-				"prereqs": [
-					{
-						"type": "contained_weight_prereq",
-						"has": true,
-						"qualifier": {
-							"compare": "at_most",
-							"qualifier": "3 lb"
+			"weapons": [
+				{
+					"id": "01345620-2cb3-4754-94ad-02745b25cca0",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "cut",
+						"st": "sw",
+						"base": "1d-2",
+						"armor_divisor": 10
+					},
+					"strength": "5",
+					"reach": "1-7*",
+					"parry": "-2U",
+					"block": "No",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -6
+						},
+						{
+							"type": "skill",
+							"name": "Monowire Whip"
+						},
+						{
+							"type": "skill",
+							"name": "Kusari",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Whip",
+							"modifier": -3
 						}
+					],
+					"calc": {
+						"parry": "-2U",
+						"block": "No",
+						"damage": "sw+1d-2(10) cut"
 					}
-				]
-			},
+				}
+			],
 			"calc": {
-				"extended_value": 10,
+				"extended_value": 900,
 				"extended_weight": "0.5 lb"
 			}
 		},
 		{
-			"id": "77f917f0-610f-43e7-888d-122b842bec0f",
+			"id": "08292e5d-ba57-4a9a-845b-f3cdf3db9f69",
 			"type": "equipment",
-			"description": "Prodd (ST7)",
-			"reference": "B276",
+			"description": "Morningstar",
+			"reference": "B272",
 			"tech_level": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 150,
+			"value": 80,
 			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "55a43610-1fd2-4749-b913-f870becc796e",
-					"type": "ranged_weapon",
+					"id": "882f3807-fe47-427a-b2c7-745b9263866c",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "1d+1"
+						"type": "cr",
+						"st": "sw",
+						"base": "3"
 					},
-					"strength": "7†",
-					"accuracy": "2",
-					"range": "140/175",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "12",
+					"usage": "Swung",
+					"usage_notes": "Attempts to parry this weapon are at -4 and fencing weapons may not parry it at all; attempts to block this weapon are at -2",
+					"reach": "1",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
+							"modifier": -6
+						},
+						{
+							"type": "skill",
+							"name": "Flail"
+						},
+						{
+							"type": "skill",
+							"name": "Axe/Mace",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Two-Handed Flail",
+							"modifier": -3
 						}
 					],
 					"calc": {
-						"range": "140/175",
-						"damage": "1d+1 pi"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+3 cr"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 150,
+				"extended_value": 80,
 				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "0447aae5-cb7e-4d85-8eb1-d2d530a89c1c",
+			"id": "446500a8-c65f-4edd-a08d-a204530928ba",
 			"type": "equipment",
-			"description": "Prodd (ST8)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Naginata",
+			"reference": "B272",
+			"tech_level": "2",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 165,
+			"value": 100,
 			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "aa7cc5ca-d0ce-41d3-9d3e-5900d9cac0e2",
-					"type": "ranged_weapon",
+					"id": "a91628a9-2868-44d0-8e4b-3cc7e33ef9b5",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "1d+1"
+						"type": "cut",
+						"st": "sw",
+						"base": "2"
 					},
-					"strength": "8†",
-					"accuracy": "2",
-					"range": "160/200",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "9†",
+					"usage": "Swung",
+					"usage_notes": "The sharp end, Polearm",
+					"reach": "1,2*",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Polearm"
+						},
+						{
+							"type": "skill",
+							"name": "Spear",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Staff",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Axe/Mace",
+							"modifier": -4
 						}
 					],
 					"calc": {
-						"range": "160/200",
-						"damage": "1d+1 pi"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+2 cut"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 165,
-				"extended_weight": "6 lb"
-			}
-		},
-		{
-			"id": "328bb550-d6c6-4990-b37e-e252076de558",
-			"type": "equipment",
-			"description": "Prodd (ST9)",
-			"reference": "B276",
-			"tech_level": "3",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
-			],
-			"quantity": 1,
-			"value": 180,
-			"weight": "6 lb",
-			"weapons": [
+				},
 				{
-					"id": "e0cde27e-c070-4f7d-a11b-ca989cd50523",
-					"type": "ranged_weapon",
+					"id": "b717054f-0296-489c-85d0-3771e28e57cf",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "1d+2"
+						"type": "imp",
+						"st": "thr",
+						"base": "3"
 					},
 					"strength": "9†",
-					"accuracy": "2",
-					"range": "180/225",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"usage": "Thrust",
+					"usage_notes": "The sharp end, Polearm",
+					"reach": "2",
+					"parry": "0",
+					"block": "No",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Polearm"
+						},
+						{
+							"type": "skill",
+							"name": "Spear",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Staff",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Axe/Mace",
+							"modifier": -4
+						}
+					],
+					"calc": {
+						"parry": "0",
+						"block": "No",
+						"damage": "thr+3 imp"
+					}
+				},
+				{
+					"id": "015f8ef5-2014-4bc3-b563-35b6d4f1fe46",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "cr",
+						"st": "sw",
+						"base": "2"
+					},
+					"strength": "9†",
+					"usage": "Swung",
+					"usage_notes": "The blunt end",
+					"reach": "1,2",
+					"parry": "0U",
+					"block": "No",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Staff"
+						},
+						{
+							"type": "skill",
+							"name": "Polearm",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Spear",
+							"modifier": -2
+						}
+					],
+					"calc": {
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+2 cr"
+					}
+				},
+				{
+					"id": "4dd49169-5dea-4510-ab5e-77755f4d046f",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "cr",
+						"st": "thr",
+						"base": "2"
+					},
+					"strength": "9†",
+					"usage": "Thrust",
+					"usage_notes": "The blunt end",
+					"reach": "1,2",
+					"parry": "0",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Staff"
+						},
+						{
+							"type": "skill",
+							"name": "Polearm",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Spear",
+							"modifier": -2
 						}
 					],
 					"calc": {
-						"range": "180/225",
-						"damage": "1d+2 pi"
+						"parry": "0",
+						"block": "No",
+						"damage": "thr+2 cr"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 180,
-				"extended_weight": "6 lb"
-			}
-		},
-		{
-			"id": "d4cc9402-bbf2-4168-a1d5-dba34e27872f",
-			"type": "equipment",
-			"description": "Prodd (ST10)",
-			"reference": "B276",
-			"tech_level": "3",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
-			],
-			"quantity": 1,
-			"value": 195,
-			"weight": "6 lb",
-			"weapons": [
+				},
 				{
-					"id": "11bf49f7-5986-4a93-aa8f-a83d1956d519",
-					"type": "ranged_weapon",
+					"id": "c41e9d0f-1637-4932-be20-4d14377f0743",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "1d+2"
+						"type": "cut",
+						"st": "sw",
+						"base": "3"
 					},
-					"strength": "10†",
-					"accuracy": "2",
-					"range": "200/250",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "9†",
+					"usage": "Swung",
+					"usage_notes": "Two-handed sword",
+					"reach": "2",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Sword"
+						},
+						{
+							"type": "skill",
+							"name": "Broadsword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Force Sword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "200/250",
-						"damage": "1d+2 pi"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+3 cut"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 195,
-				"extended_weight": "6 lb"
-			}
-		},
-		{
-			"id": "f963d4ff-7bee-4ba7-9cbc-2dde5fb354b0",
-			"type": "equipment",
-			"description": "Prodd (ST11)",
-			"reference": "B276",
-			"tech_level": "3",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
-			],
-			"quantity": 1,
-			"value": 210,
-			"weight": "6 lb",
-			"weapons": [
+				},
 				{
-					"id": "39b12a59-c65e-47ab-86b1-227c41dd737c",
-					"type": "ranged_weapon",
+					"id": "0d3877ae-d343-466b-b498-ce3f85794f8c",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "1d+3"
+						"type": "imp",
+						"st": "thr",
+						"base": "3"
 					},
-					"strength": "11†",
-					"accuracy": "2",
-					"range": "220/275",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "9†",
+					"usage": "Thrust",
+					"usage_notes": "Two-handed sword",
+					"reach": "2",
+					"parry": "0",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Sword"
+						},
+						{
+							"type": "skill",
+							"name": "Broadsword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Force Sword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "220/275",
-						"damage": "1d+3 pi"
+						"parry": "0",
+						"block": "No",
+						"damage": "thr+3 imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 210,
+				"extended_value": 100,
 				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "2dc18184-9afa-4932-835c-0cfa51d4132f",
+			"id": "32fe758f-a69d-4244-94a0-3b75cd9bee3a",
 			"type": "equipment",
-			"description": "Prodd (ST12)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Nanobug",
+			"reference": "B289",
+			"notes": "Pinhead-sized audio-visual bug (-10 to spot)",
+			"tech_level": "8",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"Law-Enforcement",
+				"Spy Gear",
+				"Thief"
 			],
 			"quantity": 1,
-			"value": 225,
-			"weight": "6 lb",
-			"weapons": [
-				{
-					"id": "72970739-34f3-4192-8516-3eb1d5cf88be",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi",
-						"base": "1d+3"
-					},
-					"strength": "12†",
-					"accuracy": "2",
-					"range": "240/300",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
+			"value": 100,
+			"calc": {
+				"extended_value": 100,
+				"extended_weight": "0 lb"
+			}
+		},
+		{
+			"id": "b1a2ade4-5008-4d89-9574-a725ae7a8f0d",
+			"type": "equipment",
+			"description": "NBC Suit",
+			"reference": "B285",
+			"tech_level": "7",
+			"tags": [
+				"Environment Suits"
+			],
+			"quantity": 1,
+			"value": 150,
+			"weight": "3.5 lb",
+			"prereqs": {
+				"type": "prereq_list",
+				"all": true,
+				"prereqs": [
+					{
+						"type": "skill_prereq",
+						"has": true,
+						"name": {
+							"compare": "is",
+							"qualifier": "nbc suit"
 						}
-					],
-					"calc": {
-						"range": "240/300",
-						"damage": "1d+3 pi"
 					}
+				]
+			},
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "skull",
+					"amount": 1
+				},
+				{
+					"type": "dr_bonus",
+					"location": "neck",
+					"amount": 1
+				},
+				{
+					"type": "dr_bonus",
+					"location": "torso",
+					"amount": 1
+				},
+				{
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 1
+				},
+				{
+					"type": "dr_bonus",
+					"location": "groin",
+					"amount": 1
+				},
+				{
+					"type": "dr_bonus",
+					"location": "arm",
+					"amount": 1
+				},
+				{
+					"type": "dr_bonus",
+					"location": "hand",
+					"amount": 1
+				},
+				{
+					"type": "dr_bonus",
+					"location": "leg",
+					"amount": 1
+				},
+				{
+					"type": "dr_bonus",
+					"location": "foot",
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 225,
-				"extended_weight": "6 lb"
+				"extended_value": 150,
+				"extended_weight": "3.5 lb"
 			}
 		},
 		{
-			"id": "8ef473d7-c561-4d49-bcd8-5c8dc4fa53bb",
+			"id": "7644647f-2a35-4775-8738-74ecb3c2168f",
 			"type": "equipment",
-			"description": "Prodd (ST13)",
-			"reference": "B276",
+			"description": "Night Vision Goggles",
+			"reference": "B289",
+			"notes": "Give Night Vision 9. 8 hrs.",
+			"tech_level": "8",
+			"tags": [
+				"Optics and Sensors"
+			],
+			"quantity": 1,
+			"value": 600,
+			"weight": "2 lb",
+			"calc": {
+				"extended_value": 600,
+				"extended_weight": "2 lb"
+			}
+		},
+		{
+			"id": "ba28f6c7-4c8c-46d8-8cad-5db971451ebf",
+			"type": "equipment",
+			"description": "Nunchaku",
+			"reference": "B272",
 			"tech_level": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 240,
-			"weight": "6 lb",
+			"value": 20,
+			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "b4d64f12-6bfe-42a4-bad8-11d8d791d88e",
-					"type": "ranged_weapon",
+					"id": "d6b68540-bdf2-4d9b-b68c-dcd3bc1b514d",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "2d"
+						"type": "cr",
+						"st": "sw",
+						"base": "1"
 					},
-					"strength": "13†",
-					"accuracy": "2",
-					"range": "260/325",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "7",
+					"usage": "Swung",
+					"usage_notes": "Attempts to parry this weapon are at -2 and fencing weapons may not parry it at all; attempts to block this weapon are at -1",
+					"reach": "1",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
-							"type": "dx",
+							"type": "skill",
+							"name": "Flail"
+						},
+						{
+							"type": "skill",
+							"name": "Axe/Mace",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Two-Handed Flail",
+							"modifier": -3
+						},
+						{
+							"type": "dx",
+							"modifier": -6
 						}
 					],
 					"calc": {
-						"range": "260/325",
-						"damage": "2d pi"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+1 cr"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 240,
-				"extended_weight": "6 lb"
+				"extended_value": 20,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "320cf5f2-4ed5-4887-80fd-8cf90b1ccc85",
+			"id": "2d780bd0-acf1-444b-bfff-6e45121889b1",
 			"type": "equipment",
-			"description": "Prodd (ST14)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Oil, Lantern, 1 Pint",
+			"reference": "B288",
+			"tech_level": "2",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 255,
-			"weight": "6 lb",
-			"weapons": [
-				{
-					"id": "d57e1572-309d-443e-b50b-9b1a300def5e",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi",
-						"base": "2d"
-					},
-					"strength": "14†",
-					"accuracy": "2",
-					"range": "280/350",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "280/350",
-						"damage": "2d pi"
-					}
-				}
+			"value": 2,
+			"weight": "1 lb",
+			"calc": {
+				"extended_value": 2,
+				"extended_weight": "1 lb"
+			}
+		},
+		{
+			"id": "efb4c06f-b4ef-4403-9cc8-0a7c3d48fa15",
+			"type": "equipment",
+			"description": "Parachute",
+			"reference": "B288",
+			"tech_level": "6",
+			"tags": [
+				"Camping and Survival Gear"
 			],
+			"quantity": 1,
+			"value": 1000,
+			"weight": "30 lb",
 			"calc": {
-				"extended_value": 255,
-				"extended_weight": "6 lb"
+				"extended_value": 1000,
+				"extended_weight": "30 lb"
 			}
 		},
 		{
-			"id": "a14eea6e-2822-4117-89ed-9c814547405d",
+			"id": "c919e84b-fa78-4bed-b97c-6fcc9d5e2e7a",
 			"type": "equipment",
-			"description": "Prodd (ST15)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "PDW, 4.6mm",
+			"reference": "B278",
+			"tech_level": "8",
+			"legality_class": "2",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 270,
-			"weight": "6 lb",
+			"value": 800,
+			"weight": "3.9 lb",
 			"weapons": [
 				{
-					"id": "30fd4f5b-bcb3-4942-b97a-4d3964a6212d",
+					"id": "bc426378-e6d8-4ffd-a56e-22381bb1e10c",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "2d+1"
+						"type": "pi-",
+						"base": "4d+1"
 					},
-					"strength": "15†",
-					"accuracy": "2",
-					"range": "300/375",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "7†",
+					"accuracy": "3",
+					"range": "200/2000",
+					"rate_of_fire": "15",
+					"shots": "20+1(3)",
+					"bulk": "-3",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
@@ -17387,95 +14213,197 @@
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "300/375",
-						"damage": "2d+1 pi"
+						"range": "200/2000",
+						"damage": "4d+1 pi-"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 270,
-				"extended_weight": "6 lb"
+				"extended_value": 800,
+				"extended_weight": "3.9 lb"
+			}
+		},
+		{
+			"id": "b5bb2b27-5828-42d2-b117-0a88db0f1fbf",
+			"type": "equipment",
+			"description": "Personal Basics",
+			"reference": "B288",
+			"notes": "Minimum gear for camping: -2 to any Survival roll without it. Includes utensils, tinderbox or flint and steel, towel, etc., as TL permits.",
+			"tech_level": "0",
+			"tags": [
+				"Camping and Survival Gear"
+			],
+			"quantity": 1,
+			"value": 5,
+			"weight": "1 lb",
+			"calc": {
+				"extended_value": 5,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "25c3d008-a0a8-4aad-bd48-9471a689ee4e",
+			"id": "9c37c2a9-2488-459f-bfbf-f0945b3fdc2b",
 			"type": "equipment",
-			"description": "Prodd (ST16)",
-			"reference": "B276",
+			"description": "Pick",
+			"reference": "B271",
+			"notes": "May get stuck",
 			"tech_level": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 285,
-			"weight": "6 lb",
+			"value": 70,
+			"weight": "3 lb",
 			"weapons": [
 				{
-					"id": "0cafdd9e-6fed-4100-84ff-c9e6bfc9a3c2",
-					"type": "ranged_weapon",
+					"id": "2b078e64-f32d-4600-b197-528e67e0ec2a",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "2d+1"
+						"type": "imp",
+						"st": "sw",
+						"base": "1"
 					},
-					"strength": "16†",
-					"accuracy": "2",
-					"range": "320/400",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
+					"strength": "10",
+					"usage": "Swung",
+					"reach": "1",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Axe/Mace"
+						},
+						{
+							"type": "skill",
+							"name": "Flail",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Crossbow"
+							"name": "Two-Handed Axe/Mace",
+							"modifier": -3
 						}
 					],
 					"calc": {
-						"range": "320/400",
-						"damage": "2d+1 pi"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+1 imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 285,
-				"extended_weight": "6 lb"
+				"extended_value": 70,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "5174bb20-b50f-4710-9595-6cb59eb642dc",
+			"id": "fb4d9188-c4d9-4d82-9c1d-49dbc83e22a4",
 			"type": "equipment",
-			"description": "Prodd (ST17)",
+			"description": "Pickaxe",
+			"reference": "B289",
+			"notes": "Improves digging speed",
+			"tech_level": "2",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 15,
+			"weight": "8 lb",
+			"calc": {
+				"extended_value": 15,
+				"extended_weight": "8 lb"
+			}
+		},
+		{
+			"id": "fc58ab4e-4b06-4fbc-bfb9-6efaf6decc52",
+			"type": "equipment",
+			"description": "Pistol Crossbow",
 			"reference": "B276",
 			"tech_level": "3",
 			"tags": [
 				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"UsesAmmoType:Bolt"
 			],
+			"rated_strength": 7,
 			"quantity": 1,
-			"value": 300,
-			"weight": "6 lb",
+			"value": 150,
+			"weight": "4 lb",
 			"weapons": [
 				{
-					"id": "c712bdbf-d8c1-4504-a4e1-e59a763d526b",
+					"id": "5e3257b7-30d3-431d-8f2a-e6bc491f02e2",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "2d+2"
+						"type": "imp",
+						"st": "thr",
+						"base": "2"
 					},
-					"strength": "17†",
-					"accuracy": "2",
-					"range": "340/425",
+					"strength": "7",
+					"accuracy": "1",
+					"range": "x15/x20",
 					"rate_of_fire": "1",
 					"shots": "1(4)",
-					"bulk": "-6",
+					"bulk": "-4",
 					"defaults": [
 						{
 							"type": "dx",
@@ -17487,266 +14415,391 @@
 						}
 					],
 					"calc": {
-						"range": "340/425",
-						"damage": "2d+2 pi"
+						"range": "x15/x20",
+						"damage": "thr+2 imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 300,
-				"extended_weight": "6 lb"
+				"extended_value": 150,
+				"extended_weight": "4 lb"
 			}
 		},
 		{
-			"id": "e8061e05-ac61-44a5-a1ff-abb11cb69d2a",
+			"id": "2233ed4f-6b04-43df-b759-ad7465fbce89",
 			"type": "equipment",
-			"description": "Prodd (ST18)",
-			"reference": "B276",
+			"description": "Plate Arms",
+			"reference": "B283",
 			"tech_level": "3",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"Limb Armor"
 			],
 			"quantity": 1,
-			"value": 315,
-			"weight": "6 lb",
-			"weapons": [
+			"value": 1000,
+			"weight": "15 lb",
+			"features": [
 				{
-					"id": "2f693c81-4254-4be3-babc-2c1b217437c0",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi",
-						"base": "2d+2"
-					},
-					"strength": "18†",
-					"accuracy": "2",
-					"range": "360/450",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "360/450",
-						"damage": "2d+2 pi"
-					}
+					"type": "dr_bonus",
+					"location": "arm",
+					"amount": 6
 				}
 			],
 			"calc": {
-				"extended_value": 315,
-				"extended_weight": "6 lb"
+				"extended_value": 1000,
+				"extended_weight": "15 lb"
 			}
 		},
 		{
-			"id": "c5f7d0e9-ed5f-4f38-b121-f370e40db5d6",
+			"id": "cf4a327d-0b0f-4d0f-aa05-b202073611d0",
 			"type": "equipment",
-			"description": "Prodd (ST19)",
-			"reference": "B276",
+			"description": "Plate Legs",
+			"reference": "B283",
 			"tech_level": "3",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"Limb Armor"
 			],
 			"quantity": 1,
-			"value": 330,
-			"weight": "6 lb",
-			"weapons": [
+			"value": 1100,
+			"weight": "20 lb",
+			"features": [
 				{
-					"id": "2279ad1f-c077-4ef4-a9ff-0171a1ead875",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi",
-						"base": "2d+3"
-					},
-					"strength": "19†",
-					"accuracy": "2",
-					"range": "380/475",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "380/475",
-						"damage": "2d+3 pi"
-					}
+					"type": "dr_bonus",
+					"location": "leg",
+					"amount": 6
 				}
 			],
 			"calc": {
-				"extended_value": 330,
-				"extended_weight": "6 lb"
+				"extended_value": 1100,
+				"extended_weight": "20 lb"
+			}
+		},
+		{
+			"id": "c45aa7d6-6bec-4c8c-be04-03b67291381b",
+			"type": "equipment",
+			"description": "Plow, Iron",
+			"reference": "B289",
+			"notes": "Works rough soils",
+			"tech_level": "2",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 220,
+			"weight": "120 lb",
+			"calc": {
+				"extended_value": 220,
+				"extended_weight": "120 lb"
+			}
+		},
+		{
+			"id": "6a0814cf-565f-4c70-8e04-0620bb193693",
+			"type": "equipment",
+			"description": "Plow, Wooden",
+			"reference": "B289",
+			"notes": "Pulled by oxen",
+			"tech_level": "1",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 55,
+			"weight": "60 lb",
+			"calc": {
+				"extended_value": 55,
+				"extended_weight": "60 lb"
+			}
+		},
+		{
+			"id": "b6cdb4bc-8233-47c0-a372-4c302e743a2b",
+			"type": "equipment",
+			"description": "Pole, 6'",
+			"reference": "B288",
+			"tech_level": "0",
+			"tags": [
+				"Camping and Survival Gear"
+			],
+			"quantity": 1,
+			"value": 5,
+			"weight": "3 lb",
+			"calc": {
+				"extended_value": 5,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "d7c57048-8188-426a-b174-19d18b9f6e17",
+			"id": "fdb0a736-7e10-4885-9773-b99730da5121",
 			"type": "equipment",
-			"description": "Prodd (ST20)",
-			"reference": "B276",
-			"tech_level": "3",
+			"description": "Pole, 10'",
+			"reference": "B288",
+			"tech_level": "0",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Prodd"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 345,
-			"weight": "6 lb",
-			"weapons": [
-				{
-					"id": "6be34352-be3d-4cf4-9e83-9bfb85199838",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "pi",
-						"base": "2d+3"
-					},
-					"strength": "20†",
-					"accuracy": "2",
-					"range": "400/500",
-					"rate_of_fire": "1",
-					"shots": "1(4)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Crossbow"
-						}
-					],
-					"calc": {
-						"range": "400/500",
-						"damage": "2d+3 pi"
-					}
-				}
-			],
+			"value": 8,
+			"weight": "5 lb",
 			"calc": {
-				"extended_value": 345,
-				"extended_weight": "6 lb"
+				"extended_value": 8,
+				"extended_weight": "5 lb"
 			}
 		},
 		{
-			"id": "0032a515-6bca-4b80-804e-f8dc631ac972",
+			"id": "a80507f2-f16e-4299-98ee-3cdb1bb2a00c",
 			"type": "equipment",
-			"description": "Pump Shotgun, 12G",
-			"reference": "B279",
-			"tech_level": "6",
+			"description": "Poleaxe",
+			"reference": "B272",
+			"tech_level": "3",
 			"tags": [
-				"Missile Weapon"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 240,
-			"weight": "8 lb",
+			"value": 120,
+			"weight": "10 lb",
 			"weapons": [
 				{
-					"id": "9a28e235-8d03-437d-ac4a-550582cc980b",
-					"type": "ranged_weapon",
+					"id": "d73fe4ab-819b-44e9-846b-8e4c6ba4d775",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "1d+1"
+						"type": "cut",
+						"st": "sw",
+						"base": "4"
 					},
-					"strength": "10†",
-					"accuracy": "3",
-					"range": "50/125",
-					"rate_of_fire": "2x9",
-					"shots": "5(3i)",
-					"bulk": "-5",
-					"recoil": "1",
+					"strength": "12‡",
+					"usage": "Swung",
+					"reach": "2,3*",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -4
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -2
+							"name": "Polearm"
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -2
+							"name": "Spear",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun"
+							"name": "Staff",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
-						},
+							"name": "Two-Handed Axe/Mace",
+							"modifier": -4
+						}
+					],
+					"calc": {
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+4 cut"
+					}
+				},
+				{
+					"id": "d4226613-a7ee-468f-9bbe-be1154d40687",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "cr",
+						"st": "sw",
+						"base": "4"
+					},
+					"strength": "12‡",
+					"usage": "Swung",
+					"reach": "2,3*",
+					"parry": "0U",
+					"block": "No",
+					"defaults": [
 						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
+							"type": "dx",
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
+							"name": "Polearm"
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
+							"name": "Spear",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
+							"name": "Staff",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
+							"name": "Two-Handed Axe/Mace",
 							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "50/125",
-						"damage": "1d+1 pi"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+4 cr"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 240,
-				"extended_weight": "8 lb"
+				"extended_value": 120,
+				"extended_weight": "10 lb"
+			}
+		},
+		{
+			"id": "b90d149c-028d-48bb-8034-458058f7d01c",
+			"type": "equipment",
+			"description": "Portable Tool Kit, Armoury",
+			"reference": "B289",
+			"tech_level": "1",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 600,
+			"weight": "20 lb",
+			"calc": {
+				"extended_value": 600,
+				"extended_weight": "20 lb"
+			}
+		},
+		{
+			"id": "90eb9460-0e07-48e5-afd7-d7716c21945e",
+			"type": "equipment",
+			"description": "Portable Tool Kit, Carpentry",
+			"reference": "B289",
+			"tech_level": "1",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 300,
+			"weight": "20 lb",
+			"calc": {
+				"extended_value": 300,
+				"extended_weight": "20 lb"
+			}
+		},
+		{
+			"id": "92df7f4e-c572-45ba-8afd-c84ce7ce2b0d",
+			"type": "equipment",
+			"description": "Portable Tool Kit, Electrician",
+			"reference": "B289",
+			"tech_level": "6",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 600,
+			"weight": "20 lb",
+			"calc": {
+				"extended_value": 600,
+				"extended_weight": "20 lb"
+			}
+		},
+		{
+			"id": "919d4139-9a5e-422f-90e2-b067bab75f8a",
+			"type": "equipment",
+			"description": "Portable Tool Kit, Electronics Repair",
+			"reference": "B289",
+			"tech_level": "6",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 1200,
+			"weight": "10 lb",
+			"calc": {
+				"extended_value": 1200,
+				"extended_weight": "10 lb"
+			}
+		},
+		{
+			"id": "e812c666-9627-4794-88d1-3944a4c13983",
+			"type": "equipment",
+			"description": "Portable Tool Kit, Explosives",
+			"reference": "B289",
+			"tech_level": "5",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 600,
+			"weight": "20 lb",
+			"calc": {
+				"extended_value": 600,
+				"extended_weight": "20 lb"
+			}
+		},
+		{
+			"id": "3181b571-ac1e-42c2-8319-8f3e491dc76d",
+			"type": "equipment",
+			"description": "Portable Tool Kit, Machinist",
+			"reference": "B289",
+			"tech_level": "5",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 600,
+			"weight": "20 lb",
+			"calc": {
+				"extended_value": 600,
+				"extended_weight": "20 lb"
+			}
+		},
+		{
+			"id": "cbe3492b-ca4c-4670-a271-918ac7090de1",
+			"type": "equipment",
+			"description": "Portable Tool Kit, Mechanic",
+			"reference": "B289",
+			"tech_level": "5",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 600,
+			"weight": "20 lb",
+			"calc": {
+				"extended_value": 600,
+				"extended_weight": "20 lb"
+			}
+		},
+		{
+			"id": "c3af1c20-4356-4a4f-a260-6680def1283e",
+			"type": "equipment",
+			"description": "Pot-Helm",
+			"reference": "B284",
+			"tech_level": "3",
+			"tags": [
+				"Headgear"
+			],
+			"quantity": 1,
+			"value": 100,
+			"weight": "5 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "skull",
+					"amount": 4
+				}
+			],
+			"calc": {
+				"extended_value": 100,
+				"extended_weight": "5 lb"
 			}
 		},
 		{
-			"id": "fa41df8d-ea35-4807-be22-5156748b3933",
+			"id": "ee5e53a9-fe3e-455a-bf95-2b0351eff420",
 			"type": "equipment_container",
 			"open": true,
-			"description": "Purse, Small",
+			"description": "Pouch, Small",
 			"reference": "B288",
 			"tech_level": "1",
 			"tags": [
@@ -17754,7 +14807,7 @@
 			],
 			"quantity": 1,
 			"value": 10,
-			"weight": "0.2 lb",
+			"weight": "0.5 lb",
 			"prereqs": {
 				"type": "prereq_list",
 				"all": true,
@@ -17764,806 +14817,848 @@
 						"has": true,
 						"qualifier": {
 							"compare": "at_most",
-							"qualifier": "1 lb"
+							"qualifier": "3 lb"
 						}
 					}
 				]
 			},
 			"calc": {
 				"extended_value": 10,
-				"extended_weight": "0.2 lb"
+				"extended_weight": "0.5 lb"
 			}
 		},
 		{
-			"id": "9cb7d976-d975-4644-ac16-7dc5e72b862c",
+			"id": "77f917f0-610f-43e7-888d-122b842bec0f",
 			"type": "equipment",
-			"description": "Quarterstaff",
-			"reference": "B273",
-			"tech_level": "0",
+			"description": "Prodd (ST7)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
-				"Melee Weapon"
+				"Missile Weapon",
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 10,
-			"weight": "4 lb",
+			"value": 150,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "ad65dc1c-caf5-4c71-a880-84587832d8ea",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "sw",
-						"base": "2"
-					},
-					"strength": "7†",
-					"usage": "Swung",
-					"usage_notes": "Staff",
-					"reach": "1,2",
-					"parry": "+2",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Staff"
-						},
-						{
-							"type": "skill",
-							"name": "Polearm",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Spear",
-							"modifier": -2
-						}
-					],
-					"calc": {
-						"parry": "+2",
-						"block": "No",
-						"damage": "sw+2 cr"
-					}
-				},
-				{
-					"id": "0f333350-cfd8-4fba-a202-b2bf19773be5",
-					"type": "melee_weapon",
+					"id": "55a43610-1fd2-4749-b913-f870becc796e",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "thr",
-						"base": "2"
+						"type": "pi",
+						"base": "1d+1"
 					},
 					"strength": "7†",
-					"usage": "Thrust",
-					"usage_notes": "Staff",
-					"reach": "1,2",
-					"parry": "+2",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Staff"
-						},
-						{
-							"type": "skill",
-							"name": "Polearm",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Spear",
-							"modifier": -2
-						}
-					],
-					"calc": {
-						"parry": "+2",
-						"block": "No",
-						"damage": "thr+2 cr"
-					}
-				},
-				{
-					"id": "cbc835a1-cf24-479a-bd41-0e8a7b4b8c37",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "sw",
-						"base": "2"
-					},
-					"strength": "9†",
-					"usage": "Swung",
-					"usage_notes": "Two-Handed Sword",
-					"reach": "1,2",
-					"parry": "0",
-					"block": "No",
+					"accuracy": "2",
+					"range": "140/175",
+					"rate_of_fire": "1",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Sword"
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Force Sword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Sword!"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "sw+2 cr"
+						"range": "140/175",
+						"damage": "1d+1 pi"
 					}
-				},
+				}
+			],
+			"calc": {
+				"extended_value": 150,
+				"extended_weight": "6 lb"
+			}
+		},
+		{
+			"id": "0447aae5-cb7e-4d85-8eb1-d2d530a89c1c",
+			"type": "equipment",
+			"description": "Prodd (ST8)",
+			"reference": "B276",
+			"tech_level": "3",
+			"tags": [
+				"Missile Weapon",
+				"UsesAmmoType:Prodd"
+			],
+			"quantity": 1,
+			"value": 165,
+			"weight": "6 lb",
+			"weapons": [
 				{
-					"id": "3cb8cfdd-ea36-4144-b25e-406f4a105764",
-					"type": "melee_weapon",
+					"id": "aa7cc5ca-d0ce-41d3-9d3e-5900d9cac0e2",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cr",
-						"st": "thr",
-						"base": "1"
+						"type": "pi",
+						"base": "1d+1"
 					},
-					"strength": "9†",
-					"usage": "Thrust",
-					"usage_notes": "Two-Handed Sword",
-					"reach": "2",
-					"parry": "0",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Sword"
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword",
-							"modifier": -4
-						},
+					"strength": "8†",
+					"accuracy": "2",
+					"range": "160/200",
+					"rate_of_fire": "1",
+					"shots": "1(4)",
+					"bulk": "-6",
+					"defaults": [
 						{
-							"type": "skill",
-							"name": "Force Sword",
+							"type": "dx",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Sword!"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "thr+1 cr"
+						"range": "160/200",
+						"damage": "1d+1 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 10,
-				"extended_weight": "4 lb"
+				"extended_value": 165,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "0d6354e1-8ec6-4644-afd8-beb3249d2833",
+			"id": "328bb550-d6c6-4990-b37e-e252076de558",
 			"type": "equipment",
-			"description": "Radio, Backpack",
-			"reference": "B288",
-			"notes": "VHF radio. 20-mile range. 12 hrs.",
-			"tech_level": "7",
+			"description": "Prodd (ST9)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
-				"Communications and Information Gear"
+				"Missile Weapon",
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 6000,
-			"weight": "15 lb",
-			"calc": {
-				"extended_value": 6000,
-				"extended_weight": "15 lb"
-			}
-		},
-		{
-			"id": "847b48a9-8457-48f1-9bc5-108e5c483f37",
-			"type": "equipment",
-			"description": "Radio, Hand",
-			"reference": "B288",
-			"notes": "Classic \"walkie-talkie.\" 2-mile range. 12 hrs.",
-			"tech_level": "7",
-			"tags": [
-				"Communications and Information Gear"
+			"value": 180,
+			"weight": "6 lb",
+			"weapons": [
+				{
+					"id": "e0cde27e-c070-4f7d-a11b-ca989cd50523",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "pi",
+						"base": "1d+2"
+					},
+					"strength": "9†",
+					"accuracy": "2",
+					"range": "180/225",
+					"rate_of_fire": "1",
+					"shots": "1(4)",
+					"bulk": "-6",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Crossbow"
+						}
+					],
+					"calc": {
+						"range": "180/225",
+						"damage": "1d+2 pi"
+					}
+				}
 			],
-			"quantity": 1,
-			"value": 100,
-			"weight": "1 lb",
 			"calc": {
-				"extended_value": 100,
-				"extended_weight": "1 lb"
+				"extended_value": 180,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "a627b99d-ec6e-4d9b-bbaf-ebcb0b62908f",
+			"id": "d4cc9402-bbf2-4168-a1d5-dba34e27872f",
 			"type": "equipment",
-			"description": "Radio, Headset",
-			"reference": "B288",
-			"notes": "With throat mike. 1-mile range. 12 hrs.",
-			"tech_level": "8",
+			"description": "Prodd (ST10)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
-				"Communications and Information Gear"
+				"Missile Weapon",
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 500,
-			"weight": "0.5 lb",
+			"value": 195,
+			"weight": "6 lb",
+			"weapons": [
+				{
+					"id": "11bf49f7-5986-4a93-aa8f-a83d1956d519",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "pi",
+						"base": "1d+2"
+					},
+					"strength": "10†",
+					"accuracy": "2",
+					"range": "200/250",
+					"rate_of_fire": "1",
+					"shots": "1(4)",
+					"bulk": "-6",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Crossbow"
+						}
+					],
+					"calc": {
+						"range": "200/250",
+						"damage": "1d+2 pi"
+					}
+				}
+			],
 			"calc": {
-				"extended_value": 500,
-				"extended_weight": "0.5 lb"
+				"extended_value": 195,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "dad42d86-9790-46d2-a1c1-59534b816e84",
+			"id": "f963d4ff-7bee-4ba7-9cbc-2dde5fb354b0",
 			"type": "equipment",
-			"description": "Radio, Headset, secure",
-			"reference": "B288",
-			"notes": "With throat mike. 1-mile range. Secure, encrypted version. 12 hrs.",
-			"tech_level": "8",
+			"description": "Prodd (ST11)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
-				"Communications and Information Gear"
+				"Missile Weapon",
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 5000,
-			"weight": "0.5 lb",
+			"value": 210,
+			"weight": "6 lb",
+			"weapons": [
+				{
+					"id": "39b12a59-c65e-47ab-86b1-227c41dd737c",
+					"type": "ranged_weapon",
+					"damage": {
+						"type": "pi",
+						"base": "1d+3"
+					},
+					"strength": "11†",
+					"accuracy": "2",
+					"range": "220/275",
+					"rate_of_fire": "1",
+					"shots": "1(4)",
+					"bulk": "-6",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Crossbow"
+						}
+					],
+					"calc": {
+						"range": "220/275",
+						"damage": "1d+3 pi"
+					}
+				}
+			],
 			"calc": {
-				"extended_value": 5000,
-				"extended_weight": "0.5 lb"
+				"extended_value": 210,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "e9dcc6bb-e08c-4b63-ac24-5e72d60ecc33",
+			"id": "2dc18184-9afa-4932-835c-0cfa51d4132f",
 			"type": "equipment",
-			"description": "Rapier",
-			"reference": "B273",
-			"tech_level": "4",
+			"description": "Prodd (ST12)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
-				"Melee Weapon"
+				"Missile Weapon",
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 500,
-			"weight": "2.75 lb",
+			"value": 225,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "faed2269-9c35-4b6c-b478-4d353e824920",
-					"type": "melee_weapon",
+					"id": "72970739-34f3-4192-8516-3eb1d5cf88be",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "1"
+						"type": "pi",
+						"base": "1d+3"
 					},
-					"strength": "9",
-					"usage": "Thrust",
-					"reach": "1,2",
-					"parry": "0F",
-					"block": "No",
+					"strength": "12†",
+					"accuracy": "2",
+					"range": "240/300",
+					"rate_of_fire": "1",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Rapier"
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Main-Gauche",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Saber",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Smallsword",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Sword!"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"parry": "0F",
-						"block": "No",
-						"damage": "thr+1 imp"
+						"range": "240/300",
+						"damage": "1d+3 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 500,
-				"extended_weight": "2.75 lb"
+				"extended_value": 225,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "161803c5-3f84-4d40-b4fc-cd9c3f142a53",
+			"id": "8ef473d7-c561-4d49-bcd8-5c8dc4fa53bb",
 			"type": "equipment",
-			"description": "Regular Bow (ST10)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Prodd (ST13)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
 				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 100,
-			"weight": "2 lb",
+			"value": 240,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "1b8db93f-e26c-40b3-85a2-9e0c1ede3081",
+					"id": "b4d64f12-6bfe-42a4-bad8-11d8d791d88e",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d-1"
+						"type": "pi",
+						"base": "2d"
 					},
-					"strength": "10†",
+					"strength": "13†",
 					"accuracy": "2",
-					"range": "150/200",
+					"range": "260/325",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"range": "150/200",
-						"damage": "1d-1 imp"
+						"range": "260/325",
+						"damage": "2d pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 100,
-				"extended_weight": "2 lb"
+				"extended_value": 240,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "85447f49-9d70-4fce-a138-e73b23280130",
+			"id": "320cf5f2-4ed5-4887-80fd-8cf90b1ccc85",
 			"type": "equipment",
-			"description": "Regular Bow (ST11)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Prodd (ST14)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
 				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 110,
-			"weight": "2 lb",
+			"value": 255,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "a035d2cc-0925-4feb-a457-0ff2da60b4cb",
+					"id": "d57e1572-309d-443e-b50b-9b1a300def5e",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d"
+						"type": "pi",
+						"base": "2d"
 					},
-					"strength": "11†",
+					"strength": "14†",
 					"accuracy": "2",
-					"range": "165/220",
+					"range": "280/350",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"range": "165/220",
-						"damage": "1d imp"
+						"range": "280/350",
+						"damage": "2d pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 110,
-				"extended_weight": "2 lb"
+				"extended_value": 255,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "b260186a-a7a8-4eb8-b2c5-69d30decf2de",
+			"id": "a14eea6e-2822-4117-89ed-9c814547405d",
 			"type": "equipment",
-			"description": "Regular Bow (ST12)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Prodd (ST15)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
 				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 120,
-			"weight": "2 lb",
+			"value": 270,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "21547cab-b88f-4e36-a8a4-5dba09243c2d",
+					"id": "30fd4f5b-bcb3-4942-b97a-4d3964a6212d",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d"
+						"type": "pi",
+						"base": "2d+1"
 					},
-					"strength": "12†",
+					"strength": "15†",
 					"accuracy": "2",
-					"range": "180/240",
+					"range": "300/375",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"range": "180/240",
-						"damage": "1d imp"
+						"range": "300/375",
+						"damage": "2d+1 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 120,
-				"extended_weight": "2 lb"
+				"extended_value": 270,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "ea0c164a-de16-4e3c-b0bc-9570dae6d59a",
+			"id": "25c3d008-a0a8-4aad-bd48-9471a689ee4e",
 			"type": "equipment",
-			"description": "Regular Bow (ST13)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Prodd (ST16)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
 				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 130,
-			"weight": "2 lb",
+			"value": 285,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "0ae6039b-6c4f-472f-bdb2-d917dbde06aa",
+					"id": "0cafdd9e-6fed-4100-84ff-c9e6bfc9a3c2",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+1"
+						"type": "pi",
+						"base": "2d+1"
 					},
-					"strength": "13†",
+					"strength": "16†",
 					"accuracy": "2",
-					"range": "195/260",
+					"range": "320/400",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"range": "195/260",
-						"damage": "1d+1 imp"
+						"range": "320/400",
+						"damage": "2d+1 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 130,
-				"extended_weight": "2 lb"
+				"extended_value": 285,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "75fb635e-de43-42a0-a7a4-16b9265ccdef",
+			"id": "5174bb20-b50f-4710-9595-6cb59eb642dc",
 			"type": "equipment",
-			"description": "Regular Bow (ST14)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Prodd (ST17)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
 				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 140,
-			"weight": "2 lb",
+			"value": 300,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "60e4874c-9fd1-4958-895a-f1fbc233bad7",
+					"id": "c712bdbf-d8c1-4504-a4e1-e59a763d526b",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+1"
+						"type": "pi",
+						"base": "2d+2"
 					},
-					"strength": "14†",
+					"strength": "17†",
 					"accuracy": "2",
-					"range": "210/280",
+					"range": "340/425",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"range": "210/280",
-						"damage": "1d+1 imp"
+						"range": "340/425",
+						"damage": "2d+2 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 140,
-				"extended_weight": "2 lb"
+				"extended_value": 300,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "5461268d-5025-412b-a0c2-7c918ef5ea5a",
+			"id": "e8061e05-ac61-44a5-a1ff-abb11cb69d2a",
 			"type": "equipment",
-			"description": "Regular Bow (ST15)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Prodd (ST18)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
 				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 150,
-			"weight": "2 lb",
+			"value": 315,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "381bf5ab-5c34-4aaf-934f-a912400dab3c",
+					"id": "2f693c81-4254-4be3-babc-2c1b217437c0",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+2"
+						"type": "pi",
+						"base": "2d+2"
 					},
-					"strength": "15†",
+					"strength": "18†",
 					"accuracy": "2",
-					"range": "225/300",
+					"range": "360/450",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"range": "225/300",
-						"damage": "1d+2 imp"
+						"range": "360/450",
+						"damage": "2d+2 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 150,
-				"extended_weight": "2 lb"
+				"extended_value": 315,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "4c010953-3e1f-447c-831e-0befc8bab2e6",
+			"id": "c5f7d0e9-ed5f-4f38-b121-f370e40db5d6",
 			"type": "equipment",
-			"description": "Regular Bow (ST16)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Prodd (ST19)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
 				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 160,
-			"weight": "2 lb",
+			"value": 330,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "c9bf52a3-d3ea-4cb2-98ad-0afe5c82f756",
+					"id": "2279ad1f-c077-4ef4-a9ff-0171a1ead875",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+2"
+						"type": "pi",
+						"base": "2d+3"
 					},
-					"strength": "16†",
+					"strength": "19†",
 					"accuracy": "2",
-					"range": "240/320",
+					"range": "380/475",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"range": "240/320",
-						"damage": "1d+2 imp"
+						"range": "380/475",
+						"damage": "2d+3 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 160,
-				"extended_weight": "2 lb"
+				"extended_value": 330,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "a4acebec-b146-4a88-9fca-1fe6ee202f92",
+			"id": "d7c57048-8188-426a-b174-19d18b9f6e17",
 			"type": "equipment",
-			"description": "Regular Bow (ST17)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Prodd (ST20)",
+			"reference": "B276",
+			"tech_level": "3",
 			"tags": [
 				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"UsesAmmoType:Prodd"
 			],
 			"quantity": 1,
-			"value": 170,
-			"weight": "2 lb",
+			"value": 345,
+			"weight": "6 lb",
 			"weapons": [
 				{
-					"id": "1950aa70-842f-49c6-aed9-f6fd857001db",
+					"id": "6be34352-be3d-4cf4-9e83-9bfb85199838",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+3"
+						"type": "pi",
+						"base": "2d+3"
 					},
-					"strength": "17†",
+					"strength": "20†",
 					"accuracy": "2",
-					"range": "255/340",
+					"range": "400/500",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"shots": "1(4)",
+					"bulk": "-6",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Crossbow"
 						}
 					],
 					"calc": {
-						"range": "255/340",
-						"damage": "1d+3 imp"
+						"range": "400/500",
+						"damage": "2d+3 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 170,
-				"extended_weight": "2 lb"
+				"extended_value": 345,
+				"extended_weight": "6 lb"
 			}
 		},
 		{
-			"id": "a590c956-1c5c-4a0a-9b14-f8de3ecbad63",
+			"id": "0032a515-6bca-4b80-804e-f8dc631ac972",
 			"type": "equipment",
-			"description": "Regular Bow (ST18)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Pump Shotgun, 12G",
+			"reference": "B279",
+			"tech_level": "6",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 180,
-			"weight": "2 lb",
+			"value": 240,
+			"weight": "8 lb",
 			"weapons": [
 				{
-					"id": "8e1267c8-602d-4d7c-ac17-4a3b51b4c365",
+					"id": "9a28e235-8d03-437d-ac4a-550582cc980b",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+3"
+						"type": "pi",
+						"base": "1d+1"
 					},
-					"strength": "18†",
-					"accuracy": "2",
-					"range": "270/360",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"strength": "10†",
+					"accuracy": "3",
+					"range": "50/125",
+					"rate_of_fire": "2x9",
+					"shots": "5(3i)",
+					"bulk": "-5",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Shotgun"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "270/360",
-						"damage": "1d+3 imp"
+						"range": "50/125",
+						"damage": "1d+1 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 180,
-				"extended_weight": "2 lb"
+				"extended_value": 240,
+				"extended_weight": "8 lb"
+			}
+		},
+		{
+			"id": "fa41df8d-ea35-4807-be22-5156748b3933",
+			"type": "equipment_container",
+			"open": true,
+			"description": "Purse, Small",
+			"reference": "B288",
+			"tech_level": "1",
+			"tags": [
+				"Camping and Survival Gear"
+			],
+			"quantity": 1,
+			"value": 10,
+			"weight": "0.2 lb",
+			"prereqs": {
+				"type": "prereq_list",
+				"all": true,
+				"prereqs": [
+					{
+						"type": "contained_weight_prereq",
+						"has": true,
+						"qualifier": {
+							"compare": "at_most",
+							"qualifier": "1 lb"
+						}
+					}
+				]
+			},
+			"calc": {
+				"extended_value": 10,
+				"extended_weight": "0.2 lb"
 			}
 		},
 		{
-			"id": "e67c46ff-081e-4a89-9ede-5667d264b770",
+			"id": "9cb7d976-d975-4644-ac16-7dc5e72b862c",
 			"type": "equipment",
-			"description": "Regular Bow (ST19)",
-			"reference": "B275",
+			"description": "Quarterstaff",
+			"reference": "B273",
 			"tech_level": "0",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 190,
-			"weight": "2 lb",
+			"value": 10,
+			"weight": "4 lb",
 			"weapons": [
 				{
-					"id": "b79d3078-7971-462f-a224-eb15a4ec1b53",
-					"type": "ranged_weapon",
+					"id": "ad65dc1c-caf5-4c71-a880-84587832d8ea",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d"
+						"type": "cr",
+						"st": "sw",
+						"base": "2"
 					},
-					"strength": "19†",
-					"accuracy": "2",
-					"range": "285/380",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"strength": "7†",
+					"usage": "Swung",
+					"usage_notes": "Staff",
+					"reach": "1,2",
+					"parry": "+2",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
@@ -18571,47 +15666,39 @@
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Staff"
+						},
+						{
+							"type": "skill",
+							"name": "Polearm",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Spear",
+							"modifier": -2
 						}
 					],
 					"calc": {
-						"range": "285/380",
-						"damage": "2d imp"
+						"parry": "+2",
+						"block": "No",
+						"damage": "sw+2 cr"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 190,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "e2ff3375-7e63-466d-a41d-9ef33f1545dc",
-			"type": "equipment",
-			"description": "Regular Bow (ST20)",
-			"reference": "B275",
-			"tech_level": "0",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
-			],
-			"quantity": 1,
-			"value": 200,
-			"weight": "2 lb",
-			"weapons": [
+				},
 				{
-					"id": "0313291d-31dd-4820-bca7-9a19b2f04e72",
-					"type": "ranged_weapon",
+					"id": "0f333350-cfd8-4fba-a202-b2bf19773be5",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "2d"
+						"type": "cr",
+						"st": "thr",
+						"base": "2"
 					},
-					"strength": "20†",
-					"accuracy": "2",
-					"range": "300/400",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-7",
+					"strength": "7†",
+					"usage": "Thrust",
+					"usage_notes": "Staff",
+					"reach": "1,2",
+					"parry": "+2",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
@@ -18619,387 +15706,341 @@
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Staff"
+						},
+						{
+							"type": "skill",
+							"name": "Polearm",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Spear",
+							"modifier": -2
 						}
 					],
 					"calc": {
-						"range": "300/400",
-						"damage": "2d imp"
+						"parry": "+2",
+						"block": "No",
+						"damage": "thr+2 cr"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 200,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "1b423b2a-3e3e-44fe-a3ad-7ccfabf1d879",
-			"type": "equipment",
-			"description": "Reich 2 .338 Tungsten Sniper",
-			"reference": "B279",
-			"tech_level": "9",
-			"legality_class": "3",
-			"tags": [
-				"Missile Weapon"
-			],
-			"quantity": 1,
-			"value": 5600,
-			"weight": "17.5 lb",
-			"weapons": [
+				},
 				{
-					"id": "3d240105-4005-4b56-a1ff-7a04d09699aa",
-					"type": "ranged_weapon",
+					"id": "cbc835a1-cf24-479a-bd41-0e8a7b4b8c37",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "7d+2",
-						"armor_divisor": 2
+						"type": "cr",
+						"st": "sw",
+						"base": "2"
 					},
-					"strength": "11B†",
-					"accuracy": "6+3",
-					"range": "1500/5500",
-					"rate_of_fire": "1",
-					"shots": "4+1(3)",
-					"bulk": "-6",
-					"recoil": "4",
+					"strength": "9†",
+					"usage": "Swung",
+					"usage_notes": "Two-Handed Sword",
+					"reach": "1,2",
+					"parry": "0",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -2
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle"
+							"name": "Two-Handed Sword"
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -2
+							"name": "Broadsword",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
+							"name": "Force Sword",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
-						},
+							"name": "Sword!"
+						}
+					],
+					"calc": {
+						"parry": "0",
+						"block": "No",
+						"damage": "sw+2 cr"
+					}
+				},
+				{
+					"id": "3cb8cfdd-ea36-4144-b25e-406f4a105764",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "cr",
+						"st": "thr",
+						"base": "1"
+					},
+					"strength": "9†",
+					"usage": "Thrust",
+					"usage_notes": "Two-Handed Sword",
+					"reach": "2",
+					"parry": "0",
+					"block": "No",
+					"defaults": [
 						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
+							"type": "dx",
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
+							"name": "Two-Handed Sword"
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
+							"name": "Broadsword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
+							"name": "Force Sword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Gun!"
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "1500/5500",
-						"damage": "7d+2(2) pi"
+						"parry": "0",
+						"block": "No",
+						"damage": "thr+1 cr"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 5600,
-				"extended_weight": "17.5 lb"
+				"extended_value": 10,
+				"extended_weight": "4 lb"
 			}
 		},
 		{
-			"id": "1bdb6145-6fef-436e-b863-ad5ff481651d",
+			"id": "0d6354e1-8ec6-4644-afd8-beb3249d2833",
 			"type": "equipment",
-			"description": "Reinforced Boots",
-			"reference": "B284",
+			"description": "Radio, Backpack",
+			"reference": "B288",
+			"notes": "VHF radio. 20-mile range. 12 hrs.",
 			"tech_level": "7",
 			"tags": [
-				"Footwear"
+				"Communications and Information Gear"
 			],
 			"quantity": 1,
-			"value": 75,
-			"weight": "3 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "foot",
-					"amount": 2
-				},
-				{
-					"type": "weapon_bonus",
-					"selection_type": "weapons_with_name",
-					"specialization": {
-						"compare": "is",
-						"qualifier": "Kick"
-					},
-					"amount": 1
-				}
+			"value": 6000,
+			"weight": "15 lb",
+			"calc": {
+				"extended_value": 6000,
+				"extended_weight": "15 lb"
+			}
+		},
+		{
+			"id": "847b48a9-8457-48f1-9bc5-108e5c483f37",
+			"type": "equipment",
+			"description": "Radio, Hand",
+			"reference": "B288",
+			"notes": "Classic \"walkie-talkie.\" 2-mile range. 12 hrs.",
+			"tech_level": "7",
+			"tags": [
+				"Communications and Information Gear"
 			],
+			"quantity": 1,
+			"value": 100,
+			"weight": "1 lb",
 			"calc": {
-				"extended_value": 75,
-				"extended_weight": "3 lb"
+				"extended_value": 100,
+				"extended_weight": "1 lb"
 			}
 		},
 		{
-			"id": "7622b8c0-562a-4147-80a3-afd3bdf2fc3b",
+			"id": "a627b99d-ec6e-4d9b-bbaf-ebcb0b62908f",
 			"type": "equipment",
-			"description": "Revolver, .36",
-			"reference": "B278",
-			"tech_level": "5",
-			"legality_class": "3",
+			"description": "Radio, Headset",
+			"reference": "B288",
+			"notes": "With throat mike. 1-mile range. 12 hrs.",
+			"tech_level": "8",
 			"tags": [
-				"Missile Weapon"
+				"Communications and Information Gear"
 			],
 			"quantity": 1,
-			"value": 150,
-			"weight": "2.5 lb",
+			"value": 500,
+			"weight": "0.5 lb",
+			"calc": {
+				"extended_value": 500,
+				"extended_weight": "0.5 lb"
+			}
+		},
+		{
+			"id": "dad42d86-9790-46d2-a1c1-59534b816e84",
+			"type": "equipment",
+			"description": "Radio, Headset, secure",
+			"reference": "B288",
+			"notes": "With throat mike. 1-mile range. Secure, encrypted version. 12 hrs.",
+			"tech_level": "8",
+			"tags": [
+				"Communications and Information Gear"
+			],
+			"quantity": 1,
+			"value": 5000,
+			"weight": "0.5 lb",
+			"calc": {
+				"extended_value": 5000,
+				"extended_weight": "0.5 lb"
+			}
+		},
+		{
+			"id": "e9dcc6bb-e08c-4b63-ac24-5e72d60ecc33",
+			"type": "equipment",
+			"description": "Rapier",
+			"reference": "B273",
+			"tech_level": "4",
+			"tags": [
+				"Melee Weapon"
+			],
+			"quantity": 1,
+			"value": 500,
+			"weight": "2.75 lb",
 			"weapons": [
 				{
-					"id": "fd95eca2-9c06-4fa7-98ed-70035d9df795",
-					"type": "ranged_weapon",
+					"id": "faed2269-9c35-4b6c-b478-4d353e824920",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "2d-1"
+						"type": "imp",
+						"st": "thr",
+						"base": "1"
 					},
-					"strength": "10",
-					"accuracy": "1",
-					"range": "120/1300",
-					"rate_of_fire": "1",
-					"shots": "6(3i)",
-					"bulk": "-2",
-					"recoil": "2",
+					"strength": "9",
+					"usage": "Thrust",
+					"reach": "1,2",
+					"parry": "0F",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
+							"name": "Rapier"
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
+							"name": "Broadsword",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
+							"name": "Main-Gauche",
+							"modifier": -3
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
+							"name": "Saber",
+							"modifier": -3
 						},
 						{
 							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
+							"name": "Smallsword",
+							"modifier": -3
 						},
 						{
 							"type": "skill",
-							"name": "Gun!"
+							"name": "Sword!"
 						}
 					],
 					"calc": {
-						"range": "120/1300",
-						"damage": "2d-1 pi"
+						"parry": "0F",
+						"block": "No",
+						"damage": "thr+1 imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 150,
-				"extended_weight": "2.5 lb"
+				"extended_value": 500,
+				"extended_weight": "2.75 lb"
 			}
 		},
 		{
-			"id": "c24b4a82-23a7-4916-8395-4b08f9d1c7ca",
+			"id": "161803c5-3f84-4d40-b4fc-cd9c3f142a53",
 			"type": "equipment",
-			"description": "Revolver, .38",
-			"reference": "B278",
-			"tech_level": "6",
-			"legality_class": "3",
+			"description": "Regular Bow",
+			"reference": "B275",
+			"tech_level": "0",
 			"tags": [
-				"Missile Weapon"
+				"Missile Weapon",
+				"UsesAmmoType:Arrow"
 			],
+			"rated_strength": 10,
 			"quantity": 1,
-			"value": 400,
+			"value": 100,
 			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "87e675ed-2d1a-4d9c-851f-5bc39e67c3f8",
+					"id": "1b8db93f-e26c-40b3-85a2-9e0c1ede3081",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "2d-1"
+						"type": "imp",
+						"st": "thr",
+						"base": "1"
 					},
-					"strength": "8",
+					"strength": "10†",
 					"accuracy": "2",
-					"range": "120/1500",
-					"rate_of_fire": "3",
-					"shots": "6(3i)",
-					"bulk": "-2",
-					"recoil": "2",
+					"range": "x15/x20",
+					"rate_of_fire": "1",
+					"shots": "1(2)",
+					"bulk": "-7",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Pistol"
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Shotgun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Submachine Gun",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Musket",
-							"modifier": -2
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Grenade Launcher",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Gyroc",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Gun!"
+							"name": "Bow"
 						}
 					],
 					"calc": {
-						"range": "120/1500",
-						"damage": "2d-1 pi"
+						"range": "x15/x20",
+						"damage": "thr+1 imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 400,
+				"extended_value": 100,
 				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "e6d67927-6e0c-4bba-a63f-b84c5d57c61b",
+			"id": "1b423b2a-3e3e-44fe-a3ad-7ccfabf1d879",
 			"type": "equipment",
-			"description": "Revolver, .44M",
-			"reference": "B278",
-			"tech_level": "7",
+			"description": "Reich 2 .338 Tungsten Sniper",
+			"reference": "B279",
+			"tech_level": "9",
 			"legality_class": "3",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 900,
-			"weight": "3.25 lb",
+			"value": 5600,
+			"weight": "17.5 lb",
 			"weapons": [
 				{
-					"id": "b1af4630-1ba5-424f-83f4-57b3e9c2a8f5",
+					"id": "3d240105-4005-4b56-a1ff-7a04d09699aa",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi+",
-						"base": "3d"
+						"type": "pi",
+						"base": "7d+2",
+						"armor_divisor": 2
 					},
-					"strength": "11",
-					"accuracy": "2",
-					"range": "200/2500",
-					"rate_of_fire": "3",
-					"shots": "6(3i)",
-					"bulk": "-3",
+					"strength": "11B†",
+					"accuracy": "6+3",
+					"range": "1500/5500",
+					"rate_of_fire": "1",
+					"shots": "4+1(3)",
+					"bulk": "-6",
 					"recoil": "4",
 					"defaults": [
 						{
@@ -19009,13 +16050,13 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Pistol"
+							"specialization": "Pistol",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Rifle",
-							"modifier": -2
+							"specialization": "Rifle"
 						},
 						{
 							"type": "skill",
@@ -19065,44 +16106,77 @@
 						}
 					],
 					"calc": {
-						"range": "200/2500",
-						"damage": "3d pi+"
+						"range": "1500/5500",
+						"damage": "7d+2(2) pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 900,
-				"extended_weight": "3.25 lb"
+				"extended_value": 5600,
+				"extended_weight": "17.5 lb"
 			}
 		},
 		{
-			"id": "d00aa3d8-da92-4451-9449-7823dafaac66",
+			"id": "1bdb6145-6fef-436e-b863-ad5ff481651d",
 			"type": "equipment",
-			"description": "Revolver, .357M",
-			"reference": "B278",
+			"description": "Reinforced Boots",
+			"reference": "B284",
 			"tech_level": "7",
+			"tags": [
+				"Footwear"
+			],
+			"quantity": 1,
+			"value": 75,
+			"weight": "3 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "foot",
+					"amount": 2
+				},
+				{
+					"type": "weapon_bonus",
+					"selection_type": "weapons_with_name",
+					"specialization": {
+						"compare": "is",
+						"qualifier": "Kick"
+					},
+					"amount": 1
+				}
+			],
+			"calc": {
+				"extended_value": 75,
+				"extended_weight": "3 lb"
+			}
+		},
+		{
+			"id": "7622b8c0-562a-4147-80a3-afd3bdf2fc3b",
+			"type": "equipment",
+			"description": "Revolver, .36",
+			"reference": "B278",
+			"tech_level": "5",
 			"legality_class": "3",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 500,
-			"weight": "3 lb",
+			"value": 150,
+			"weight": "2.5 lb",
 			"weapons": [
 				{
-					"id": "dd0baaba-9dd1-41b8-b029-1b4f0891a5f5",
+					"id": "fd95eca2-9c06-4fa7-98ed-70035d9df795",
 					"type": "ranged_weapon",
 					"damage": {
 						"type": "pi",
-						"base": "3d-1"
+						"base": "2d-1"
 					},
 					"strength": "10",
-					"accuracy": "2",
-					"range": "185/2000",
-					"rate_of_fire": "3",
+					"accuracy": "1",
+					"range": "120/1300",
+					"rate_of_fire": "1",
 					"shots": "6(3i)",
 					"bulk": "-2",
-					"recoil": "3",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
@@ -19167,44 +16241,44 @@
 						}
 					],
 					"calc": {
-						"range": "185/2000",
-						"damage": "3d-1 pi"
+						"range": "120/1300",
+						"damage": "2d-1 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 500,
-				"extended_weight": "3 lb"
+				"extended_value": 150,
+				"extended_weight": "2.5 lb"
 			}
 		},
 		{
-			"id": "08a53ef8-fb7f-48df-a058-223e1b4078d6",
+			"id": "c24b4a82-23a7-4916-8395-4b08f9d1c7ca",
 			"type": "equipment",
-			"description": "Rifle-Musket, .577",
-			"reference": "B279",
-			"tech_level": "5",
+			"description": "Revolver, .38",
+			"reference": "B278",
+			"tech_level": "6",
 			"legality_class": "3",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 150,
-			"weight": "8.5 lb",
+			"value": 400,
+			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "c4abf252-7692-48e2-8c3e-0fc98862e6f8",
+					"id": "87e675ed-2d1a-4d9c-851f-5bc39e67c3f8",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi+",
-						"base": "4d"
+						"type": "pi",
+						"base": "2d-1"
 					},
-					"strength": "10†",
-					"accuracy": "4",
-					"range": "700/2100",
-					"rate_of_fire": "1",
-					"shots": "1(15)",
-					"bulk": "-6",
-					"recoil": "3",
+					"strength": "8",
+					"accuracy": "2",
+					"range": "120/1500",
+					"rate_of_fire": "3",
+					"shots": "6(3i)",
+					"bulk": "-2",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
@@ -19213,13 +16287,13 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -2
+							"specialization": "Pistol"
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Rifle"
+							"specialization": "Rifle",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
@@ -19269,117 +16343,44 @@
 						}
 					],
 					"calc": {
-						"range": "700/2100",
-						"damage": "4d pi+"
+						"range": "120/1500",
+						"damage": "2d-1 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 150,
-				"extended_weight": "8.5 lb"
-			}
-		},
-		{
-			"id": "68ce7438-2609-4891-a741-44836be621b6",
-			"type": "equipment",
-			"description": "Rope, 3/4\", 10 yards",
-			"reference": "B288",
-			"notes": "Supports 1,100 lbs.",
-			"tech_level": "1",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 25,
-			"weight": "5 lb",
-			"calc": {
-				"extended_value": 25,
-				"extended_weight": "5 lb"
-			}
-		},
-		{
-			"id": "0b922d46-a557-4e93-b71f-23382b0913f5",
-			"type": "equipment",
-			"description": "Rope, 3/4\", 20 yards",
-			"reference": "B288",
-			"notes": "Supports 1,100 lbs.",
-			"tech_level": "1",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 50,
-			"weight": "10 lb",
-			"calc": {
-				"extended_value": 50,
-				"extended_weight": "10 lb"
-			}
-		},
-		{
-			"id": "46d169e1-2732-46a2-8a1e-af0e6251ba90",
-			"type": "equipment",
-			"description": "Rope, 3/8\", 10 yards",
-			"reference": "B288",
-			"notes": "Supports 300 lbs.",
-			"tech_level": "0",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 5,
-			"weight": "1.5 lb",
-			"calc": {
-				"extended_value": 5,
-				"extended_weight": "1.5 lb"
-			}
-		},
-		{
-			"id": "0bc34f12-4fe7-4f1d-8fa3-75f737c7561f",
-			"type": "equipment",
-			"description": "Rope, 3/8\", 20 yards",
-			"reference": "B288",
-			"notes": "Supports 300 lbs.",
-			"tech_level": "0",
-			"tags": [
-				"Camping and Survival Gear"
-			],
-			"quantity": 1,
-			"value": 10,
-			"weight": "3 lb",
-			"calc": {
-				"extended_value": 10,
-				"extended_weight": "3 lb"
+				"extended_value": 400,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "32d2ceb3-6246-46a0-a57e-289aa5eeeea8",
+			"id": "e6d67927-6e0c-4bba-a63f-b84c5d57c61b",
 			"type": "equipment",
-			"description": "RPG, 85mm",
-			"reference": "B281",
+			"description": "Revolver, .44M",
+			"reference": "B278",
 			"tech_level": "7",
-			"legality_class": "1",
+			"legality_class": "3",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 800,
-			"weight": "21 lb",
+			"value": 900,
+			"weight": "3.25 lb",
 			"weapons": [
 				{
-					"id": "4c18b412-0284-4c30-a5d7-18413833ce1e",
+					"id": "b1af4630-1ba5-424f-83f4-57b3e9c2a8f5",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "cr ex",
-						"base": "6dx3",
-						"armor_divisor": 10
+						"type": "pi+",
+						"base": "3d"
 					},
-					"strength": "10†",
-					"accuracy": "3+1",
-					"range": "300/1000",
-					"rate_of_fire": "1",
-					"shots": "1(5)",
-					"bulk": "-6",
-					"recoil": "1",
+					"strength": "11",
+					"accuracy": "2",
+					"range": "200/2500",
+					"rate_of_fire": "3",
+					"shots": "6(3i)",
+					"bulk": "-3",
+					"recoil": "4",
 					"defaults": [
 						{
 							"type": "dx",
@@ -19388,38 +16389,37 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Pistol",
-							"modifier": -4
+							"specialization": "Pistol"
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Rifle",
-							"modifier": -4
+							"modifier": -2
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Shotgun",
-							"modifier": -4
+							"modifier": -2
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Light Machine Gun",
-							"modifier": -4
+							"modifier": -2
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Submachine Gun",
-							"modifier": -4
+							"modifier": -2
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Musket",
-							"modifier": -4
+							"modifier": -2
 						},
 						{
 							"type": "skill",
@@ -19436,7 +16436,8 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon"
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
@@ -19444,365 +16445,296 @@
 						}
 					],
 					"calc": {
-						"range": "300/1000",
-						"damage": "6dx3(10) cr ex"
+						"range": "200/2500",
+						"damage": "3d pi+"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 800,
-				"extended_weight": "21 lb"
+				"extended_value": 900,
+				"extended_weight": "3.25 lb"
 			}
 		},
 		{
-			"id": "67e27e4d-e217-4a82-831f-40a38e864ab8",
+			"id": "d00aa3d8-da92-4451-9449-7823dafaac66",
 			"type": "equipment",
-			"description": "Saber",
-			"reference": "B273",
-			"tech_level": "4",
+			"description": "Revolver, .357M",
+			"reference": "B278",
+			"tech_level": "7",
+			"legality_class": "3",
 			"tags": [
-				"Melee Weapon"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 700,
-			"weight": "2 lb",
+			"value": 500,
+			"weight": "3 lb",
 			"weapons": [
 				{
-					"id": "9357fe3c-6931-4e6a-94d9-9fdb66907864",
-					"type": "melee_weapon",
+					"id": "dd0baaba-9dd1-41b8-b029-1b4f0891a5f5",
+					"type": "ranged_weapon",
 					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "-1"
+						"type": "pi",
+						"base": "3d-1"
 					},
-					"strength": "8",
-					"usage": "Swung",
-					"reach": "1",
-					"parry": "0F",
-					"block": "No",
+					"strength": "10",
+					"accuracy": "2",
+					"range": "185/2000",
+					"rate_of_fire": "3",
+					"shots": "6(3i)",
+					"bulk": "-2",
+					"recoil": "3",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Saber"
-						},
-						{
-							"type": "skill",
-							"name": "Broadsword",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Main-Gauche",
-							"modifier": -3
+							"name": "Guns",
+							"specialization": "Pistol"
 						},
 						{
 							"type": "skill",
-							"name": "Rapier",
-							"modifier": -3
+							"name": "Guns",
+							"specialization": "Rifle",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Shortsword",
-							"modifier": -4
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Smallsword",
-							"modifier": -3
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Sword!"
-						}
-					],
-					"calc": {
-						"parry": "0F",
-						"block": "No",
-						"damage": "sw-1 cut"
-					}
-				},
-				{
-					"id": "2740df03-b9f7-4e7b-b4e8-915877cb03b6",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "thr",
-						"base": "1"
-					},
-					"strength": "8",
-					"usage": "Thrust",
-					"reach": "1",
-					"parry": "0F",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Saber"
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
-							"name": "Broadsword",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
 							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Main-Gauche",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Rapier",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Shortsword",
+							"name": "Guns",
+							"specialization": "Gyroc",
 							"modifier": -4
 						},
 						{
-							"type": "skill",
-							"name": "Smallsword",
-							"modifier": -3
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Sword!"
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"parry": "0F",
-						"block": "No",
-						"damage": "thr+1 imp"
+						"range": "185/2000",
+						"damage": "3d-1 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 700,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "facbbcc0-a5af-4233-b082-fc6b8f3d3e4e",
-			"type": "equipment",
-			"description": "Saddle and Tack",
-			"reference": "B289",
-			"notes": "Basic equipment for Riding skill.",
-			"tech_level": "2",
-			"tags": [
-				"Equestrian Gear"
-			],
-			"quantity": 1,
-			"value": 150,
-			"weight": "15 lb",
-			"calc": {
-				"extended_value": 150,
-				"extended_weight": "15 lb"
-			}
-		},
-		{
-			"id": "ee08112d-106e-4f35-ae5d-0abe9bac6191",
-			"type": "equipment_container",
-			"open": true,
-			"description": "Saddlebags",
-			"reference": "B289",
-			"tech_level": "1",
-			"tags": [
-				"Equestrian Gear"
-			],
-			"quantity": 1,
-			"value": 100,
-			"weight": "3 lb",
-			"prereqs": {
-				"type": "prereq_list",
-				"all": true,
-				"prereqs": [
-					{
-						"type": "contained_weight_prereq",
-						"has": true,
-						"qualifier": {
-							"compare": "at_most",
-							"qualifier": "40 lb"
-						}
-					}
-				]
-			},
-			"calc": {
-				"extended_value": 100,
+				"extended_value": 500,
 				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "b37e2a27-db5a-4c44-a579-060040c14835",
+			"id": "08a53ef8-fb7f-48df-a058-223e1b4078d6",
 			"type": "equipment",
-			"description": "SAM, 70mm",
-			"reference": "B281",
-			"tech_level": "8",
-			"legality_class": "1",
+			"description": "Rifle-Musket, .577",
+			"reference": "B279",
+			"tech_level": "5",
+			"legality_class": "3",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 38000,
-			"weight": "18 lb",
+			"value": 150,
+			"weight": "8.5 lb",
 			"weapons": [
 				{
-					"id": "f3a1e265-0d90-4201-b321-d5e05a5bda06",
+					"id": "c4abf252-7692-48e2-8c3e-0fc98862e6f8",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "cr ex",
-						"base": "6dx3",
-						"fragmentation": "6d",
-						"fragmentation_type": "cut"
+						"type": "pi+",
+						"base": "4d"
 					},
 					"strength": "10†",
-					"accuracy": "7",
-					"range": "1000/8800",
+					"accuracy": "4",
+					"range": "700/2100",
 					"rate_of_fire": "1",
-					"shots": "1(20)",
-					"bulk": "-8",
-					"recoil": "1",
+					"shots": "1(15)",
+					"bulk": "-6",
+					"recoil": "3",
 					"defaults": [
 						{
-							"type": "iq",
-							"modifier": -5
+							"type": "dx",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Artillery",
-							"specialization": "Guided Missile"
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Rifle"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "1000/8800",
-						"damage": "6dx3 cr ex [6d cut]"
+						"range": "700/2100",
+						"damage": "4d pi+"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 38000,
-				"extended_weight": "18 lb"
+				"extended_value": 150,
+				"extended_weight": "8.5 lb"
 			}
 		},
 		{
-			"id": "ef26ccce-bbcc-43ca-9f73-05eb99ee3125",
+			"id": "68ce7438-2609-4891-a741-44836be621b6",
 			"type": "equipment",
-			"description": "Sandals",
-			"reference": "B284",
-			"notes": "Concealable",
-			"tech_level": "0",
+			"description": "Rope, 3/4\", 10 yards",
+			"reference": "B288",
+			"notes": "Supports 1,100 lbs.",
+			"tech_level": "1",
 			"tags": [
-				"Footwear"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
 			"value": 25,
-			"weight": "0.5 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "foot",
-					"specialization": "underside",
-					"amount": 1
-				}
-			],
+			"weight": "5 lb",
 			"calc": {
 				"extended_value": 25,
-				"extended_weight": "0.5 lb"
+				"extended_weight": "5 lb"
 			}
 		},
 		{
-			"id": "e4d8a947-2565-4949-a443-1b2a30d784cf",
+			"id": "0b922d46-a557-4e93-b71f-23382b0913f5",
 			"type": "equipment",
-			"description": "Sap",
-			"reference": "B271",
+			"description": "Rope, 3/4\", 20 yards",
+			"reference": "B288",
+			"notes": "Supports 1,100 lbs.",
 			"tech_level": "1",
 			"tags": [
-				"Melee Weapon"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 20,
-			"weight": "1 lb",
-			"weapons": [
-				{
-					"id": "8adbe63a-d176-47c3-9700-0b1f9b417b73",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "cr",
-						"st": "thr"
-					},
-					"strength": "7",
-					"usage": "Swung",
-					"reach": "C",
-					"parry": "0",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx"
-						},
-						{
-							"type": "skill",
-							"name": "Brawling"
-						}
-					],
-					"calc": {
-						"parry": "0",
-						"block": "No",
-						"damage": "thr cr"
-					}
-				}
-			],
+			"value": 50,
+			"weight": "10 lb",
 			"calc": {
-				"extended_value": 20,
-				"extended_weight": "1 lb"
+				"extended_value": 50,
+				"extended_weight": "10 lb"
 			}
 		},
 		{
-			"id": "a3de2867-935f-43aa-9aca-1429b39f96f7",
+			"id": "46d169e1-2732-46a2-8a1e-af0e6251ba90",
 			"type": "equipment",
-			"description": "Satellite Phone",
+			"description": "Rope, 3/8\", 10 yards",
 			"reference": "B288",
-			"notes": "Global range, satellite relay. 1 hr.",
-			"tech_level": "8",
+			"notes": "Supports 300 lbs.",
+			"tech_level": "0",
 			"tags": [
-				"Communications and Information Gear"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 3000,
-			"weight": "3 lb",
+			"value": 5,
+			"weight": "1.5 lb",
 			"calc": {
-				"extended_value": 3000,
-				"extended_weight": "3 lb"
+				"extended_value": 5,
+				"extended_weight": "1.5 lb"
 			}
 		},
 		{
-			"id": "daebec24-549c-411c-883a-9d4da0f4bfe2",
-			"type": "equipment",
-			"description": "Saw",
-			"reference": "B289",
-			"notes": "A lumberjack's tool, not a carpentry saw",
+			"id": "0bc34f12-4fe7-4f1d-8fa3-75f737c7561f",
+			"type": "equipment",
+			"description": "Rope, 3/8\", 20 yards",
+			"reference": "B288",
+			"notes": "Supports 300 lbs.",
 			"tech_level": "0",
 			"tags": [
-				"Tools"
+				"Camping and Survival Gear"
 			],
 			"quantity": 1,
-			"value": 150,
+			"value": 10,
 			"weight": "3 lb",
 			"calc": {
-				"extended_value": 150,
+				"extended_value": 10,
 				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "37f5447c-8566-4a59-8b84-5272704fe90b",
+			"id": "32d2ceb3-6246-46a0-a57e-289aa5eeeea8",
 			"type": "equipment",
-			"description": "SAW, 5.56mm",
+			"description": "RPG, 85mm",
 			"reference": "B281",
 			"tech_level": "7",
 			"legality_class": "1",
@@ -19810,23 +16742,24 @@
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 4800,
-			"weight": "24 lb",
+			"value": 800,
+			"weight": "21 lb",
 			"weapons": [
 				{
-					"id": "5d3068e8-1985-4621-9ae2-c23d4d182da4",
+					"id": "4c18b412-0284-4c30-a5d7-18413833ce1e",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "pi",
-						"base": "5d+1"
+						"type": "cr ex",
+						"base": "6dx3",
+						"armor_divisor": 10
 					},
-					"strength": "12B†",
-					"accuracy": "5",
-					"range": "800/3500",
-					"rate_of_fire": "12!",
-					"shots": "200(5)",
+					"strength": "10†",
+					"accuracy": "3+1",
+					"range": "300/1000",
+					"rate_of_fire": "1",
+					"shots": "1(5)",
 					"bulk": "-6",
-					"recoil": "2",
+					"recoil": "1",
 					"defaults": [
 						{
 							"type": "dx",
@@ -19836,36 +16769,37 @@
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Pistol",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Rifle",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Shotgun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Light Machine Gun"
+							"specialization": "Light Machine Gun",
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Submachine Gun",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
 							"name": "Guns",
 							"specialization": "Musket",
-							"modifier": -2
+							"modifier": -4
 						},
 						{
 							"type": "skill",
@@ -19882,8 +16816,7 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Light Anti-Armor Weapon",
-							"modifier": -4
+							"specialization": "Light Anti-Armor Weapon"
 						},
 						{
 							"type": "skill",
@@ -19891,363 +16824,389 @@
 						}
 					],
 					"calc": {
-						"range": "800/3500",
-						"damage": "5d+1 pi"
+						"range": "300/1000",
+						"damage": "6dx3(10) cr ex"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 4800,
-				"extended_weight": "24 lb"
+				"extended_value": 800,
+				"extended_weight": "21 lb"
 			}
 		},
 		{
-			"id": "937a2a7a-76b4-4937-8949-7e1248afe3fe",
+			"id": "67e27e4d-e217-4a82-831f-40a38e864ab8",
 			"type": "equipment",
-			"description": "Scale Armor",
-			"reference": "B283",
-			"tech_level": "2",
+			"description": "Saber",
+			"reference": "B273",
+			"tech_level": "4",
 			"tags": [
-				"Body Armor"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 420,
-			"weight": "35 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "torso",
-					"amount": 4
-				},
+			"value": 700,
+			"weight": "2 lb",
+			"weapons": [
 				{
-					"type": "dr_bonus",
-					"location": "vitals",
-					"amount": 4
+					"id": "9357fe3c-6931-4e6a-94d9-9fdb66907864",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "cut",
+						"st": "sw",
+						"base": "-1"
+					},
+					"strength": "8",
+					"usage": "Swung",
+					"reach": "1",
+					"parry": "0F",
+					"block": "No",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Saber"
+						},
+						{
+							"type": "skill",
+							"name": "Broadsword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Main-Gauche",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Rapier",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Shortsword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Smallsword",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
+						}
+					],
+					"calc": {
+						"parry": "0F",
+						"block": "No",
+						"damage": "sw-1 cut"
+					}
 				},
 				{
-					"type": "dr_bonus",
-					"location": "groin",
-					"amount": 4
-				}
-			],
-			"calc": {
-				"extended_value": 420,
-				"extended_weight": "35 lb"
-			}
-		},
-		{
-			"id": "f1ab1686-327b-42b5-9393-8b94d33cdc63",
-			"type": "equipment",
-			"description": "Scale Leggings",
-			"reference": "B283",
-			"tech_level": "2",
-			"legality_class": "3",
-			"tags": [
-				"Limb Armor"
-			],
-			"quantity": 1,
-			"value": 250,
-			"weight": "21 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "leg",
-					"amount": 4
-				}
-			],
-			"calc": {
-				"extended_value": 250,
-				"extended_weight": "21 lb"
-			}
-		},
-		{
-			"id": "101460c5-21a0-46ae-90e9-3fb586f56e57",
-			"type": "equipment",
-			"description": "Scale Sleeves",
-			"reference": "B283",
-			"tech_level": "2",
-			"legality_class": "3",
-			"tags": [
-				"Limb Armor"
-			],
-			"quantity": 1,
-			"value": 210,
-			"weight": "14 lb",
-			"features": [
-				{
-					"type": "dr_bonus",
-					"location": "arm",
-					"amount": 4
+					"id": "2740df03-b9f7-4e7b-b4e8-915877cb03b6",
+					"type": "melee_weapon",
+					"damage": {
+						"type": "imp",
+						"st": "thr",
+						"base": "1"
+					},
+					"strength": "8",
+					"usage": "Thrust",
+					"reach": "1",
+					"parry": "0F",
+					"block": "No",
+					"defaults": [
+						{
+							"type": "dx",
+							"modifier": -5
+						},
+						{
+							"type": "skill",
+							"name": "Saber"
+						},
+						{
+							"type": "skill",
+							"name": "Broadsword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Main-Gauche",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Rapier",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Shortsword",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Smallsword",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Sword!"
+						}
+					],
+					"calc": {
+						"parry": "0F",
+						"block": "No",
+						"damage": "thr+1 imp"
+					}
 				}
 			],
 			"calc": {
-				"extended_value": 210,
-				"extended_weight": "14 lb"
+				"extended_value": 700,
+				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "6e15c4ff-fec5-411a-b23e-93d12ad69727",
+			"id": "facbbcc0-a5af-4233-b082-fc6b8f3d3e4e",
 			"type": "equipment",
-			"description": "Scope, 4x",
+			"description": "Saddle and Tack",
 			"reference": "B289",
-			"notes": "+2 to Acc for aimed shots only.",
-			"tech_level": "6",
+			"notes": "Basic equipment for Riding skill.",
+			"tech_level": "2",
 			"tags": [
-				"Weapon and Combat Accessories"
+				"Equestrian Gear"
 			],
 			"quantity": 1,
 			"value": 150,
-			"weight": "1.5 lb",
+			"weight": "15 lb",
 			"calc": {
 				"extended_value": 150,
-				"extended_weight": "1.5 lb"
+				"extended_weight": "15 lb"
 			}
 		},
 		{
-			"id": "c04ca6e6-6f8f-4221-95b4-1a88f7bf1dee",
-			"type": "equipment",
-			"description": "Scope, 4x, Thermal Imaging",
+			"id": "ee08112d-106e-4f35-ae5d-0abe9bac6191",
+			"type": "equipment_container",
+			"open": true,
+			"description": "Saddlebags",
 			"reference": "B289",
-			"notes": "+2 to Acc for aimed shots only. Gives the user Infravision. 2 hrs.",
-			"tech_level": "8",
+			"tech_level": "1",
 			"tags": [
-				"Weapon and Combat Accessories"
+				"Equestrian Gear"
 			],
 			"quantity": 1,
-			"value": 8000,
-			"weight": "4 lb",
+			"value": 100,
+			"weight": "3 lb",
+			"prereqs": {
+				"type": "prereq_list",
+				"all": true,
+				"prereqs": [
+					{
+						"type": "contained_weight_prereq",
+						"has": true,
+						"qualifier": {
+							"compare": "at_most",
+							"qualifier": "40 lb"
+						}
+					}
+				]
+			},
 			"calc": {
-				"extended_value": 8000,
-				"extended_weight": "4 lb"
+				"extended_value": 100,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "f0893d8b-c139-4913-bac5-41ed21e3b62d",
+			"id": "b37e2a27-db5a-4c44-a579-060040c14835",
 			"type": "equipment",
-			"description": "Scorpion",
+			"description": "SAM, 70mm",
 			"reference": "B281",
-			"tech_level": "2",
-			"legality_class": "2",
+			"tech_level": "8",
+			"legality_class": "1",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 5000,
-			"weight": "110 lb",
+			"value": 38000,
+			"weight": "18 lb",
 			"weapons": [
 				{
-					"id": "4f0b06f3-2a80-4803-9cf9-f7c76de5432c",
+					"id": "f3a1e265-0d90-4201-b321-d5e05a5bda06",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "5d"
+						"type": "cr ex",
+						"base": "6dx3",
+						"fragmentation": "6d",
+						"fragmentation_type": "cut"
 					},
-					"strength": "45M†",
-					"accuracy": "3",
-					"range": "415/520",
+					"strength": "10†",
+					"accuracy": "7",
+					"range": "1000/8800",
 					"rate_of_fire": "1",
-					"shots": "1(30)",
-					"bulk": "-10",
-					"recoil": "-",
+					"shots": "1(20)",
+					"bulk": "-8",
+					"recoil": "1",
 					"defaults": [
 						{
-							"type": "dx",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gunner",
-							"specialization": "Catapult"
-						},
-						{
-							"type": "skill",
-							"name": "Gunner",
-							"specialization": "Beams",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gunner",
-							"specialization": "Cannon",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Gunner",
-							"specialization": "Machine Gun",
-							"modifier": -4
+							"type": "iq",
+							"modifier": -5
 						},
 						{
 							"type": "skill",
-							"name": "Gunner",
-							"specialization": "Rockets",
-							"modifier": -4
+							"name": "Artillery",
+							"specialization": "Guided Missile"
 						}
 					],
 					"calc": {
-						"range": "415/520",
-						"damage": "5d imp"
+						"range": "1000/8800",
+						"damage": "6dx3 cr ex [6d cut]"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 5000,
-				"extended_weight": "110 lb"
+				"extended_value": 38000,
+				"extended_weight": "18 lb"
 			}
 		},
 		{
-			"id": "b5375059-4889-400c-8279-6f1c7f346bef",
+			"id": "ef26ccce-bbcc-43ca-9f73-05eb99ee3125",
 			"type": "equipment",
-			"description": "Scuba Gear",
-			"reference": "B288",
-			"notes": "Includes 2-hour underwater air tank",
-			"tech_level": "6",
+			"description": "Sandals",
+			"reference": "B284",
+			"notes": "Concealable",
+			"tech_level": "0",
 			"tags": [
-				"Camping and Survival Gear"
+				"Footwear"
 			],
 			"quantity": 1,
-			"value": 1500,
-			"weight": "32 lb",
+			"value": 25,
+			"weight": "0.5 lb",
+			"features": [
+				{
+					"type": "dr_bonus",
+					"location": "foot",
+					"specialization": "underside",
+					"amount": 1
+				}
+			],
 			"calc": {
-				"extended_value": 1500,
-				"extended_weight": "32 lb"
+				"extended_value": 25,
+				"extended_weight": "0.5 lb"
 			}
 		},
 		{
-			"id": "31fe1f64-541c-4297-a86d-79fd16d65c12",
+			"id": "e4d8a947-2565-4949-a443-1b2a30d784cf",
 			"type": "equipment",
-			"description": "Scythe",
-			"reference": "B274",
-			"notes": "May get stuck in 2nd mode",
+			"description": "Sap",
+			"reference": "B271",
 			"tech_level": "1",
 			"tags": [
 				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 15,
-			"weight": "5 lb",
+			"value": 20,
+			"weight": "1 lb",
 			"weapons": [
 				{
-					"id": "b912dec6-71f3-42ca-8228-4547f2328c9c",
+					"id": "8adbe63a-d176-47c3-9700-0b1f9b417b73",
 					"type": "melee_weapon",
 					"damage": {
-						"type": "cut",
-						"st": "sw",
-						"base": "2"
+						"type": "cr",
+						"st": "thr"
 					},
-					"strength": "11‡",
+					"strength": "7",
 					"usage": "Swung",
-					"reach": "1",
-					"parry": "0U",
-					"block": "No",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Axe/Mace"
-						},
-						{
-							"type": "skill",
-							"name": "Axe/Mace",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Polearm",
-							"modifier": -4
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Flail",
-							"modifier": -4
-						}
-					],
-					"calc": {
-						"parry": "0U",
-						"block": "No",
-						"damage": "sw+2 cut"
-					}
-				},
-				{
-					"id": "cc9ecd1b-7230-4e36-a867-8b87e11b87e7",
-					"type": "melee_weapon",
-					"damage": {
-						"type": "imp",
-						"st": "sw"
-					},
-					"strength": "11‡",
-					"usage": "Thrust",
-					"reach": "1",
-					"parry": "0U",
+					"reach": "C",
+					"parry": "0",
 					"block": "No",
 					"defaults": [
 						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Two-Handed Axe/Mace"
-						},
-						{
-							"type": "skill",
-							"name": "Axe/Mace",
-							"modifier": -3
-						},
-						{
-							"type": "skill",
-							"name": "Polearm",
-							"modifier": -4
+							"type": "dx"
 						},
 						{
 							"type": "skill",
-							"name": "Two-Handed Flail",
-							"modifier": -4
+							"name": "Brawling"
 						}
 					],
 					"calc": {
-						"parry": "0U",
+						"parry": "0",
 						"block": "No",
-						"damage": "sw imp"
+						"damage": "thr cr"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 15,
-				"extended_weight": "5 lb"
+				"extended_value": 20,
+				"extended_weight": "1 lb"
+			}
+		},
+		{
+			"id": "a3de2867-935f-43aa-9aca-1429b39f96f7",
+			"type": "equipment",
+			"description": "Satellite Phone",
+			"reference": "B288",
+			"notes": "Global range, satellite relay. 1 hr.",
+			"tech_level": "8",
+			"tags": [
+				"Communications and Information Gear"
+			],
+			"quantity": 1,
+			"value": 3000,
+			"weight": "3 lb",
+			"calc": {
+				"extended_value": 3000,
+				"extended_weight": "3 lb"
+			}
+		},
+		{
+			"id": "daebec24-549c-411c-883a-9d4da0f4bfe2",
+			"type": "equipment",
+			"description": "Saw",
+			"reference": "B289",
+			"notes": "A lumberjack's tool, not a carpentry saw",
+			"tech_level": "0",
+			"tags": [
+				"Tools"
+			],
+			"quantity": 1,
+			"value": 150,
+			"weight": "3 lb",
+			"calc": {
+				"extended_value": 150,
+				"extended_weight": "3 lb"
 			}
 		},
 		{
-			"id": "b7a37ad6-8c6f-4707-a82e-628212582576",
+			"id": "37f5447c-8566-4a59-8b84-5272704fe90b",
 			"type": "equipment",
-			"description": "Self-Loading Rifle, 7.62mm",
-			"reference": "B279",
-			"tech_level": "6",
-			"legality_class": "3",
+			"description": "SAW, 5.56mm",
+			"reference": "B281",
+			"tech_level": "7",
+			"legality_class": "1",
 			"tags": [
 				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 600,
-			"weight": "10 lb",
+			"value": 4800,
+			"weight": "24 lb",
 			"weapons": [
 				{
-					"id": "29e2c90e-6777-4148-b5a8-4681395936a8",
+					"id": "5d3068e8-1985-4621-9ae2-c23d4d182da4",
 					"type": "ranged_weapon",
 					"damage": {
 						"type": "pi",
-						"base": "7d"
+						"base": "5d+1"
 					},
-					"strength": "10†",
+					"strength": "12B†",
 					"accuracy": "5",
-					"range": "1000/4200",
-					"rate_of_fire": "3",
-					"shots": "8(3)",
-					"bulk": "-5",
-					"recoil": "3",
+					"range": "800/3500",
+					"rate_of_fire": "12!",
+					"shots": "200(5)",
+					"bulk": "-6",
+					"recoil": "2",
 					"defaults": [
 						{
 							"type": "dx",
@@ -20262,7 +17221,8 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Rifle"
+							"specialization": "Rifle",
+							"modifier": -2
 						},
 						{
 							"type": "skill",
@@ -20273,8 +17233,7 @@
 						{
 							"type": "skill",
 							"name": "Guns",
-							"specialization": "Light Machine Gun",
-							"modifier": -2
+							"specialization": "Light Machine Gun"
 						},
 						{
 							"type": "skill",
@@ -20312,500 +17271,255 @@
 						}
 					],
 					"calc": {
-						"range": "1000/4200",
-						"damage": "7d pi"
+						"range": "800/3500",
+						"damage": "5d+1 pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 600,
-				"extended_weight": "10 lb"
+				"extended_value": 4800,
+				"extended_weight": "24 lb"
 			}
 		},
 		{
-			"id": "bebf3351-b0b5-4451-969b-4de13bbeeceb",
+			"id": "937a2a7a-76b4-4937-8949-7e1248afe3fe",
 			"type": "equipment",
-			"description": "Shoes",
-			"reference": "B284",
-			"notes": "Flexible; Concealable",
-			"tech_level": "1",
+			"description": "Scale Armor",
+			"reference": "B283",
+			"tech_level": "2",
 			"tags": [
-				"Footwear"
+				"Body Armor"
 			],
 			"quantity": 1,
-			"value": 40,
-			"weight": "2 lb",
+			"value": 420,
+			"weight": "35 lb",
 			"features": [
 				{
 					"type": "dr_bonus",
-					"location": "foot",
-					"amount": 1
-				}
-			],
-			"calc": {
-				"extended_value": 40,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "e03e3111-51d2-486e-b83b-f809d207936e",
-			"type": "equipment",
-			"description": "Short Bow (ST7)",
-			"reference": "B275",
-			"tech_level": "0",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
-			],
-			"quantity": 1,
-			"value": 50,
-			"weight": "2 lb",
-			"weapons": [
-				{
-					"id": "bed3f421-624f-4491-bff1-3b0d6540eaf3",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d-3"
-					},
-					"strength": "7†",
-					"accuracy": "1",
-					"range": "70/105",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "70/105",
-						"damage": "1d-3 imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 50,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "08836ec9-288e-420d-b886-4cd26e247e4a",
-			"type": "equipment",
-			"description": "Short Bow (ST8)",
-			"reference": "B275",
-			"tech_level": "0",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
-			],
-			"quantity": 1,
-			"value": 55,
-			"weight": "2 lb",
-			"weapons": [
-				{
-					"id": "9795b163-f3b9-4173-87a2-ddee9e60614e",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d-3"
-					},
-					"strength": "8†",
-					"accuracy": "1",
-					"range": "80/120",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "80/120",
-						"damage": "1d-3 imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 55,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "6919fdb9-0361-4d13-be66-97f33242cac0",
-			"type": "equipment",
-			"description": "Short Bow (ST9)",
-			"reference": "B275",
-			"tech_level": "0",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
-			],
-			"quantity": 1,
-			"value": 60,
-			"weight": "2 lb",
-			"weapons": [
+					"location": "torso",
+					"amount": 4
+				},
 				{
-					"id": "164b8b9e-93e2-4f9c-8217-ec3d1eb8ea77",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d-2"
-					},
-					"strength": "9†",
-					"accuracy": "1",
-					"range": "90/135",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "90/135",
-						"damage": "1d-2 imp"
-					}
-				}
-			],
-			"calc": {
-				"extended_value": 60,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "b273e8dc-e76b-45b3-b745-2b194ec03591",
-			"type": "equipment",
-			"description": "Short Bow (ST10)",
-			"reference": "B275",
-			"tech_level": "0",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
-			],
-			"quantity": 1,
-			"value": 65,
-			"weight": "2 lb",
-			"weapons": [
+					"type": "dr_bonus",
+					"location": "vitals",
+					"amount": 4
+				},
 				{
-					"id": "7752df6d-fc4c-42ad-8c4f-574ef8f731aa",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d-2"
-					},
-					"strength": "10†",
-					"accuracy": "1",
-					"range": "100/150",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "100/150",
-						"damage": "1d-2 imp"
-					}
+					"type": "dr_bonus",
+					"location": "groin",
+					"amount": 4
 				}
 			],
 			"calc": {
-				"extended_value": 65,
-				"extended_weight": "2 lb"
+				"extended_value": 420,
+				"extended_weight": "35 lb"
 			}
 		},
 		{
-			"id": "37eeac02-2e00-4dfe-9535-c9fc9bf7626f",
+			"id": "f1ab1686-327b-42b5-9393-8b94d33cdc63",
 			"type": "equipment",
-			"description": "Short Bow (ST11)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Scale Leggings",
+			"reference": "B283",
+			"tech_level": "2",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Limb Armor"
 			],
 			"quantity": 1,
-			"value": 70,
-			"weight": "2 lb",
-			"weapons": [
+			"value": 250,
+			"weight": "21 lb",
+			"features": [
 				{
-					"id": "8d030905-db5f-4d64-becb-364b96665836",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d-1"
-					},
-					"strength": "11†",
-					"accuracy": "1",
-					"range": "110/165",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "110/165",
-						"damage": "1d-1 imp"
-					}
+					"type": "dr_bonus",
+					"location": "leg",
+					"amount": 4
 				}
 			],
 			"calc": {
-				"extended_value": 70,
-				"extended_weight": "2 lb"
+				"extended_value": 250,
+				"extended_weight": "21 lb"
 			}
 		},
 		{
-			"id": "727262e3-7bd5-4b7e-8d54-7b721d0f6709",
+			"id": "101460c5-21a0-46ae-90e9-3fb586f56e57",
 			"type": "equipment",
-			"description": "Short Bow (ST12)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Scale Sleeves",
+			"reference": "B283",
+			"tech_level": "2",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Limb Armor"
 			],
 			"quantity": 1,
-			"value": 75,
-			"weight": "2 lb",
-			"weapons": [
+			"value": 210,
+			"weight": "14 lb",
+			"features": [
 				{
-					"id": "ff1f7ba4-5432-4035-b352-a9e7b4ac467b",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d-1"
-					},
-					"strength": "12†",
-					"accuracy": "1",
-					"range": "120/180",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "120/180",
-						"damage": "1d-1 imp"
-					}
+					"type": "dr_bonus",
+					"location": "arm",
+					"amount": 4
 				}
 			],
 			"calc": {
-				"extended_value": 75,
-				"extended_weight": "2 lb"
+				"extended_value": 210,
+				"extended_weight": "14 lb"
 			}
 		},
 		{
-			"id": "9cb43156-ad8b-4332-8e30-98c1e1130da6",
+			"id": "6e15c4ff-fec5-411a-b23e-93d12ad69727",
 			"type": "equipment",
-			"description": "Short Bow (ST13)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Scope, 4x",
+			"reference": "B289",
+			"notes": "+2 to Acc for aimed shots only.",
+			"tech_level": "6",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Weapon and Combat Accessories"
 			],
 			"quantity": 1,
-			"value": 80,
-			"weight": "2 lb",
-			"weapons": [
-				{
-					"id": "34dffd1d-66c9-40b1-8cc1-ef56825db032",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d"
-					},
-					"strength": "13†",
-					"accuracy": "1",
-					"range": "130/195",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "130/195",
-						"damage": "1d imp"
-					}
-				}
-			],
+			"value": 150,
+			"weight": "1.5 lb",
 			"calc": {
-				"extended_value": 80,
-				"extended_weight": "2 lb"
+				"extended_value": 150,
+				"extended_weight": "1.5 lb"
 			}
 		},
 		{
-			"id": "ff5cb83a-10eb-4242-9b57-d83dda5324c1",
+			"id": "c04ca6e6-6f8f-4221-95b4-1a88f7bf1dee",
 			"type": "equipment",
-			"description": "Short Bow (ST14)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Scope, 4x, Thermal Imaging",
+			"reference": "B289",
+			"notes": "+2 to Acc for aimed shots only. Gives the user Infravision. 2 hrs.",
+			"tech_level": "8",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Weapon and Combat Accessories"
 			],
 			"quantity": 1,
-			"value": 85,
-			"weight": "2 lb",
-			"weapons": [
-				{
-					"id": "2d11b31c-40ac-4659-b96f-b24493075ccb",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "1d"
-					},
-					"strength": "14†",
-					"accuracy": "1",
-					"range": "140/210",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "140/210",
-						"damage": "1d imp"
-					}
-				}
-			],
+			"value": 8000,
+			"weight": "4 lb",
 			"calc": {
-				"extended_value": 85,
-				"extended_weight": "2 lb"
+				"extended_value": 8000,
+				"extended_weight": "4 lb"
 			}
 		},
 		{
-			"id": "826445c3-907d-4592-9322-f05251fd3a19",
+			"id": "f0893d8b-c139-4913-bac5-41ed21e3b62d",
 			"type": "equipment",
-			"description": "Short Bow (ST15)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Scorpion",
+			"reference": "B281",
+			"tech_level": "2",
+			"legality_class": "2",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 90,
-			"weight": "2 lb",
+			"value": 5000,
+			"weight": "110 lb",
 			"weapons": [
 				{
-					"id": "0b6d147a-10e3-4e66-bab4-9f37ecabb348",
+					"id": "4f0b06f3-2a80-4803-9cf9-f7c76de5432c",
 					"type": "ranged_weapon",
 					"damage": {
 						"type": "imp",
-						"base": "1d+1"
+						"base": "5d"
 					},
-					"strength": "15†",
-					"accuracy": "1",
-					"range": "150/225",
+					"strength": "45M†",
+					"accuracy": "3",
+					"range": "415/520",
 					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
+					"shots": "1(30)",
+					"bulk": "-10",
+					"recoil": "-",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Gunner",
+							"specialization": "Catapult"
+						},
+						{
+							"type": "skill",
+							"name": "Gunner",
+							"specialization": "Beams",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gunner",
+							"specialization": "Cannon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gunner",
+							"specialization": "Machine Gun",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gunner",
+							"specialization": "Rockets",
+							"modifier": -4
 						}
 					],
 					"calc": {
-						"range": "150/225",
-						"damage": "1d+1 imp"
+						"range": "415/520",
+						"damage": "5d imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 90,
-				"extended_weight": "2 lb"
+				"extended_value": 5000,
+				"extended_weight": "110 lb"
+			}
+		},
+		{
+			"id": "b5375059-4889-400c-8279-6f1c7f346bef",
+			"type": "equipment",
+			"description": "Scuba Gear",
+			"reference": "B288",
+			"notes": "Includes 2-hour underwater air tank",
+			"tech_level": "6",
+			"tags": [
+				"Camping and Survival Gear"
+			],
+			"quantity": 1,
+			"value": 1500,
+			"weight": "32 lb",
+			"calc": {
+				"extended_value": 1500,
+				"extended_weight": "32 lb"
 			}
 		},
 		{
-			"id": "2038604a-d0b8-4f54-a57b-daf299bb37b9",
+			"id": "31fe1f64-541c-4297-a86d-79fd16d65c12",
 			"type": "equipment",
-			"description": "Short Bow (ST16)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Scythe",
+			"reference": "B274",
+			"notes": "May get stuck in 2nd mode",
+			"tech_level": "1",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Melee Weapon"
 			],
 			"quantity": 1,
-			"value": 95,
-			"weight": "2 lb",
+			"value": 15,
+			"weight": "5 lb",
 			"weapons": [
 				{
-					"id": "3912f50f-a641-411c-90e3-ecda13d57208",
-					"type": "ranged_weapon",
+					"id": "b912dec6-71f3-42ca-8228-4547f2328c9c",
+					"type": "melee_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+1"
+						"type": "cut",
+						"st": "sw",
+						"base": "2"
 					},
-					"strength": "16†",
-					"accuracy": "1",
-					"range": "160/240",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
+					"strength": "11‡",
+					"usage": "Swung",
+					"reach": "1",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
@@ -20813,47 +17527,42 @@
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Two-Handed Axe/Mace"
+						},
+						{
+							"type": "skill",
+							"name": "Axe/Mace",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Polearm",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Flail",
+							"modifier": -4
 						}
 					],
 					"calc": {
-						"range": "160/240",
-						"damage": "1d+1 imp"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw+2 cut"
 					}
-				}
-			],
-			"calc": {
-				"extended_value": 95,
-				"extended_weight": "2 lb"
-			}
-		},
-		{
-			"id": "8e1ad584-1ef3-4cac-b486-f912c6473403",
-			"type": "equipment",
-			"description": "Short Bow (ST17)",
-			"reference": "B275",
-			"tech_level": "0",
-			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
-			],
-			"quantity": 1,
-			"value": 100,
-			"weight": "2 lb",
-			"weapons": [
+				},
 				{
-					"id": "ac279c0c-0482-4ace-b84d-51adc39af299",
-					"type": "ranged_weapon",
+					"id": "cc9ecd1b-7230-4e36-a867-8b87e11b87e7",
+					"type": "melee_weapon",
 					"damage": {
 						"type": "imp",
-						"base": "1d+2"
+						"st": "sw"
 					},
-					"strength": "17†",
-					"accuracy": "1",
-					"range": "170/255",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
+					"strength": "11‡",
+					"usage": "Thrust",
+					"reach": "1",
+					"parry": "0U",
+					"block": "No",
 					"defaults": [
 						{
 							"type": "dx",
@@ -20861,140 +17570,188 @@
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Two-Handed Axe/Mace"
+						},
+						{
+							"type": "skill",
+							"name": "Axe/Mace",
+							"modifier": -3
+						},
+						{
+							"type": "skill",
+							"name": "Polearm",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Two-Handed Flail",
+							"modifier": -4
 						}
 					],
 					"calc": {
-						"range": "170/255",
-						"damage": "1d+2 imp"
+						"parry": "0U",
+						"block": "No",
+						"damage": "sw imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 100,
-				"extended_weight": "2 lb"
+				"extended_value": 15,
+				"extended_weight": "5 lb"
 			}
 		},
 		{
-			"id": "e5364a48-9a8e-47da-a5ce-dc59cca49ed6",
+			"id": "b7a37ad6-8c6f-4707-a82e-628212582576",
 			"type": "equipment",
-			"description": "Short Bow (ST18)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Self-Loading Rifle, 7.62mm",
+			"reference": "B279",
+			"tech_level": "6",
+			"legality_class": "3",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Missile Weapon"
 			],
 			"quantity": 1,
-			"value": 105,
-			"weight": "2 lb",
+			"value": 600,
+			"weight": "10 lb",
 			"weapons": [
 				{
-					"id": "5e1905d8-f03d-4ec6-b7ef-902a94041f4a",
+					"id": "29e2c90e-6777-4148-b5a8-4681395936a8",
 					"type": "ranged_weapon",
 					"damage": {
-						"type": "imp",
-						"base": "1d+2"
+						"type": "pi",
+						"base": "7d"
 					},
-					"strength": "18†",
-					"accuracy": "1",
-					"range": "180/270",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
+					"strength": "10†",
+					"accuracy": "5",
+					"range": "1000/4200",
+					"rate_of_fire": "3",
+					"shots": "8(3)",
+					"bulk": "-5",
+					"recoil": "3",
 					"defaults": [
 						{
 							"type": "dx",
-							"modifier": -5
+							"modifier": -4
 						},
 						{
 							"type": "skill",
-							"name": "Bow"
+							"name": "Guns",
+							"specialization": "Pistol",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Rifle"
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Shotgun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Machine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Submachine Gun",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Musket",
+							"modifier": -2
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Grenade Launcher",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Gyroc",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Guns",
+							"specialization": "Light Anti-Armor Weapon",
+							"modifier": -4
+						},
+						{
+							"type": "skill",
+							"name": "Gun!"
 						}
 					],
 					"calc": {
-						"range": "180/270",
-						"damage": "1d+2 imp"
+						"range": "1000/4200",
+						"damage": "7d pi"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 105,
-				"extended_weight": "2 lb"
+				"extended_value": 600,
+				"extended_weight": "10 lb"
 			}
 		},
 		{
-			"id": "5b6b58e5-e38e-4025-8e2e-ec3405b34630",
+			"id": "bebf3351-b0b5-4451-969b-4de13bbeeceb",
 			"type": "equipment",
-			"description": "Short Bow (ST19)",
-			"reference": "B275",
-			"tech_level": "0",
+			"description": "Shoes",
+			"reference": "B284",
+			"notes": "Flexible; Concealable",
+			"tech_level": "1",
 			"tags": [
-				"Missile Weapon",
-				"UsesAmmoType:Arrow"
+				"Footwear"
 			],
 			"quantity": 1,
-			"value": 110,
+			"value": 40,
 			"weight": "2 lb",
-			"weapons": [
+			"features": [
 				{
-					"id": "40252d44-8789-4906-9c81-5165452e6e7e",
-					"type": "ranged_weapon",
-					"damage": {
-						"type": "imp",
-						"base": "2d-1"
-					},
-					"strength": "19†",
-					"accuracy": "1",
-					"range": "190/285",
-					"rate_of_fire": "1",
-					"shots": "1(2)",
-					"bulk": "-6",
-					"defaults": [
-						{
-							"type": "dx",
-							"modifier": -5
-						},
-						{
-							"type": "skill",
-							"name": "Bow"
-						}
-					],
-					"calc": {
-						"range": "190/285",
-						"damage": "2d-1 imp"
-					}
+					"type": "dr_bonus",
+					"location": "foot",
+					"amount": 1
 				}
 			],
 			"calc": {
-				"extended_value": 110,
+				"extended_value": 40,
 				"extended_weight": "2 lb"
 			}
 		},
 		{
-			"id": "7366f303-4f64-4afa-bdde-efb49fa935f6",
+			"id": "e03e3111-51d2-486e-b83b-f809d207936e",
 			"type": "equipment",
-			"description": "Short Bow (ST20)",
+			"description": "Short Bow",
 			"reference": "B275",
 			"tech_level": "0",
 			"tags": [
 				"Missile Weapon",
 				"UsesAmmoType:Arrow"
 			],
+			"rated_strength": 7,
 			"quantity": 1,
-			"value": 115,
+			"value": 50,
 			"weight": "2 lb",
 			"weapons": [
 				{
-					"id": "5db29f51-19f2-46b9-baa8-317926fc6411",
+					"id": "bed3f421-624f-4491-bff1-3b0d6540eaf3",
 					"type": "ranged_weapon",
 					"damage": {
 						"type": "imp",
-						"base": "2d-1"
+						"st": "thr"
 					},
-					"strength": "20†",
+					"strength": "7†",
 					"accuracy": "1",
-					"range": "200/300",
+					"range": "x10/x15",
 					"rate_of_fire": "1",
 					"shots": "1(2)",
 					"bulk": "-6",
@@ -21009,13 +17766,13 @@
 						}
 					],
 					"calc": {
-						"range": "200/300",
-						"damage": "2d-1 imp"
+						"range": "x10/x15",
+						"damage": "thr imp"
 					}
 				}
 			],
 			"calc": {
-				"extended_value": 115,
+				"extended_value": 50,
 				"extended_weight": "2 lb"
 			}
 		},