diff --git a/src/main/NGECore.java b/src/main/NGECore.java
index 48281f51..2d491e9d 100644
--- a/src/main/NGECore.java
+++ b/src/main/NGECore.java
@@ -306,8 +306,8 @@ public class NGECore {
 		zoneServer = new MINAServer(zoneDispatch, config.getInt("ZONE.PORT"));
 		zoneServer.start();
 		staticService = new StaticService(this);
-		
-		// Planets
+		//Start terrainList
+		// Original Planets
 		terrainService.addPlanet(1, "tatooine", "terrain/tatooine.trn", true);
 		terrainService.addPlanet(2, "naboo", "terrain/naboo.trn", true);
 		terrainService.addPlanet(3, "corellia", "terrain/corellia.trn", true);
@@ -320,6 +320,46 @@ public class NGECore {
 		terrainService.addPlanet(10, "dathomir", "terrain/dathomir.trn", true);
 		terrainService.addPlanet(11, "mustafar", "terrain/mustafar.trn", true);
 		terrainService.addPlanet(12, "kashyyyk_main", "terrain/kashyyyk_main.trn", true);
+		//Dungeon Terrains
+		terrainService.addPlanet(13, "kashyyyk_dead_forest", "terrain/kashyyyk_dead_forest.trn", true);
+		terrainService.addPlanet(14, "kashyyyk_hunting", "terrain/kashyyyk_hunting.trn", true);
+		terrainService.addPlanet(15, "kashyyyk_north_dungeons", "terrain/kashyyyk_north_dungeons.trn", true);
+		terrainService.addPlanet(16, "kashyyyk_rryatt_trail", "terrain/kashyyyk_rryatt_trail.trn", true);
+		terrainService.addPlanet(17, "kashyyyk_south_dungeons", "terrain/kashyyyk_south_dungeons.trn", true);
+		terrainService.addPlanet(18, "adventure1", "terrain/adventure1.trn", true);
+		terrainService.addPlanet(19, "adventure2", "terrain/adventure2.trn", true);
+		terrainService.addPlanet(20, "dungeon1", "terrain/dungeon1.trn", true);
+		//Space Zones
+		terrainService.addPlanet(21, "space_corellia", "terrain/space_corellia.trn", true);
+		terrainService.addPlanet(22, "space_corellia_2", "terrain/space_corellia_2.trn", true);
+		terrainService.addPlanet(23, "space_dantooine", "terrain/space_dantooine.trn", true);
+		terrainService.addPlanet(24, "space_dathomir", "terrain/space_dathomir.trn", true);
+		terrainService.addPlanet(25, "space_endor", "terrain/space_endor.trn", true);
+		terrainService.addPlanet(26, "space_env", "terrain/space_env.trn", true);
+		terrainService.addPlanet(27, "space_halos", "terrain/space_halos.trn", true);
+		terrainService.addPlanet(28, "space_heavy1", "terrain/space_heavy1.trn", true);
+		terrainService.addPlanet(29, "space_kashyyyk", "terrain/space_kashyyyk.trn", true);
+		terrainService.addPlanet(30, "space_light1", "terrain/space_light1.trn", true);
+		terrainService.addPlanet(31, "space_lok", "terrain/space_lok.trn", true);
+		terrainService.addPlanet(32, "space_naboo", "terrain/space_naboo.trn", true);
+		terrainService.addPlanet(33, "space_naboo_2", "terrain/space_naboo_2.trn", true);
+		terrainService.addPlanet(34, "space_nova_orion", "terrain/space_nova_orion.trn", true);
+		terrainService.addPlanet(35, "space_npe_falcon", "terrain/space_npe_falcon.trn", true);
+		terrainService.addPlanet(36, "space_npe_falcon_2", "terrain/space_npe_falcon_2.trn", true);
+		terrainService.addPlanet(37, "space_ord_mantell", "terrain/space_ord_mantell.trn", true);
+		terrainService.addPlanet(38, "space_ord_mantell_2", "terrain/space_ord_mantell_2.trn", true);
+		terrainService.addPlanet(39, "space_ord_mantell_3", "terrain/space_ord_mantell_3.trn", true);
+		terrainService.addPlanet(40, "space_ord_mantell_4", "terrain/space_ord_mantell_4.trn", true);
+		terrainService.addPlanet(41, "space_ord_mantell_5", "terrain/space_ord_mantell_5.trn", true);
+		terrainService.addPlanet(42, "space_ord_mantell_6", "terrain/space_ord_mantell_6.trn", true);
+		terrainService.addPlanet(43, "space_tatooine", "terrain/space_tatooine.trn", true);
+		terrainService.addPlanet(44, "space_tatooine_2", "terrain/space_tatooine_2.trn", true);
+		terrainService.addPlanet(45, "space_yavin4", "terrain/space_yavin4.trn", true);
+		//PSWG New Content Terrains  (WARNING Keep commented out unless you have the current build of kaas!)
+		/*
+		terrainService.addPlanet(46, "kaas", "terrain/kaas.trn", true);
+		*/
+		//end terrainList
 		spawnService = new SpawnService(this);
 		terrainService.loadClientPois();
 		// Travel Points