diff --git a/ngengine_public.jar b/ngengine_public.jar
index 11248832..c484a21a 100644
Binary files a/ngengine_public.jar and b/ngengine_public.jar differ
diff --git a/src/services/SimulationService.java b/src/services/SimulationService.java
index ee8bfa50..fd7608b8 100644
--- a/src/services/SimulationService.java
+++ b/src/services/SimulationService.java
@@ -34,6 +34,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.ScheduledFuture;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 import main.NGECore;
 
diff --git a/src/services/gcw/PvPZone.java b/src/services/gcw/PvPZone.java
new file mode 100644
index 00000000..785efb8f
--- /dev/null
+++ b/src/services/gcw/PvPZone.java
@@ -0,0 +1,70 @@
+/*******************************************************************************
+ * 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 services.gcw;
+
+import java.util.Vector;
+
+import net.engio.mbassy.listener.Handler;
+import resources.common.collidables.AbstractCollidable;
+import resources.common.collidables.AbstractCollidable.EnterEvent;
+import resources.common.collidables.AbstractCollidable.ExitEvent;
+import engine.resources.scene.Planet;
+
+public class PvPZone {
+	
+	private Planet planet;
+	private AbstractCollidable area;
+	
+	public PvPZone(Planet planet, AbstractCollidable area) {
+		this.planet = planet;
+		this.area = area;
+		area.getEventBus().subscribe(this);
+	}
+	
+	public Planet getPlanet() {
+		return planet;
+	}
+	
+	public void setPlanet(Planet planet) {
+		this.planet = planet;
+	}
+
+	public AbstractCollidable getArea() {
+		return area;
+	}
+
+	public void setArea(AbstractCollidable area) {
+		this.area = area;
+	}
+	
+	@Handler
+	public void onEnter(EnterEvent event) {
+		
+	}
+	
+	@Handler
+	public void onExit(ExitEvent event) {
+		
+	}
+
+
+}
diff --git a/src/services/object/ObjectService.java b/src/services/object/ObjectService.java
index a08928db..4ff23de7 100644
--- a/src/services/object/ObjectService.java
+++ b/src/services/object/ObjectService.java
@@ -897,7 +897,7 @@ public class ObjectService implements INetworkDispatch {
 				if(!core.getConfig().getString("MOTD").equals(""))
 					creature.sendSystemMessage(core.getConfig().getString("MOTD"), (byte) 2);
 				
-				BountyListItem bounty = (BountyListItem) core.getBountiesODB().get(creature.getObjectId());
+				BountyListItem bounty = (BountyListItem) core.getBountiesODB().get(creature.getObjectID());
 				if (bounty != null)
 					core.missionService.getBountyList().add(bounty);