Index: bin/scripts/managers/spawn_manager/tatooine.lua
===================================================================
--- bin/scripts/managers/spawn_manager/tatooine.lua	(revision 5891)
+++ bin/scripts/managers/spawn_manager/tatooine.lua	(working copy)
@@ -1858,6 +1858,7 @@
 	{"commoner_fat",60,-2.2,-0.9,-10.9,65,1082877, "npc_sitting_table_eating", ""},
 	{"imperial_first_lieutenant",400,3.9,0,0.5,180,1279922, "npc_sitting_table", ""},
 	{"imperial_sergeant",400,-2.3,0,-3.9,13,1279924, "npc_use_terminal_high", ""},
+	{"hedon_istee",60,1390,0,3195,0,0, "", ""},
 }
 
 tatooine_badges = {
Index: bin/scripts/mobile/tatooine/hedon_istee.lua
===================================================================
--- bin/scripts/mobile/tatooine/hedon_istee.lua	(revision 5891)
+++ bin/scripts/mobile/tatooine/hedon_istee.lua	(working copy)
@@ -24,7 +24,7 @@
 	ferocity = 0,
 	pvpBitmask = NONE,
 	creatureBitmask = PACK,
-	optionsBitmask = 136,
+	optionsBitmask = 264,
 	diet = HERBIVORE,
 
 	templates = {"object/mobile/dressed_tatooine_hedon_istee.iff"},
Index: bin/scripts/object/building/tatooine/housing_tatt_style01_med.lua
===================================================================
--- bin/scripts/object/building/tatooine/housing_tatt_style01_med.lua	(revision 5891)
+++ bin/scripts/object/building/tatooine/housing_tatt_style01_med.lua	(working copy)
@@ -43,8 +43,7 @@
 
 object_building_tatooine_housing_tatt_style01_med = object_building_tatooine_shared_housing_tatt_style01_med:new {
 
--- Used as tavern for: Anchorhead (Tatooine)
-
+	
 	planetMapCategory = "tavern",
 	
 	skillMods = {
@@ -56,7 +55,6 @@
 	},
 
 
-
 }
 
 ObjectTemplates:addTemplate(object_building_tatooine_housing_tatt_style01_med, "object/building/tatooine/housing_tatt_style01_med.iff")
Index: bin/scripts/object/building/tatooine/housing_tatt_style02_med.lua
===================================================================
--- bin/scripts/object/building/tatooine/housing_tatt_style02_med.lua	(revision 5891)
+++ bin/scripts/object/building/tatooine/housing_tatt_style02_med.lua	(working copy)
@@ -42,21 +42,6 @@
 
 
 object_building_tatooine_housing_tatt_style02_med = object_building_tatooine_shared_housing_tatt_style02_med:new {
-
--- Used as tavern for: Mos Taike?
-
-	planetMapCategory = "tavern",
-	
-	skillMods = {
-		{"private_med_wound_mind", 20},
-		{"private_buff_mind", 100},
-		{"private_med_battle_fatigue", 5},
-		{"private_med_wound_health", 100},
-		{"private_med_wound_action", 100}
-	},
-
-
-
 }
 
 ObjectTemplates:addTemplate(object_building_tatooine_housing_tatt_style02_med, "object/building/tatooine/housing_tatt_style02_med.iff")
Index: bin/scripts/object/building/tatooine/housing_tatt_style03_med.lua
===================================================================
--- bin/scripts/object/building/tatooine/housing_tatt_style03_med.lua	(revision 5891)
+++ bin/scripts/object/building/tatooine/housing_tatt_style03_med.lua	(working copy)
@@ -44,19 +44,6 @@
 object_building_tatooine_housing_tatt_style03_med = object_building_tatooine_shared_housing_tatt_style03_med:new {
 
 
--- Used as tavern for: Mos Taike?
-
-	planetMapCategory = "tavern",
-	
-	skillMods = {
-		{"private_med_wound_mind", 20},
-		{"private_buff_mind", 100},
-		{"private_med_battle_fatigue", 5},
-		{"private_med_wound_health", 100},
-		{"private_med_wound_action", 100}
-	},
-
-
 }
 
 ObjectTemplates:addTemplate(object_building_tatooine_housing_tatt_style03_med, "object/building/tatooine/housing_tatt_style03_med.iff")
Index: bin/scripts/screenplays/tasks/hedon_istee.lua
===================================================================
--- bin/scripts/screenplays/tasks/hedon_istee.lua	(revision 5891)
+++ bin/scripts/screenplays/tasks/hedon_istee.lua	(working copy)
@@ -36,17 +36,18 @@
 end
 
 function hedon_istee_screenplay:spawnMobiles()
-	local pHedonIstee = spawnMobile("tatooine", "hedon_istee", 1, self.loc.hedon.x, self.loc.hedon.z, self.loc.hedon.y, 0, 0)
+	-- Spawn Hedon Istee in the spawn manager for Tatooine.
+	--local pHedonIstee = spawnMobile("tatooine", "hedon_istee", 60, self.loc.hedon.x, self.loc.hedon.z, self.loc.hedon.y, 0, 0)
 	local pDrognuz = spawnMobile("tatooine", "drognuz", 60, self.loc.drog.x, self.loc.drog.z, self.loc.drog.y, 0, 0)
 	local pRathKana = spawnMobile("tatooine", "rath_kana", 60, self.loc.rath.x, self.loc.rath.z, self.loc.rath.y, 0, 0)
 	local pSereneFloater = spawnMobile("tatooine", "serene_floater", 60, self.loc.monk.x, self.loc.monk.z, self.loc.monk.y, 0, 0)
 	
-	local hedonIstee = LuaCreatureObject(pHedonIstee)
+	--local hedonIstee = LuaCreatureObject(pHedonIstee)
 	local drognuz = LuaCreatureObject(pDrognuz)
 	local rathKana = LuaCreatureObject(pRathKana)
 	local sereneFloater = LuaCreatureObject(pSereneFloater)
 	
-	writeData("hedon_istee:hedonIsteeID", hedonIstee:getObjectID())
+	--writeData("hedon_istee:hedonIsteeID", hedonIstee:getObjectID())
 	writeData("hedon_istee:drognuzID", drognuz:getObjectID())
 	writeData("hedon_istee:rathKanaID", rathKana:getObjectID())
 	writeData("hedon_istee:sereneFloaterID", sereneFloater:getObjectID())
@@ -196,7 +197,16 @@
 	
 	createLoot(pChest, "hedon_istee_treasure", 10)
 	createEvent(self.treasure_life, "hedon_istee_screenplay", "removeTreasureChest", pChest)
+
+	if (pChest ~= nil) then
+		local container = LuaSceneObject(pChest)
+
+		container:setContainerInheritPermissionsFromParent(false)
+		container:setContainerDefaultDenyPermission(MOVEIN)
+		container:setContainerDefaultAllowPermission(OPEN + MOVEOUT)
+	end
 	
+	
 	if (pTreasureMap ~= nil) then
 		local map = LuaSceneObject(pTreasureMap)
 		map:destroyObjectFromWorld()
@@ -402,11 +412,6 @@
 		return convoTemplate:getScreen("npc_work_1")
 	end
 
-	--We need to check skill points here maybe?
-	--if (faction ~= 3679112276) then
-	--return convoTemplate:getScreen("notyet")
-	--end
-
 	return convoTemplate:getScreen("npc_1_1") --First quest
 end