diff --git a/DATA/EQUIPMENT/goods.ini b/DATA/EQUIPMENT/goods.ini
index d6ae89d6..aca231d5 100644
--- a/DATA/EQUIPMENT/goods.ini
+++ b/DATA/EQUIPMENT/goods.ini
@@ -28,34 +28,58 @@ item_icon = equipment\models\commodities\nn_icons\EQUIPICON_nomadpower.3db
 [Good]
 nickname = commodity_nomad_power_regulator
 equipment = commodity_nomad_power_regulator
-category = equipment
+category = commodity
 price = 250000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_nomad_power_regulator.3db
+jump_dist = 2
 
 [Good]
 nickname = commodity_nomad_power_cell
 equipment = commodity_nomad_power_cell
-category = equipment
+category = commodity
 price = 250000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_nomad_power_cell.3db
+jump_dist = 2
 
 [Good]
 nickname = commodity_nomad_energy_distributor
 equipment = commodity_nomad_energy_distributor
-category = equipment
+category = commodity
 price = 500000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_nomad_energy_distributor.3db
+jump_dist = 2
 
 [Good]
 nickname = commodity_nomad_fusion_reactor
 equipment = commodity_nomad_fusion_reactor
-category = equipment
+category = commodity
 price = 500000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_nomad_fusion_reactor.3db
+jump_dist = 2
 
 
 ; Shield Blueprint
@@ -63,101 +87,160 @@ item_icon = equipment\models\commodities\nn_icons\commod_nomad_fusion_reactor.3d
 [Good]
 nickname = commodity_shield_blueprint
 equipment = commodity_shield_blueprint
-category = equipment
+category = commodity
 price = 75000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_shield_primary_blueprint.3db
+jump_dist = 2
 
 ; Shield Schematic
 
 [Good]
 nickname = commodity_shield_schematic
 equipment = commodity_shield_schematic
-category = equipment
+category = commodity
 price = 25000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_shield_secondary_blueprint.3db
+jump_dist = 2
 
 ; Armor Blueprint
 
 [Good]
 nickname = commodity_armor_blueprint
 equipment = commodity_armor_blueprint
-category = equipment
+category = commodity
 price = 75000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_armor_primary_blueprint.3db
+jump_dist = 2
 
 ; Armor Schematic
 
 [Good]
 nickname = commodity_armor_schematic
 equipment = commodity_armor_schematic
-category = equipment
+category = commodity
 price = 25000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_armor_secondary_blueprint.3db
+jump_dist = 2
 
 ; Nomad Structure Composites
 
 [Good]
 nickname = commodity_nomad_structure_composites
 equipment = commodity_nomad_structure_composites
-category = equipment
+category = commodity
 price = 25000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_nomad_structure_composites.3db
+jump_dist = 2
 
 ; Anti Blasting Composites
 
 [Good]
 nickname = commodity_anti_blasting_composites
 equipment = commodity_anti_blasting_composites
-category = equipment
+category = commodity
 price = 25000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_anti_blast_composites.3db
+jump_dist = 2
 
 ; Energy Absorbation Composites
 
 [Good]
 nickname = commodity_energy_absorbation_composites
 equipment = commodity_energy_absorbation_composites
-category = equipment
+category = commodity
 price = 25000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_energy_absorb_composites.3db
+jump_dist = 2
 
 ; Anti Radiation Composites
 
 [Good]
 nickname = commodity_anti_radiation_composites
 equipment = commodity_anti_radiation_composites
-category = equipment
+category = commodity
 price = 25000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_anti_rad_composites.3db
+jump_dist = 2
 
 ; Encoded Shield Data
 
 [Good]
 nickname = commodity_encoded_shield_data
 equipment = commodity_encoded_shield_data
-category = equipment
+category = commodity
 price = 25000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_encoded_shield_data.3db
+jump_dist = 2
 
 ; Encoded Armor Data
 
 [Good]
 nickname = commodity_encoded_armor_data
 equipment = commodity_encoded_armor_data
-category = equipment
+category = commodity
 price = 25000
-combinable = false
+combinable = true
+good_sell_price = 1
+bad_buy_price = 1
+bad_sell_price = 1
+good_buy_price = 1
+shop_archetype = Equipment\models\commodities\nn_icons\cwire_rawmats_1.3db
 item_icon = equipment\models\commodities\nn_icons\commod_encoded_armor_data.3db
-
+jump_dist = 2
 
 ; Dust Materials