diff --git a/scripts/demo.py b/scripts/demo.py
index f3ba6ff0..92b340a8 100644
--- a/scripts/demo.py
+++ b/scripts/demo.py
@@ -2,23 +2,23 @@ import sys
 
 def CreateStartingCharacter(core, object):
 	
-	testObject = core.objectService.createObject('object/weapon/ranged/rifle/shared_rifle_t21.iff', object.getPlanet())
-	testObject.setCustomName('This is a Jython Rifle')
-	testObject.setStringAttribute('crafter', 'Light')
-	testObject.setDamageType('@obj_attr_n:armor_eff_energy')
-	testObject.setElementalType('@obj_attr_n:elemental_cold')
-	testObject.setStringAttribute('cat_wpn_damage.damage', '0-0')	
-	testObject.setMinDamage(425)
-	testObject.setMaxDamage(1150)
-	testObject.setElementalDamage(50)
-	testObject.setIntAttribute('cat_wpn_damage.weapon_dps', testObject.getDamagePerSecond())
-	testObject.setIntAttribute('cat_skill_mod_bonus.@stat_n:precision_modified', 35)
-	object.addSkillMod('kinetic' , 0)
-	object.addSkillMod('energy' , 0)
-	object.addSkillMod('heat' , 0)
-	object.addSkillMod('cold' , 0)
-	object.addSkillMod('acid' , 0)
-	object.addSkillMod('electricity' , 0)
+#	testObject = core.objectService.createObject('object/weapon/ranged/rifle/shared_rifle_t21.iff', object.getPlanet())
+#	testObject.setCustomName('This is a Jython Rifle')
+#	testObject.setStringAttribute('crafter', 'Light')
+#	testObject.setDamageType('@obj_attr_n:armor_eff_energy')
+#	testObject.setElementalType('@obj_attr_n:elemental_cold')
+#	testObject.setStringAttribute('cat_wpn_damage.damage', '0-0')	
+#	testObject.setMinDamage(425)
+#	testObject.setMaxDamage(1150)
+#	testObject.setElementalDamage(50)
+#	testObject.setIntAttribute('cat_wpn_damage.weapon_dps', testObject.getDamagePerSecond())
+#	testObject.setIntAttribute('cat_skill_mod_bonus.@stat_n:precision_modified', 35)
+#	object.addSkillMod('kinetic' , 0)
+#	object.addSkillMod('energy' , 0)
+#	object.addSkillMod('heat' , 0)
+#	object.addSkillMod('cold' , 0)
+#	object.addSkillMod('acid' , 0)
+#	object.addSkillMod('electricity' , 0)
 	#object.addSkillMod('combat_strikethrough_value' , 50)
 	#object.addSkillMod('display_only_dodge' , 2000)
 	#object.addSkillMod('display_only_parry' , 1000)
@@ -29,141 +29,141 @@ def CreateStartingCharacter(core, object):
 	#object.addSkillMod('display_only_block' , 2000)
 	#object.addSkillMod('combat_block_value' , 0)
 	
-	inventory = object.getSlottedObject('inventory')
-	if not inventory:
-		return
-	inventory.add(testObject)
+#	inventory = object.getSlottedObject('inventory')
+#	if not inventory:
+#		return
+#	inventory.add(testObject)
 	
-	testClothing = core.objectService.createObject('object/tangible/wearables/cape/shared_cape_rebel_01.iff', object.getPlanet())
-	testClothing.setCustomName('Test Cape')
-	testCloak = core.objectService.createObject('object/tangible/wearables/robe/shared_robe_jedi_dark_s05.iff', object.getPlanet())
-	testCloak.setCustomName('Test Cloak')
+#	testClothing = core.objectService.createObject('object/tangible/wearables/cape/shared_cape_rebel_01.iff', object.getPlanet())
+#	testClothing.setCustomName('Test Cape')
+#	testCloak = core.objectService.createObject('object/tangible/wearables/robe/shared_robe_jedi_dark_s05.iff', object.getPlanet())
+#	testCloak.setCustomName('Test Cloak')
 
-	inventory.add(testClothing)
-	inventory.add(testCloak)
-	profession = object.getSlottedObject('ghost').getProfession()
-	if profession == 'commando_1a':
-		object.addSkillMod('expertise_devastation_bonus' , 20)
-		testObject2 = core.objectService.createObject('object/weapon/ranged/heavy/shared_heavy_rocket_launcher.iff', object.getPlanet())
-		testObject2.setCustomName('Test Heavy Weapon')
-		testObject2.setStringAttribute('crafter', 'Light')
-		testObject2.setDamageType('@obj_attr_n:armor_eff_kinetic')
-		testObject2.setElementalType('@obj_attr_n:elemental_heat')
-		testObject2.setStringAttribute('cat_wpn_damage.damage', '0-0')	
-		testObject2.setMinDamage(550)
-		testObject2.setMaxDamage(1315)
-		testObject2.setElementalDamage(216)
-		testObject2.setIntAttribute('cat_wpn_damage.weapon_dps', testObject2.getDamagePerSecond())
-		inventory.add(testObject2)
+#	inventory.add(testClothing)
+#	inventory.add(testCloak)
+#	profession = object.getSlottedObject('ghost').getProfession()
+#	if profession == 'commando_1a':
+#		object.addSkillMod('expertise_devastation_bonus' , 20)
+#		testObject2 = core.objectService.createObject('object/weapon/ranged/heavy/shared_heavy_rocket_launcher.iff', object.getPlanet())
+#		testObject2.setCustomName('Test Heavy Weapon')
+#		testObject2.setStringAttribute('crafter', 'Light')
+#		testObject2.setDamageType('@obj_attr_n:armor_eff_kinetic')
+#		testObject2.setElementalType('@obj_attr_n:elemental_heat')
+#		testObject2.setStringAttribute('cat_wpn_damage.damage', '0-0')	
+#		testObject2.setMinDamage(550)
+#		testObject2.setMaxDamage(1315)
+#		testObject2.setElementalDamage(216)
+#		testObject2.setIntAttribute('cat_wpn_damage.weapon_dps', testObject2.getDamagePerSecond())
+#		inventory.add(testObject2)
 
-	addProfessionAbilities(core, object, profession)
+#	addProfessionAbilities(core, object, profession)
 	
-	heroism1 = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s10.iff', object.getPlanet())
-	heroism1.setStfFilename('static_item_n')
-	heroism1.setStfName('item_necklace_set_hero_01_01')
-	heroism1.setDetailFilename('static_item_d')
-	heroism1.setDetailName('item_necklace_set_hero_01_01')
-	heroism1.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_hero_1')
-	heroism1.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_2')
-	heroism1.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3')
-	heroism1.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
-	heroism1.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 30)
-	heroism1.setIntAttribute('cat_stat_mod_bonus.food_strength_modified' , 30)
+#	heroism1 = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s10.iff', object.getPlanet())
+#	heroism1.setStfFilename('static_item_n')
+#	heroism1.setStfName('item_necklace_set_hero_01_01')
+#	heroism1.setDetailFilename('static_item_d')
+#	heroism1.setDetailName('item_necklace_set_hero_01_01')
+#	heroism1.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_hero_1')
+#	heroism1.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_2')
+#	heroism1.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3')
+#	heroism1.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
+#	heroism1.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 30)
+#	heroism1.setIntAttribute('cat_stat_mod_bonus.food_strength_modified' , 30)
 	
 
-	inventory = object.getSlottedObject('inventory')
-	if not inventory:
-		return
-	inventory.add(heroism1)
+#	inventory = object.getSlottedObject('inventory')
+#	if not inventory:
+#		return
+#	inventory.add(heroism1)
 	
-	heroism2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff', object.getPlanet())
-	heroism2.setStfFilename('static_item_n')
-	heroism2.setStfName('item_bracelet_r_set_hero_01_01')
-	heroism2.setDetailFilename('static_item_d')
-	heroism2.setDetailName('item_bracelet_r_set_hero_01_01')
-	heroism2.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_hero_1')
-	heroism2.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_2')
-	heroism2.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3')
-	heroism2.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
-	heroism2.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 30)
-	heroism2.setIntAttribute('cat_stat_mod_bonus.food_strength_modified' , 30)
+#	heroism2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff', object.getPlanet())
+#	heroism2.setStfFilename('static_item_n')
+#	heroism2.setStfName('item_bracelet_r_set_hero_01_01')
+#	heroism2.setDetailFilename('static_item_d')
+#	heroism2.setDetailName('item_bracelet_r_set_hero_01_01')
+#	heroism2.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_hero_1')
+#	heroism2.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_2')
+#	heroism2.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3')
+#	heroism2.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
+#	heroism2.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 30)
+#	heroism2.setIntAttribute('cat_stat_mod_bonus.food_strength_modified' , 30)
 	
 
-	inventory = object.getSlottedObject('inventory')
-	if not inventory:
-		return
-	inventory.add(heroism2)
+#	inventory = object.getSlottedObject('inventory')
+#	if not inventory:
+#		return
+#	inventory.add(heroism2)
 	
-	heroism3 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff', object.getPlanet())
-	heroism3.setStfFilename('static_item_n')
-	heroism3.setStfName('item_bracelet_l_set_hero_01_01')
-	heroism3.setDetailFilename('static_item_d')
-	heroism3.setDetailName('item_bracelet_l_set_hero_01_01')
-	heroism3.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_hero_1')
-	heroism3.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_2')
-	heroism3.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3')
-	heroism3.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
-	heroism3.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 30)
-	heroism3.setIntAttribute('cat_stat_mod_bonus.food_strength_modified' , 30)
+#	heroism3 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff', object.getPlanet())
+#	heroism3.setStfFilename('static_item_n')
+#	heroism3.setStfName('item_bracelet_l_set_hero_01_01')
+#	heroism3.setDetailFilename('static_item_d')
+#	heroism3.setDetailName('item_bracelet_l_set_hero_01_01')
+#	heroism3.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_hero_1')
+#	heroism3.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_2')
+#	heroism3.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3')
+#	heroism3.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
+#	heroism3.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 30)
+#	heroism3.setIntAttribute('cat_stat_mod_bonus.food_strength_modified' , 30)
 	
 
-	inventory = object.getSlottedObject('inventory')
-	if not inventory:
-		return
-	inventory.add(heroism3)
+#	inventory = object.getSlottedObject('inventory')
+#	if not inventory:
+#		return
+#	inventory.add(heroism3)
 	
-	heroism4 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s04.iff', object.getPlanet())
-	heroism4.setStfFilename('static_item_n')
-	heroism4.setStfName('item_ring_set_hero_01_01')
-	heroism4.setDetailFilename('static_item_d')
-	heroism4.setDetailName('item_ring_set_hero_01_01')
-	heroism4.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_hero_1')
-	heroism4.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_2')
-	heroism4.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3')
-	heroism4.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
-	heroism4.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 30)
-	heroism4.setIntAttribute('cat_stat_mod_bonus.food_strength_modified' , 30)
+#	heroism4 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s04.iff', object.getPlanet())
+#	heroism4.setStfFilename('static_item_n')
+#	heroism4.setStfName('item_ring_set_hero_01_01')
+#	heroism4.setDetailFilename('static_item_d')
+#	heroism4.setDetailName('item_ring_set_hero_01_01')
+#	heroism4.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_hero_1')
+#	heroism4.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_2')
+#	heroism4.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3')
+#	heroism4.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
+#	heroism4.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 30)
+#	heroism4.setIntAttribute('cat_stat_mod_bonus.food_strength_modified' , 30)
 	
 
-	inventory = object.getSlottedObject('inventory')
-	if not inventory:
-		return
-	inventory.add(heroism4)
+#	inventory = object.getSlottedObject('inventory')
+#	if not inventory:
+#		return
+#	inventory.add(heroism4)
 	
-	heroism5 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s02.iff', object.getPlanet())
-	heroism5.setStfFilename('static_item_n')
-	heroism5.setStfName('item_ring_a_set_hero')
-	heroism5.setDetailFilename('static_item_d')
-	heroism5.setDetailName('item_ring_a_set_hero')
-	heroism5.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_hero_1')
-	heroism5.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_2')
-	heroism5.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3')
-	heroism5.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
-	heroism5.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 30)
-	heroism5.setIntAttribute('cat_stat_mod_bonus.food_strength_modified' , 30)
+#	heroism5 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s02.iff', object.getPlanet())
+#	heroism5.setStfFilename('static_item_n')
+#	heroism5.setStfName('item_ring_a_set_hero')
+#	heroism5.setDetailFilename('static_item_d')
+#	heroism5.setDetailName('item_ring_a_set_hero')
+#	heroism5.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_hero_1')
+#	heroism5.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_hero_2')
+#	heroism5.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_hero_3')
+#	heroism5.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
+#	heroism5.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 30)
+#	heroism5.setIntAttribute('cat_stat_mod_bonus.food_strength_modified' , 30)
 	
 
-	inventory = object.getSlottedObject('inventory')
-	if not inventory:
-		return
-	inventory.add(heroism5)
+#	inventory = object.getSlottedObject('inventory')
+#	if not inventory:
+#		return
+#	inventory.add(heroism5)
 	return
 	
 def addProfessionAbilities(core, object, profession):
-
-	if profession == 'force_sensitive_1a':
-		testObject = core.objectService.createObject('object/weapon/melee/2h_sword/crafted_saber/shared_sword_lightsaber_two_handed_gcw_s01_gen5.iff', object.getPlanet())
-		testObject.setCustomName('Lightsaber')
-		testObject.setStringAttribute('crafter', 'Light')
-		testObject.setDamageType('@obj_attr_n:armor_eff_energy')
-		testObject.setElementalType('@obj_attr_n:elemental_cold')
-		testObject.setStringAttribute('cat_wpn_damage.damage', '0-0')			
-		testObject.setMinDamage(600)
-		testObject.setMaxDamage(1190)
-		testObject.setElementalDamage(72)
-		testObject.setIntAttribute('cat_wpn_damage.weapon_dps', testObject.getDamagePerSecond())
-		inventory = object.getSlottedObject('inventory')
-		inventory.add(testObject)
+	
+#	if profession == 'force_sensitive_1a':
+#		testObject = core.objectService.createObject('object/weapon/melee/2h_sword/crafted_saber/shared_sword_lightsaber_two_handed_gcw_s01_gen5.iff', object.getPlanet())
+#		testObject.setCustomName('Lightsaber')
+#		testObject.setStringAttribute('crafter', 'Light')
+#		testObject.setDamageType('@obj_attr_n:armor_eff_energy')
+#		testObject.setElementalType('@obj_attr_n:elemental_cold')
+#		testObject.setStringAttribute('cat_wpn_damage.damage', '0-0')			
+#		testObject.setMinDamage(600)
+#		testObject.setMaxDamage(1190)
+#		testObject.setElementalDamage(72)
+#		testObject.setIntAttribute('cat_wpn_damage.weapon_dps', testObject.getDamagePerSecond())
+#		inventory = object.getSlottedObject('inventory')
+#		inventory.add(testObject)
 
 		##Case Sensitive
 	#	object.addAbility('fs_sweep_7')
@@ -214,262 +214,261 @@ def addProfessionAbilities(core, object, profession):
 	#	object.addAbility('bh_intimidate_6')
 	#	object.addAbility('bh_flawless_strike')
 		
-		direfate1 = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s03.iff', object.getPlanet())
-		direfate1.setStfFilename('static_item_n')
-		direfate1.setStfName('item_necklace_set_bh_utility_b_01_01')
-		direfate1.setDetailFilename('static_item_d')
-		direfate1.setDetailName('item_necklace_set_bh_utility_b_01_01')
-		direfate1.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
-		direfate1.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
-		direfate1.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
-		direfate1.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root' , 1)
-		direfate1.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare' , 1)
-		direfate1.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc' , 2)
+	#	direfate1 = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s03.iff', object.getPlanet())
+	#	direfate1.setStfFilename('static_item_n')
+	#	direfate1.setStfName('item_necklace_set_bh_utility_b_01_01')
+	#	direfate1.setDetailFilename('static_item_d')
+	#	direfate1.setDetailName('item_necklace_set_bh_utility_b_01_01')
+	#	direfate1.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
+	#	direfate1.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
+	#	direfate1.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
+	#	direfate1.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root' , 1)
+	#	direfate1.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare' , 1)
+	#	direfate1.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc' , 2)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(direfate1)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(direfate1)
 		
-		direfate2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s04_r.iff', object.getPlanet())
-		direfate2.setStfFilename('static_item_n')
-		direfate2.setStfName('item_bracelet_r_set_bh_utility_b_01_01')
-		direfate2.setDetailFilename('static_item_d')
-		direfate2.setDetailName('item_bracelet_r_set_bh_utility_b_01_01')
-		direfate2.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
-		direfate2.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
-		direfate2.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
-		direfate2.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root' , 1)
-		direfate2.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare' , 1)
-		direfate2.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc' , 2)
+	#	direfate2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s04_r.iff', object.getPlanet())
+	#	direfate2.setStfFilename('static_item_n')
+	#	direfate2.setStfName('item_bracelet_r_set_bh_utility_b_01_01')
+	#	direfate2.setDetailFilename('static_item_d')
+	#	direfate2.setDetailName('item_bracelet_r_set_bh_utility_b_01_01')
+	#	direfate2.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
+	#	direfate2.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
+	#	direfate2.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root' , 1)
+	#	direfate2.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare' , 1)
+	#	direfate2.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc' , 2)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(direfate2)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(direfate2)
 		
-		direfate3 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s04_l.iff', object.getPlanet())
-		direfate3.setStfFilename('static_item_n')
-		direfate3.setStfName('item_bracelet_l_set_bh_utility_b_01_01')
-		direfate3.setDetailFilename('static_item_d')
-		direfate3.setDetailName('item_bracelet_l_set_bh_utility_b_01_01')
-		direfate3.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
-		direfate3.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
-		direfate3.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
-		direfate3.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root' , 1)
-		direfate3.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare' , 1)
-		direfate3.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc' , 2)
+	#	direfate3 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s04_l.iff', object.getPlanet())
+	#	direfate3.setStfFilename('static_item_n')
+	#	direfate3.setStfName('item_bracelet_l_set_bh_utility_b_01_01')
+	#	direfate3.setDetailFilename('static_item_d')
+	#	direfate3.setDetailName('item_bracelet_l_set_bh_utility_b_01_01')
+	#	direfate3.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
+	#	direfate3.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
+	#	direfate3.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
+	#	direfate3.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root' , 1)
+	#	direfate3.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare' , 1)
+	#	direfate3.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc' , 2)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(direfate3)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(direfate3)
 		
-		direfate4 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s01.iff', object.getPlanet())
-		direfate4.setStfFilename('static_item_n')
-		direfate4.setStfName('item_ring_set_bh_utility_b_01_01')
-		direfate4.setDetailFilename('static_item_d')
-		direfate4.setDetailName('item_ring_set_bh_utility_b_01_01')
-		direfate4.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
-		direfate4.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
-		direfate4.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
-		direfate4.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root' , 1)
-		direfate4.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare' , 1)
-		direfate4.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc' , 2)
+	#	direfate4 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s01.iff', object.getPlanet())
+	#	direfate4.setStfFilename('static_item_n')
+	#	direfate4.setStfName('item_ring_set_bh_utility_b_01_01')
+	#	direfate4.setDetailFilename('static_item_d')
+	#	direfate4.setDetailName('item_ring_set_bh_utility_b_01_01')
+	#	direfate4.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
+	#	direfate4.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
+	#	direfate4.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
+	#	direfate4.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root' , 1)
+	#	direfate4.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare' , 1)
+	#	direfate4.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc' , 2)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(direfate4)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(direfate4)
 		
-		direfate5 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s03.iff', object.getPlanet())
-		direfate5.setStfFilename('static_item_n')
-		direfate5.setStfName('item_ring_a_set_bh_utility_b')
-		direfate5.setDetailFilename('static_item_d')
-		direfate5.setDetailName('item_ring_a_set_bh_utility_b')
-		direfate5.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
-		direfate5.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
-		direfate5.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
-		direfate5.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root' , 1)
-		direfate5.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare' , 1)
-		direfate5.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc' , 2)
+	#	direfate5 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s03.iff', object.getPlanet())
+	#	direfate5.setStfFilename('static_item_n')
+	#	direfate5.setStfName('item_ring_a_set_bh_utility_b')
+	#	direfate5.setDetailFilename('static_item_d')
+	#	direfate5.setDetailName('item_ring_a_set_bh_utility_b')
+	#	direfate5.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
+	#	direfate5.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
+	#	direfate5.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
+	#	direfate5.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_root' , 1)
+	#	direfate5.setIntAttribute('cat_skill_mod_bonus.@stat_n:bh_dire_snare' , 1)
+	#	direfate5.setIntAttribute('cat_skill_mod_bonus.@stat_n:fast_attack_line_dm_cc' , 2)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(direfate5)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(direfate5)
 		
-		flawless1 = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s02.iff', object.getPlanet())
-		flawless1.setStfFilename('static_item_n')
-		flawless1.setStfName('item_necklace_set_bh_utility_a_01_01')
-		flawless1.setDetailFilename('static_item_d')
-		flawless1.setDetailName('item_necklace_set_bh_utility_a_01_01')
-		flawless1.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_a_1')
-		flawless1.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_a_2')
-		flawless1.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_a_3')
-		flawless1.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
-		flawless1.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 50)
+	#	flawless1 = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s02.iff', object.getPlanet())
+	#	flawless1.setStfFilename('static_item_n')
+	#	flawless1.setStfName('item_necklace_set_bh_utility_a_01_01')
+	#	flawless1.setDetailFilename('static_item_d')
+	#	flawless1.setDetailName('item_necklace_set_bh_utility_a_01_01')
+	#	flawless1.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_a_1')
+	#	flawless1.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_a_2')
+	#	flawless1.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_a_3')
+	#	flawless1.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
+	#	flawless1.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 50)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(flawless1)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(flawless1)
 		
-		flawless2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff', object.getPlanet())
-		flawless2.setStfFilename('static_item_n')
-		flawless2.setStfName('item_bracelet_r_set_bh_utility_a_01_01')
-		flawless2.setDetailFilename('static_item_d')
-		flawless2.setDetailName('item_bracelet_r_set_bh_utility_a_01_01')
-		flawless2.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
-		flawless2.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
-		flawless2.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
-		flawless2.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
-		flawless2.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 50)
+	#	flawless2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_r.iff', object.getPlanet())
+	#	flawless2.setStfFilename('static_item_n')
+	#	flawless2.setStfName('item_bracelet_r_set_bh_utility_a_01_01')
+	#	flawless2.setDetailFilename('static_item_d')
+	#	flawless2.setDetailName('item_bracelet_r_set_bh_utility_a_01_01')
+	#	flawless2.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
+	#	flawless2.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
+	#	flawless2.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
+	#	flawless2.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
+	#	flawless2.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 50)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(flawless2)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(flawless2)
 		
-		flawless3 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff', object.getPlanet())
-		flawless3.setStfFilename('static_item_n')
-		flawless3.setStfName('item_bracelet_l_set_bh_utility_a_01_01')
-		flawless3.setDetailFilename('static_item_d')
-		flawless3.setDetailName('item_bracelet_l_set_bh_utility_a_01_01')
-		flawless3.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
-		flawless3.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
-		flawless3.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
-		flawless3.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
-		flawless3.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 50)
+	#	flawless3 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s03_l.iff', object.getPlanet())
+	#	flawless3.setStfFilename('static_item_n')
+	#	flawless3.setStfName('item_bracelet_l_set_bh_utility_a_01_01')
+	#	flawless3.setDetailFilename('static_item_d')
+	#	flawless3.setDetailName('item_bracelet_l_set_bh_utility_a_01_01')
+	#	flawless3.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
+	#	flawless3.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
+	#	flawless3.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
+	#	flawless3.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
+	#	flawless3.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 50)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(flawless3)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(flawless3)
 		
-		flawless4 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s02.iff', object.getPlanet())
-		flawless4.setStfFilename('static_item_n')
-		flawless4.setStfName('item_ring_set_bh_utility_a_01_01')
-		flawless4.setDetailFilename('static_item_d')
-		flawless4.setDetailName('item_ring_set_bh_utility_a_01_01')
-		flawless4.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
-		flawless4.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
-		flawless4.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
-		flawless4.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
-		flawless4.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 50)
+	#	flawless4 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s02.iff', object.getPlanet())
+	#	flawless4.setStfFilename('static_item_n')
+	#	flawless4.setStfName('item_ring_set_bh_utility_a_01_01')
+	#	flawless4.setDetailFilename('static_item_d')
+	#	flawless4.setDetailName('item_ring_set_bh_utility_a_01_01')
+	#	flawless4.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
+	#	flawless4.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
+	#	flawless4.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
+	#	flawless4.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
+	#	flawless4.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 50)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(flawless4)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(flawless4)
 		
-		flawless5 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s04.iff', object.getPlanet())
-		flawless5.setStfFilename('static_item_n')
-		flawless5.setStfName('item_ring_a_set_bh_utility_a')
-		flawless5.setDetailFilename('static_item_d')
-		flawless5.setDetailName('item_ring_a_set_bh_utility_a')
-		flawless5.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
-		flawless5.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
-		flawless5.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
-		flawless5.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
-		flawless5.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 50)
+	#	flawless5 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s04.iff', object.getPlanet())
+	#	flawless5.setStfFilename('static_item_n')
+	#	flawless5.setStfName('item_ring_a_set_bh_utility_a')
+	#	flawless5.setDetailFilename('static_item_d')
+	#	flawless5.setDetailName('item_ring_a_set_bh_utility_a')
+	#	flawless5.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_utility_b_1')
+	#	flawless5.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_utility_b_2')
+	#	flawless5.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_utility_b_3')
+	#	flawless5.setIntAttribute('cat_stat_mod_bonus.food_luck_modified' , 30)
+	#	flawless5.setIntAttribute('cat_stat_mod_bonus.food_precision_modified' , 50)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(flawless5)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(flawless5)
 				
-		enforcer1 = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s01.iff', object.getPlanet())
-		enforcer1.setStfFilename('static_item_n')
-		enforcer1.setStfName('item_necklace_set_bh_dps_01_01')
-		enforcer1.setDetailFilename('static_item_d')
-		enforcer1.setDetailName('item_necklace_set_bh_dps_01_01')
-		enforcer1.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_dps_1')
-		enforcer1.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_2')
-		enforcer1.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3')
-		enforcer1.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm' , 1)
-		enforcer1.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit' , 1)
-		enforcer1.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire' , 1)
-		enforcer1.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm' , 1)
+	#	enforcer1 = core.objectService.createObject('object/tangible/wearables/necklace/shared_necklace_s01.iff', object.getPlanet())
+	#	enforcer1.setStfFilename('static_item_n')
+	#	enforcer1.setStfName('item_necklace_set_bh_dps_01_01')
+	#	enforcer1.setDetailFilename('static_item_d')
+	#	enforcer1.setDetailName('item_necklace_set_bh_dps_01_01')
+	#	enforcer1.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_dps_1')
+	#	enforcer1.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_2')
+	#	enforcer1.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3')
+	#	enforcer1.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm' , 1)
+	#	enforcer1.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit' , 1)
+	#	enforcer1.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire' , 1)
+	#	enforcer1.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm' , 1)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(enforcer1)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(enforcer1)
 		
-		enforcer2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s02_r.iff', object.getPlanet())
-		enforcer2.setStfFilename('static_item_n')
-		enforcer2.setStfName('item_bracelet_r_set_bh_dps_01_01')
-		enforcer2.setDetailFilename('static_item_d')
-		enforcer2.setDetailName('item_bracelet_r_set_dps_01_01')
-		enforcer2.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_dps_1')
-		enforcer2.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_2')
-		enforcer2.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3')
-		enforcer2.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm' , 1)
-		enforcer2.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit' , 1)
-		enforcer2.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire' , 1)
-		enforcer2.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm' , 1)
+	#	enforcer2 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s02_r.iff', object.getPlanet())
+	#	enforcer2.setStfFilename('static_item_n')
+	#	enforcer2.setStfName('item_bracelet_r_set_bh_dps_01_01')
+	#	enforcer2.setDetailFilename('static_item_d')
+	#	enforcer2.setDetailName('item_bracelet_r_set_dps_01_01')
+	#	enforcer2.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_dps_1')
+	#	enforcer2.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_2')
+	#	enforcer2.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3')
+	#	enforcer2.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm' , 1)
+	#	enforcer2.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit' , 1)
+	#	enforcer2.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire' , 1)
+	#	enforcer2.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm' , 1)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(enforcer2)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(enforcer2)
 		
-		enforcer3 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s02_l.iff', object.getPlanet())
-		enforcer3.setStfFilename('static_item_n')
-		enforcer3.setStfName('item_bracelet_l_set_bh_dps_01_01')
-		enforcer3.setDetailFilename('static_item_d')
-		enforcer3.setDetailName('item_bracelet_l_set_bh_dps_01_01')
-		enforcer3.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_dps_1')
-		enforcer3.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_2')
-		enforcer3.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3')
-		enforcer3.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm' , 1)
-		enforcer3.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit' , 1)
-		enforcer3.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire' , 1)
-		enforcer3.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm' , 1)
+	#	enforcer3 = core.objectService.createObject('object/tangible/wearables/bracelet/shared_bracelet_s02_l.iff', object.getPlanet())
+	#	enforcer3.setStfFilename('static_item_n')
+	#	enforcer3.setStfName('item_bracelet_l_set_bh_dps_01_01')
+	#	enforcer3.setDetailFilename('static_item_d')
+	#	enforcer3.setDetailName('item_bracelet_l_set_bh_dps_01_01')
+	#	enforcer3.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_dps_1')
+	#	enforcer3.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_2')
+	#	enforcer3.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3')
+	#	enforcer3.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm' , 1)
+	#	enforcer3.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit' , 1)
+	#	enforcer3.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire' , 1)
+	#	enforcer3.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm' , 1)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(enforcer3)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(enforcer3)
 		
-		enforcer4 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s01.iff', object.getPlanet())
-		enforcer4.setStfFilename('static_item_n')
-		enforcer4.setStfName('item_ring_set_bh_dps_01_01')
-		enforcer4.setDetailFilename('static_item_d')
-		enforcer4.setDetailName('item_ring_set_bh_dps_01_01')
-		enforcer4.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_dps_1')
-		enforcer4.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_2')
-		enforcer4.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3')
-		enforcer4.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm' , 1)
-		enforcer4.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit' , 1)
-		enforcer4.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire' , 1)
-		enforcer4.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm' , 1)
+	#	enforcer4 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s01.iff', object.getPlanet())
+	#	enforcer4.setStfFilename('static_item_n')
+	#	enforcer4.setStfName('item_ring_set_bh_dps_01_01')
+	#	enforcer4.setDetailFilename('static_item_d')
+	#	enforcer4.setDetailName('item_ring_set_bh_dps_01_01')
+	#	enforcer4.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_dps_1')
+	#	enforcer4.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_2')
+	#	enforcer4.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3')
+	#	enforcer4.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm' , 1)
+	#	enforcer4.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit' , 1)
+	#	enforcer4.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire' , 1)
+	#	enforcer4.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm' , 1)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(enforcer4)
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(enforcer4)
 		
-		enforcer5 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s03.iff', object.getPlanet())
-		enforcer5.setStfFilename('static_item_n')
-		enforcer5.setStfName('item_ring_a_set_bh_dps')
-		enforcer5.setDetailFilename('static_item_d')
-		enforcer5.setDetailName('item_ring_a_set_bh_dps')
-		enforcer5.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_dps_1')
-		enforcer5.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_2')
-		enforcer5.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3')
-		enforcer5.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm' , 1)
-		enforcer5.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit' , 1)
-		enforcer5.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire' , 1)
-		enforcer5.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm' , 1)
+	#	enforcer5 = core.objectService.createObject('object/tangible/wearables/ring/shared_ring_s03.iff', object.getPlanet())
+	#	enforcer5.setStfFilename('static_item_n')
+	#	enforcer5.setStfName('item_ring_a_set_bh_dps')
+	#	enforcer5.setDetailFilename('static_item_d')
+	#	enforcer5.setDetailName('item_ring_a_set_bh_dps')
+	#	enforcer5.setStringAttribute('@set_bonus:piece_bonus_count_2', '@set_bonus:set_bonus_bh_dps_1')
+	#	enforcer5.setStringAttribute('@set_bonus:piece_bonus_count_3', '@set_bonus:set_bonus_bh_dps_2')
+	#	enforcer5.setStringAttribute('@set_bonus:piece_bonus_count_5', '@set_bonus:set_bonus_bh_dps_3')
+	#	enforcer5.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm' , 1)
+	#	enforcer5.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_action_line_dm_crit' , 1)
+	#	enforcer5.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_buff_duration_line_bh_return_fire' , 1)
+	#	enforcer5.setIntAttribute('cat_skill_mod_bonus.@stat_n:expertise_cooldown_line_dm' , 1)
 	
-		inventory = object.getSlottedObject('inventory')
-		if not inventory:
-			return
-		inventory.add(enforcer5)		
-		return
-	return
+	#	inventory = object.getSlottedObject('inventory')
+	#	if not inventory:
+	#		return
+	#	inventory.add(enforcer5)		
+	#	return
+	#return
 	
 		
-	return
+	return
\ No newline at end of file
diff --git a/src/resources/objects/building/BuildingObject.java b/src/resources/objects/building/BuildingObject.java
index b1ccf6f9..15d84777 100644
--- a/src/resources/objects/building/BuildingObject.java
+++ b/src/resources/objects/building/BuildingObject.java
@@ -24,9 +24,9 @@ package resources.objects.building;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import resources.objects.cell.CellObject;
-
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.Transaction;
+import resources.objects.tangible.TangibleObject;
 import com.sleepycat.persist.model.Entity;
 import com.sleepycat.persist.model.NotPersistent;
 import engine.clients.Client;
@@ -37,8 +37,8 @@ import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Entity
-public class BuildingObject extends SWGObject implements IPersistent {
+@Entity(version=0)
+public class BuildingObject extends TangibleObject implements IPersistent {
 	
 	@NotPersistent
 	private BuildingMessageBuilder messageBuilder;
@@ -51,7 +51,7 @@ public class BuildingObject extends SWGObject implements IPersistent {
 	}
 
 	public BuildingObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
-		super(objectID, planet, position, orientation, Template);
+		super(objectID, planet, Template, position, orientation);
 		messageBuilder = new BuildingMessageBuilder(this);
 	}
 	
diff --git a/src/resources/objects/cell/CellMessageBuilder.java b/src/resources/objects/cell/CellMessageBuilder.java
index dd627e06..1884d4b0 100644
--- a/src/resources/objects/cell/CellMessageBuilder.java
+++ b/src/resources/objects/cell/CellMessageBuilder.java
@@ -26,7 +26,6 @@ import java.nio.ByteOrder;
 import org.apache.mina.core.buffer.IoBuffer;
 
 import resources.objects.ObjectMessageBuilder;
-import resources.objects.building.BuildingObject;
 
 public class CellMessageBuilder extends ObjectMessageBuilder {
 	
diff --git a/src/resources/objects/cell/CellObject.java b/src/resources/objects/cell/CellObject.java
index 2be49a59..32f1e86b 100644
--- a/src/resources/objects/cell/CellObject.java
+++ b/src/resources/objects/cell/CellObject.java
@@ -31,7 +31,7 @@ import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent
+@Persistent(version=0)
 public class CellObject extends SWGObject {
 	
 	private int cellNumber = 0;
diff --git a/src/resources/objects/creature/CreatureObject.java b/src/resources/objects/creature/CreatureObject.java
index c77b5d87..9bb8186f 100644
--- a/src/resources/objects/creature/CreatureObject.java
+++ b/src/resources/objects/creature/CreatureObject.java
@@ -25,7 +25,6 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Stack;
 import java.util.concurrent.ScheduledFuture;
 
 import org.apache.mina.core.buffer.IoBuffer;
@@ -57,7 +56,7 @@ import engine.resources.scene.Quaternion;
 import resources.objects.tangible.TangibleObject;
 import resources.objects.weapon.WeaponObject;
 
-@Entity(version=9)
+@Entity(version=0)
 public class CreatureObject extends TangibleObject implements IPersistent {
 	
 	@NotPersistent
diff --git a/src/resources/objects/factorycrate/FactoryCrateObject.java b/src/resources/objects/factorycrate/FactoryCrateObject.java
index 5c5737ad..8e7d3c75 100644
--- a/src/resources/objects/factorycrate/FactoryCrateObject.java
+++ b/src/resources/objects/factorycrate/FactoryCrateObject.java
@@ -21,6 +21,11 @@
  ******************************************************************************/
 package resources.objects.factorycrate;
 
-public class FactoryCrateObject {
+import com.sleepycat.persist.model.Persistent;
+
+import resources.objects.tangible.TangibleObject;
+
+@Persistent(version=0)
+public class FactoryCrateObject extends TangibleObject {
 
 }
diff --git a/src/resources/objects/group/GroupObject.java b/src/resources/objects/group/GroupObject.java
index e87a0950..ec9b215c 100644
--- a/src/resources/objects/group/GroupObject.java
+++ b/src/resources/objects/group/GroupObject.java
@@ -23,13 +23,14 @@ package resources.objects.group;
 
 import java.util.Vector;
 
+import resources.objects.universe.UniverseObject;
+
 import engine.clients.Client;
 import engine.resources.objects.SWGObject;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-
-public class GroupObject extends SWGObject {
+public class GroupObject extends UniverseObject {
 	
 	private Vector<SWGObject> memberList = new Vector<SWGObject>();
 	private int memberListUpdateCounter;
diff --git a/src/resources/objects/guild/GuildObject.java b/src/resources/objects/guild/GuildObject.java
index a27d8c02..bce71b15 100644
--- a/src/resources/objects/guild/GuildObject.java
+++ b/src/resources/objects/guild/GuildObject.java
@@ -36,6 +36,7 @@ import resources.guild.Guild;
 import resources.objects.SWGList;
 import resources.objects.SWGMap;
 import resources.objects.SWGMultiMap;
+import resources.objects.universe.UniverseObject;
 import services.collections.ServerFirst;
 
 import com.sleepycat.je.Environment;
@@ -50,8 +51,8 @@ import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Entity
-public class GuildObject extends SWGObject implements IPersistent {
+@Entity(version=0)
+public class GuildObject extends UniverseObject implements IPersistent {
 	
 	protected NGECore core;
 	@NotPersistent
diff --git a/src/resources/objects/harvester/HarvesterObject.java b/src/resources/objects/harvester/HarvesterObject.java
index 1f7c48eb..b31b40cf 100644
--- a/src/resources/objects/harvester/HarvesterObject.java
+++ b/src/resources/objects/harvester/HarvesterObject.java
@@ -21,6 +21,11 @@
  ******************************************************************************/
 package resources.objects.harvester;
 
-public class HarvesterObject {
+import com.sleepycat.persist.model.Persistent;
+
+import resources.objects.installation.InstallationObject;
+
+@Persistent(version=0)
+public class HarvesterObject extends InstallationObject {
 
 }
diff --git a/src/resources/objects/installation/InstallationObject.java b/src/resources/objects/installation/InstallationObject.java
index 7b31ff63..728de4a9 100644
--- a/src/resources/objects/installation/InstallationObject.java
+++ b/src/resources/objects/installation/InstallationObject.java
@@ -21,6 +21,11 @@
  ******************************************************************************/
 package resources.objects.installation;
 
-public class InstallationObject {
+import com.sleepycat.persist.model.Persistent;
+
+import resources.objects.tangible.TangibleObject;
+
+@Persistent(version=0)
+public class InstallationObject extends TangibleObject {
 
 }
diff --git a/src/resources/objects/intangible/IntangibleObject.java b/src/resources/objects/intangible/IntangibleObject.java
index 1d23fe40..23801ed6 100644
--- a/src/resources/objects/intangible/IntangibleObject.java
+++ b/src/resources/objects/intangible/IntangibleObject.java
@@ -21,8 +21,6 @@
  ******************************************************************************/
 package resources.objects.intangible;
 
-
-
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
@@ -31,7 +29,7 @@ import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent
+@Persistent(version=0)
 public class IntangibleObject extends SWGObject {
 	
 	private int genericInt;
diff --git a/src/resources/objects/manufacture/ManufactureSchematicObject.java b/src/resources/objects/manufacture/ManufactureSchematicObject.java
new file mode 100644
index 00000000..35e558de
--- /dev/null
+++ b/src/resources/objects/manufacture/ManufactureSchematicObject.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2013 <Project SWG>
+ * 
+ * This File is part of NGECore2.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
+ * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
+ ******************************************************************************/
+package resources.objects.manufacture;
+
+import com.sleepycat.persist.model.Persistent;
+
+import resources.objects.intangible.IntangibleObject;
+
+@Persistent(version=0)
+public class ManufactureSchematicObject extends IntangibleObject {
+
+}
diff --git a/src/resources/objects/mission/MissionObject.java b/src/resources/objects/mission/MissionObject.java
index 635da311..69562ef6 100644
--- a/src/resources/objects/mission/MissionObject.java
+++ b/src/resources/objects/mission/MissionObject.java
@@ -23,21 +23,19 @@ package resources.objects.mission;
 
 import com.sleepycat.je.Environment;
 import com.sleepycat.je.Transaction;
-import com.sleepycat.persist.model.Entity;
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 
-import resources.objects.tangible.TangibleObject;
+import resources.objects.intangible.IntangibleObject;
 import resources.objects.waypoint.WaypointObject;
 import engine.clients.Client;
 import engine.resources.objects.IPersistent;
-import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent(version=1)
-public class MissionObject extends SWGObject implements IPersistent {
+@Persistent(version=0)
+public class MissionObject extends IntangibleObject implements IPersistent {
 
 	private float missionDestinationX;
 	private float missionDestinationY;
diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java
index dce9f5b2..2a56fe85 100644
--- a/src/resources/objects/player/PlayerObject.java
+++ b/src/resources/objects/player/PlayerObject.java
@@ -28,6 +28,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
 
+import resources.objects.intangible.IntangibleObject;
 import resources.objects.waypoint.WaypointObject;
 
 import com.sleepycat.persist.model.NotPersistent;
@@ -36,13 +37,12 @@ import com.sleepycat.persist.model.Persistent;
 import engine.clients.Client;
 import engine.resources.objects.DraftSchematic;
 import engine.resources.objects.Quest;
-import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent(version=2)
-public class PlayerObject extends SWGObject {
+@Persistent(version=0)
+public class PlayerObject extends IntangibleObject {
 	
 	// PLAY 3
 	
diff --git a/src/resources/objects/resource/ResourceContainerObject.java b/src/resources/objects/resource/ResourceContainerObject.java
index cea47b84..1e4299a9 100644
--- a/src/resources/objects/resource/ResourceContainerObject.java
+++ b/src/resources/objects/resource/ResourceContainerObject.java
@@ -21,6 +21,11 @@
  ******************************************************************************/
 package resources.objects.resource;
 
-public class ResourceContainerObject {
+import com.sleepycat.persist.model.Persistent;
+
+import resources.objects.tangible.TangibleObject;
+
+@Persistent(version=0)
+public class ResourceContainerObject extends TangibleObject {
 
 }
diff --git a/src/resources/objects/ship/ShipObject.java b/src/resources/objects/ship/ShipObject.java
index b27be2fa..62d4d6a4 100644
--- a/src/resources/objects/ship/ShipObject.java
+++ b/src/resources/objects/ship/ShipObject.java
@@ -21,6 +21,11 @@
  ******************************************************************************/
 package resources.objects.ship;
 
-public class ShipObject {
+import com.sleepycat.persist.model.Persistent;
+
+import resources.objects.tangible.TangibleObject;
+
+@Persistent(version=0)
+public class ShipObject extends TangibleObject {
 
 }
diff --git a/src/resources/objects/staticobject/StaticObject.java b/src/resources/objects/staticobject/StaticObject.java
index 28b9d797..53297b00 100644
--- a/src/resources/objects/staticobject/StaticObject.java
+++ b/src/resources/objects/staticobject/StaticObject.java
@@ -30,7 +30,7 @@ import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent
+@Persistent(version=0)
 public class StaticObject extends SWGObject {
 	
 	@NotPersistent
diff --git a/src/resources/objects/tangible/TangibleObject.java b/src/resources/objects/tangible/TangibleObject.java
index a4a11d31..2b89cd36 100644
--- a/src/resources/objects/tangible/TangibleObject.java
+++ b/src/resources/objects/tangible/TangibleObject.java
@@ -35,7 +35,6 @@ import protocol.swg.objectControllerObjects.ShowFlyText;
 import resources.common.RGB;
 import resources.objects.creature.CreatureObject;
 
-
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 
@@ -45,8 +44,7 @@ import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-
-@Persistent
+@Persistent(version=0)
 public class TangibleObject extends SWGObject {
 	
 	// TODO: Thread safety
diff --git a/src/resources/objects/universe/UniverseObject.java b/src/resources/objects/universe/UniverseObject.java
new file mode 100644
index 00000000..723d5a1e
--- /dev/null
+++ b/src/resources/objects/universe/UniverseObject.java
@@ -0,0 +1,49 @@
+/*******************************************************************************
+ * Copyright (c) 2013 <Project SWG>
+ * 
+ * This File is part of NGECore2.
+ * 
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ * 
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * 
+ * Using NGEngine to work with NGECore2 is making a combined work based on NGEngine. 
+ * Therefore all terms and conditions of the GNU Lesser General Public License cover the combination.
+ ******************************************************************************/
+package resources.objects.universe;
+
+import com.sleepycat.persist.model.Persistent;
+
+import engine.clients.Client;
+import engine.resources.objects.SWGObject;
+import engine.resources.scene.Planet;
+import engine.resources.scene.Point3D;
+import engine.resources.scene.Quaternion;
+
+@Persistent(version=0)
+public class UniverseObject extends SWGObject {
+	
+	public UniverseObject(long objectID, Planet planet, Point3D position, Quaternion orientation, String Template) {
+		super(objectID, planet, position, orientation, Template);
+	}
+	
+	public UniverseObject() {
+		super();
+	}
+
+	@Override
+	public void sendBaselines(Client arg0) {
+		// TODO Auto-generated method stub
+		
+	}
+	
+}
diff --git a/src/resources/objects/waypoint/WaypointObject.java b/src/resources/objects/waypoint/WaypointObject.java
index 9b027381..32d73e1b 100644
--- a/src/resources/objects/waypoint/WaypointObject.java
+++ b/src/resources/objects/waypoint/WaypointObject.java
@@ -21,16 +21,17 @@
  ******************************************************************************/
 package resources.objects.waypoint;
 
+import resources.objects.intangible.IntangibleObject;
+
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
-import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent
-public class WaypointObject extends SWGObject {
+@Persistent(version=0)
+public class WaypointObject extends IntangibleObject {
 	
 	private int cellId; // ???
 	private long locationNetworkId;
diff --git a/src/resources/objects/weapon/WeaponObject.java b/src/resources/objects/weapon/WeaponObject.java
index f893a030..8caa651e 100644
--- a/src/resources/objects/weapon/WeaponObject.java
+++ b/src/resources/objects/weapon/WeaponObject.java
@@ -21,21 +21,17 @@
  ******************************************************************************/
 package resources.objects.weapon;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import resources.objects.tangible.TangibleObject;
 
 import com.sleepycat.persist.model.NotPersistent;
 import com.sleepycat.persist.model.Persistent;
 
 import engine.clients.Client;
-import engine.resources.objects.SWGObject;
 import engine.resources.scene.Planet;
 import engine.resources.scene.Point3D;
 import engine.resources.scene.Quaternion;
 
-@Persistent(version=1)
+@Persistent(version=0)
 public class WeaponObject extends TangibleObject {
 	
 	// TODO: Thread safety