diff --git a/scripts/houses/player_garden_tatooine_sml_01.py b/scripts/houses/player_garden_tatooine_sml_01.py
index 516ed6a3..ed3b2981 100644
--- a/scripts/houses/player_garden_tatooine_sml_01.py
+++ b/scripts/houses/player_garden_tatooine_sml_01.py
@@ -2,7 +2,7 @@ import sys
 from services.housing import HouseTemplate
 from engine.resources.scene import Point3D
 
-def setup(core):
+def setup(housingTemplates):
 	houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_garden_tatooine_sml_01_deed.iff", "object/building/player/city/shared_garden_tatooine_sml_01.iff", 0)
 	
 	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
@@ -11,5 +11,5 @@ def setup(core):
 	houseTemplate.addPlaceablePlanet("lok")
 	houseTemplate.setDefaultItemLimit(0)
 	
-	core.housingService.addHousingTemplate(houseTemplate)
+	housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
 	return
\ No newline at end of file
diff --git a/scripts/houses/player_shuttleport_tatooine.py b/scripts/houses/player_shuttleport_tatooine.py
index 9ff64abc..4d7e480f 100644
--- a/scripts/houses/player_shuttleport_tatooine.py
+++ b/scripts/houses/player_shuttleport_tatooine.py
@@ -2,11 +2,11 @@ import sys
 from services.housing import HouseTemplate
 from engine.resources.scene import Point3D
 
-def setup(core):
+def setup(housingTemplates):
 	houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_shuttleport_tatooine_deed.iff", "object/building/tatooine/shared_shuttleport_tatooine.iff", 1)
 	
 	houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5)))
 	houseTemplate.addPlaceablePlanet("tatooine")
 	houseTemplate.setDefaultItemLimit(0)
-	core.housingService.addHousingTemplate(houseTemplate)
+	housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
 	return
\ No newline at end of file
diff --git a/scripts/object/tangible/deed/city_deed/garden_tatooine_sml_01_deed.py b/scripts/object/tangible/deed/city_deed/garden_tatooine_sml_01_deed.py
index d3678f09..07ab9319 100644
--- a/scripts/object/tangible/deed/city_deed/garden_tatooine_sml_01_deed.py
+++ b/scripts/object/tangible/deed/city_deed/garden_tatooine_sml_01_deed.py
@@ -2,10 +2,6 @@ import sys
 
 def setup(core, object):
 	object.setAttachment('radial_filename', 'deeds/structureDeed')
-	object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
-	object.setStructureTemplate('object/tangible/deed/city_deed/shared_garden_tatooine_sml_01_deed.iff')
-	#object.setLotRequirement(5)
-	object.setBMR(5)
 	return
 
 def use(core, actor, object):
diff --git a/scripts/object/tangible/deed/city_deed/shuttleport_tatooine_deed.py b/scripts/object/tangible/deed/city_deed/shuttleport_tatooine_deed.py
index d676ac12..07ab9319 100644
--- a/scripts/object/tangible/deed/city_deed/shuttleport_tatooine_deed.py
+++ b/scripts/object/tangible/deed/city_deed/shuttleport_tatooine_deed.py
@@ -2,10 +2,6 @@ import sys
 
 def setup(core, object):
 	object.setAttachment('radial_filename', 'deeds/structureDeed')
-	object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
-	object.setStructureTemplate('object/tangible/deed/city_deed/shared_shuttleport_tatooine_deed.iff')
-	#object.setLotRequirement(5)
-	object.setBMR(100)
 	return
 
 def use(core, actor, object):
diff --git a/src/services/DevService.java b/src/services/DevService.java
index e2bd4390..270587d7 100644
--- a/src/services/DevService.java
+++ b/src/services/DevService.java
@@ -91,6 +91,7 @@ public class DevService implements INetworkDispatch {
 				if(creature.getClient().isGM()) suiOptions.put((long) 120, "House Deeds");
 				if(creature.getClient().isGM()) suiOptions.put((long) 125, "Crafting Tools");
 				if(creature.getClient().isGM()) suiOptions.put((long) 130, "Vehicle Deeds");
+				if(creature.getClient().isGM()) suiOptions.put((long) 121, "Sandbox City");
 
 				break;
 			case 3: // [Items] Weapons
@@ -1176,6 +1177,10 @@ public class DevService implements INetworkDispatch {
 						inventory.add(deed);
 						
 						return;
+					
+					case 121:
+						NGECore.getInstance().playerCityService.buildSandboxTestCity(player);
+					
 					case 125:
 						TangibleObject genericCraftingTool = (TangibleObject) core.objectService.createObject("object/tangible/crafting/station/shared_generic_tool.iff", planet);
 						genericCraftingTool.setCustomName("Generic Crafting Tool");