diff --git a/src/resources/commands/callbacks/RequestWaypointCmdCallback.java b/src/resources/commands/callbacks/RequestWaypointCmdCallback.java
index 8facb90c1..d4e36fa21 100644
--- a/src/resources/commands/callbacks/RequestWaypointCmdCallback.java
+++ b/src/resources/commands/callbacks/RequestWaypointCmdCallback.java
@@ -17,7 +17,6 @@ public class RequestWaypointCmdCallback implements ICmdCallback {
 		
 		WaypointObject waypoint = (WaypointObject) objManager.createObject("object/waypoint/shared_waypoint.iff", player.getCreatureObject().getLocation());
 		ghost.addWaypoint(waypoint);
-		System.out.println("Waypoitn requested.");
 	}
 
 }
diff --git a/src/resources/commands/callbacks/WaypointCmdCallback.java b/src/resources/commands/callbacks/WaypointCmdCallback.java
index cd4994b45..a0c4212e0 100644
--- a/src/resources/commands/callbacks/WaypointCmdCallback.java
+++ b/src/resources/commands/callbacks/WaypointCmdCallback.java
@@ -2,6 +2,8 @@ package resources.commands.callbacks;
 
 import resources.commands.ICmdCallback;
 import resources.objects.SWGObject;
+import resources.objects.player.PlayerObject;
+import resources.objects.waypoint.WaypointObject;
 import resources.player.Player;
 import services.objects.ObjectManager;
 
@@ -9,7 +11,13 @@ public class WaypointCmdCallback implements ICmdCallback {
 
 	@Override
 	public void execute(ObjectManager objManager, Player player, SWGObject target, String args) {
-		System.out.println("Create Waypoint: " + args);
+		PlayerObject ghost = (PlayerObject) player.getPlayerObject();
+		if (ghost == null)
+			return;
+		
+		//System.out.println("Create Waypoint: " + args);
+		WaypointObject waypoint = (WaypointObject) objManager.createObject("object/waypoint/shared_waypoint.iff", player.getCreatureObject().getLocation());
+		ghost.addWaypoint(waypoint);
 	}
 
 }
diff --git a/src/resources/objects/player/PlayerObject.java b/src/resources/objects/player/PlayerObject.java
index 0beb7d1e8..4cc981f61 100644
--- a/src/resources/objects/player/PlayerObject.java
+++ b/src/resources/objects/player/PlayerObject.java
@@ -45,6 +45,7 @@ public class PlayerObject extends IntangibleObject {
 		experience.put(type, value);
 		experience.sendDeltaMessage(this);
 	}
+	
 	public String getProfession() {
 		return profession;
 	}
diff --git a/src/resources/objects/waypoint/WaypointObject.java b/src/resources/objects/waypoint/WaypointObject.java
index bfddcfefb..8a1fd4aa4 100644
--- a/src/resources/objects/waypoint/WaypointObject.java
+++ b/src/resources/objects/waypoint/WaypointObject.java
@@ -1,6 +1,7 @@
 package resources.objects.waypoint;
 
 import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
 import java.nio.charset.Charset;
 
 import resources.network.BaselineBuilder;
@@ -103,7 +104,7 @@ public class WaypointObject extends IntangibleObject implements Encodable{
 
 	@Override
 	public byte[] encode() {
-		ByteBuffer bb = ByteBuffer.allocate(42 + name.length() * 2);
+		ByteBuffer bb = ByteBuffer.allocate(42 + name.length() * 2).order(ByteOrder.LITTLE_ENDIAN);
 		bb.putInt(cellNumber);
 		bb.putFloat((float) getLocation().getX());
 		bb.putFloat((float) getLocation().getY());