diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_4.tab b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_4.tab
index f60da9ebd..6c5409607 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_4.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/corellia/corellia_4_4.tab
@@ -76,3 +76,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 -942093813	0	object/static/structure/general/campfire_fresh.iff	0	112.204	20.0722	1911.4	1	0	0	0		$|
 -1637352686	0	object/tangible/furniture/all/frn_all_tiki_torch_s1.iff	0	114.727	20.1314	1920.69	1	0	0	0		$|
 -768107264	0	object/tangible/furniture/all/frn_all_tiki_torch_s1.iff	0	109.443	20.1431	1920.64	1	0	0	0		$|
+268517805	0	object/tangible/weather_object/weather_object_base.iff	0	0	195	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/dantooine/dantooine_4_4_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/dantooine/dantooine_4_4_ws.tab
index 6aa68bea5..47f45d372 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/dantooine/dantooine_4_4_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/dantooine/dantooine_4_4_ws.tab
@@ -9,3 +9,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 529410	0	object/static/structure/dantooine/dant_rack_spears.iff	0	1908.44	6.95685	1642.6	0.924909	0	-0.380188	0		$|
 529411	0	object/static/structure/dantooine/dant_hide_tanning_s01.iff	0	1893.14	6.61071	1639.75	1	0	0	0		$|
 529412	0	object/static/structure/dantooine/dant_hide_tanning_s02.iff	0	1895.19	6.86281	1639.31	1	0	0	0		$|
+268517860	0	object/tangible/weather_object/weather_object_base.iff	0	0	195	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_4_4.tab b/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_4_4.tab
index bd1d2e98c..e157ef6c5 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_4_4.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/dathomir/dathomir_4_4.tab
@@ -18,3 +18,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 -58415192	0	object/tangible/ground_spawning/patrol_waypoint.iff	0	2004.06	18	449.489	1	0	0	0	systems.spawning.patrol_point_setup	ignoreInBuildoutArray|0|1|pointName|4|smuggler_patrol_12_02_11601440_4|registerWithController|0|1|$|
 -42838000	0	object/building/kashyyyk/thm_kash_rodian_bannerpole_s01.iff	0	0	195	0	1	0	0	0		$|
 -716077606	0	object/tangible/ground_spawning/area_spawner.iff	0	1911.6	18	457.348	1	0	0	0	systems.spawning.spawn_tangible	registerWithController|0|1|spawn.object|4|object/tangible/meatlump/event/meatlump_bomb_01_04.iff|$|
+268517870	0	object/tangible/weather_object/weather_object_base.iff	0	0	195	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/endor/endor_4_4_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/endor/endor_4_4_ws.tab
index ed6697cc0..905b3bbdd 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/endor/endor_4_4_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/endor/endor_4_4_ws.tab
@@ -23,3 +23,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 9705454	0	object/static/flora/flora_flower_endor_scrubwort.iff	0	171.837	9.74419	572.335	1	0	0	0		$|
 9705456	0	object/static/flora/flora_bush_endor_rainbowbush.iff	0	169.204	9.76455	570.144	1	0	0	0		$|
 9705457	0	object/static/flora/flora_bush_endor_rainbowbush.iff	0	159.662	9.91131	568.948	0.00920351	0	0.999958	0		$|
+268517840	0	object/tangible/weather_object/weather_object_base.iff	0	0	195	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/lok/lok_4_4_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/lok/lok_4_4_ws.tab
index ed14fb59e..df6b9060d 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/lok/lok_4_4_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/lok/lok_4_4_ws.tab
@@ -34,3 +34,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 9685720	0	object/static/structure/tatooine/pillar_pristine_large_style_01.iff	0	1830.8	12.9417	1592.88	1	0	0	0		$|
 9685721	0	object/static/structure/tatooine/wall_pristine_tatooine_large_style_01.iff	0	1830.06	12.8964	1588.22	0	0	1	0		$|
 9685722	0	object/static/structure/tatooine/wall_pristine_tatooine_large_style_01.iff	0	1830.06	12.7293	1582.42	0	0	1	0		$|
+268517850	0	object/tangible/weather_object/weather_object_base.iff	0	0	195	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_4_4_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_4_4_ws.tab
index c88e8a1ed..f442093d4 100755
--- a/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_4_4_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/naboo/naboo_4_4_ws.tab
@@ -91,3 +91,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 9525831	0	object/static/structure/general/bench_generic_style_1.iff	0	1790.71	2.90958	1970.88	0.999875	-0.00499942	7.49969e-005	0.0149993		$|
 9525834	0	object/static/structure/general/streetlamp_small_style_01.iff	0	1790.21	4.1251	1999.68	0.998786	-0.0345796	-0.00148662	0.0350594		$|
 5286034	0	object/static/item/item_container_weapon.iff	0	541.154	278	301.044	0.970137	0	0.242556	0		$|
+268517800	0	object/tangible/weather_object/weather_object_base.iff	0	0	195	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/rori/rori_4_4.tab b/sku.0/sys.server/compiled/game/datatables/buildout/rori/rori_4_4.tab
index 77bf1af09..9ad653399 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/rori/rori_4_4.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/rori/rori_4_4.tab
@@ -3,3 +3,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 -1860869264	0	object/building/faction_perk/hq/planet_base_register.iff	0	2047.95	90.4293	2043.08	1	0	0	0	faction_perk.hq.planetary_base_register	$|
 -33838000	0	object/building/kashyyyk/thm_kash_rodian_bannerpole_s01.iff	0	0	195	0	1	0	0	0		$|
 -1650365135	0	object/tangible/collection/rare_heavy_crusader_m_xx.iff	0	1055.35	76.0102	1737.1	0.770394	-0.573051	0.140766	-0.241434	systems.collections.consume_click	collection.slotName|4|col_rare_heavy_01:crusader_m_xx_01|$|
+268517790	0	object/tangible/weather_object/weather_object_base.iff	0	0	195	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/talus/talus_4_4.tab b/sku.0/sys.server/compiled/game/datatables/buildout/talus/talus_4_4.tab
index 8684466a2..60d3ab35d 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/talus/talus_4_4.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/talus/talus_4_4.tab
@@ -2,3 +2,4 @@ objid	container	server_template_crc	cell_index	px	py	pz	qw	qx	qy	qz	scripts	objv
 i	i	h	i	f	f	f	f	f	f	f	s	p
 -36838000	0	object/building/kashyyyk/thm_kash_rodian_bannerpole_s01.iff	0	0	195	0	1	0	0	0		$|
 -2113999392	0	object/building/faction_perk/hq/planet_base_register.iff	0	2018.87	2.22613	2033.5	1	0	0	0	faction_perk.hq.planetary_base_register	$|
+268517830	0	object/tangible/weather_object/weather_object_base.iff	0	0	195	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_4.tab b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_4.tab
index 36b721f99..e2664dd89 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_4.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/tatooine/tatooine_4_4.tab
@@ -5,3 +5,4 @@ i	i	h	i	f	f	f	f	f	f	f	s	p
 -1222376262	0	object/tangible/ground_spawning/area_spawner.iff	0	688.919	34.9814	1675.06	0.260014	0	0.965605	0	systems.spawning.spawner_area	fltMaxSpawnTime|2|900.000000|fltMinSpawnTime|2|600.000000|fltRadius|2|1.000000|intDefaultBehavior|0|0|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|adolescent_krayt_02|strSpawnerType|4|area|strSpawns|4|krayt_dragon_adolescent|$|
 -1096587352	0	object/tangible/ground_spawning/area_spawner.iff	0	716.217	25.7202	1679.95	0.976308	0	0.216387	0	systems.spawning.spawner_area	fltMaxSpawnTime|2|900.000000|fltMinSpawnTime|2|600.000000|fltRadius|2|1.000000|intDefaultBehavior|0|0|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|adolescent_krayt_03|strSpawnerType|4|area|strSpawns|4|krayt_dragon_adolescent|$|
 -1630636018	0	object/tangible/ground_spawning/area_spawner.iff	0	724.085	24.1711	1666.31	0.927607	0	-0.373557	0	systems.spawning.spawner_area	fltMaxSpawnTime|2|900.000000|fltMinSpawnTime|2|600.000000|fltRadius|2|1.000000|intDefaultBehavior|0|2|intGoodLocationSpawner|0|0|intSpawnCount|0|1|intSpawnSystem|0|1|registerWithController|0|1|strName|4|adolescent_krayt_04|strSpawnerType|4|area|strSpawns|4|krayt_dragon_adolescent|$|
+268517795	0	object/tangible/weather_object/weather_object_base.iff	0	0	195	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/datatables/buildout/yavin4/yavin4_4_4_ws.tab b/sku.0/sys.server/compiled/game/datatables/buildout/yavin4/yavin4_4_4_ws.tab
index e1311de10..09183735c 100644
--- a/sku.0/sys.server/compiled/game/datatables/buildout/yavin4/yavin4_4_4_ws.tab
+++ b/sku.0/sys.server/compiled/game/datatables/buildout/yavin4/yavin4_4_4_ws.tab
@@ -2,3 +2,4 @@ objid	container	server_template_crc	cell_index	px	py	pz	qw	qx	qy	qz	scripts	objv
 i	i	h	i	f	f	f	f	f	f	f	s	p
 8995434	0	object/static/structure/dantooine/dant_small_mudhut.iff	0	465.939	36.9807	1225.63	0.917121	0	-0.398609	0		$|
 8995435	0	object/static/structure/general/streetlamp_small_green_style_01.iff	0	464.496	36.927	1223.3	1	0	0	0		$|
+268517820	0	object/tangible/weather_object/weather_object_base.iff	0	0	195	0	1	0	0	0		$|
diff --git a/sku.0/sys.server/compiled/game/object/building/base/base_hangar.tpf b/sku.0/sys.server/compiled/game/object/building/base/base_hangar.tpf
index 1d77ec109..473afc36b 100644
--- a/sku.0/sys.server/compiled/game/object/building/base/base_hangar.tpf
+++ b/sku.0/sys.server/compiled/game/object/building/base/base_hangar.tpf
@@ -22,3 +22,5 @@
 scripts =+["structure.municipal.starport"]
 
 moveFlags = [ MF_gm ]
+
+updateRanges[UR_far] = 2000
diff --git a/sku.0/sys.server/compiled/game/object/building/base/base_power_generator.tpf b/sku.0/sys.server/compiled/game/object/building/base/base_power_generator.tpf
index 18a242ee0..e4a34d4a9 100644
--- a/sku.0/sys.server/compiled/game/object/building/base/base_power_generator.tpf
+++ b/sku.0/sys.server/compiled/game/object/building/base/base_power_generator.tpf
@@ -39,3 +39,5 @@ deleteFlags = [ DF_gm ]
 
 
 moveFlags = [ MF_gm ]
+
+updateRanges[UR_far] = 2000
diff --git a/sku.0/sys.server/compiled/game/object/building/corellia/salon_corellia.tpf b/sku.0/sys.server/compiled/game/object/building/corellia/salon_corellia.tpf
index 0882d753b..fc1016157 100644
--- a/sku.0/sys.server/compiled/game/object/building/corellia/salon_corellia.tpf
+++ b/sku.0/sys.server/compiled/game/object/building/corellia/salon_corellia.tpf
@@ -25,6 +25,7 @@
 sharedTemplate = "object/building/corellia/shared_salon_corellia.iff"
 
 objvars = +["salon" = 1]
+scripts =+["planet_map.map_loc"]
 
 
 
diff --git a/sku.0/sys.server/compiled/game/object/building/naboo/salon_naboo.tpf b/sku.0/sys.server/compiled/game/object/building/naboo/salon_naboo.tpf
index c5faf5c10..c8d5bfcf6 100644
--- a/sku.0/sys.server/compiled/game/object/building/naboo/salon_naboo.tpf
+++ b/sku.0/sys.server/compiled/game/object/building/naboo/salon_naboo.tpf
@@ -25,6 +25,7 @@
 sharedTemplate = "object/building/naboo/shared_salon_naboo.iff"
 
 objvars = +["salon" = 1]
+scripts =+["planet_map.map_loc"]
 
 
 
diff --git a/sku.0/sys.server/compiled/game/object/building/restuss/restuss_bank.tpf b/sku.0/sys.server/compiled/game/object/building/restuss/restuss_bank.tpf
index e32f44ba6..e2b286641 100644
--- a/sku.0/sys.server/compiled/game/object/building/restuss/restuss_bank.tpf
+++ b/sku.0/sys.server/compiled/game/object/building/restuss/restuss_bank.tpf
@@ -1,8 +1,24 @@
-@base object/building/base/base_filler_building.iff
+//            Filename:     starport_naboo
+//            Directory:    object/building/naboo
+//
+//            Description:
+//            Tatooine Starport
+//
+//            Notes:
+//
+//
+//            Category:                   Building
+//            Sub-Category:               Naboo
+//            Classification:             Null
+//            
 
-@class building_object_template 1
+@base object/building/base/base_cave.iff
 
-@class tangible_object_template 2
+@class building_object_template 0
+
+@class tangible_object_template 0
+
+@class object_template 1
 
 sharedTemplate = "object/building/restuss/shared_restuss_bank.iff"
 
diff --git a/sku.0/sys.shared/compiled/game/object/mobile/shared_dressed_tatooine_wuher.tpf b/sku.0/sys.shared/compiled/game/object/mobile/shared_dressed_tatooine_wuher.tpf
new file mode 100644
index 000000000..1b915e99c
--- /dev/null
+++ b/sku.0/sys.shared/compiled/game/object/mobile/shared_dressed_tatooine_wuher.tpf
@@ -0,0 +1,36 @@
+//            Filename:     shared_dressed_tatooine_wuher
+//            Directory:    object/creature/npc/theme_park
+//
+//            Description:
+//            wuher
+//
+//            Notes:
+//
+//
+//            Category:                   Creature
+//            Sub-Category:               NPC
+//            Classification:             Theme Park
+//            
+
+@base object/creature/npc/base/shared_base_npc_theme_park.iff
+
+@class creature_object_template 3
+
+gender = GE_male
+species = SP_human
+animationMapFilename = "all_male.map"
+
+@class tangible_object_template 3
+
+
+
+@class object_template 3
+
+objectName = "theme_park_name" "wuher"
+detailedDescription = "" ""
+lookAtText = "theme_park_lookat" "wuher"
+appearanceFilename = "appearance/hum_m.sat"
+snapToTerrain = true
+tintPalette = "0"
+clientDataFile = "clientdata/npc/client_shared_npc_dressed_tatooine_wuher.cdf"
+