diff --git a/src/intents/object/ObjectTeleportIntent.java b/src/intents/object/ObjectTeleportIntent.java
index da2078d3..bc593cfa 100644
--- a/src/intents/object/ObjectTeleportIntent.java
+++ b/src/intents/object/ObjectTeleportIntent.java
@@ -32,17 +32,27 @@ import resources.control.Intent;
 import resources.objects.SWGObject;
 
 public class ObjectTeleportIntent extends Intent {
+	
 	public static final String TYPE = "ObjectTeleportIntent";
 	
 	private SWGObject object;
+	private SWGObject parent;
 	private Location newLocation;
 	
 	public ObjectTeleportIntent(SWGObject object, Location newLocation) {
 		super(TYPE);
 		this.object = object;
+		this.parent = null;
 		this.newLocation = newLocation;
 	}
-
+	
+	public ObjectTeleportIntent(SWGObject object, SWGObject parent, Location newLocation) {
+		super(TYPE);
+		this.object = object;
+		this.parent = parent;
+		this.newLocation = newLocation;
+	}
+	
 	public SWGObject getObject() {
 		return object;
 	}
@@ -50,6 +60,14 @@ public class ObjectTeleportIntent extends Intent {
 	public void setObject(SWGObject object) {
 		this.object = object;
 	}
+	
+	public SWGObject getParent() {
+		return parent;
+	}
+	
+	public void setParent(SWGObject parent) {
+		this.parent = parent;
+	}
 
 	public Location getNewLocation() {
 		return newLocation;
diff --git a/src/resources/commands/callbacks/GotoCmdCallback.java b/src/resources/commands/callbacks/GotoCmdCallback.java
new file mode 100644
index 00000000..489e7275
--- /dev/null
+++ b/src/resources/commands/callbacks/GotoCmdCallback.java
@@ -0,0 +1,79 @@
+package resources.commands.callbacks;
+
+import intents.chat.ChatBroadcastIntent;
+import intents.object.ObjectTeleportIntent;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+import resources.Location;
+import resources.Terrain;
+import resources.commands.ICmdCallback;
+import resources.objects.SWGObject;
+import resources.objects.building.BuildingObject;
+import resources.objects.cell.CellObject;
+import resources.player.Player;
+import resources.server_info.Log;
+import resources.server_info.RelationalServerData;
+import resources.server_info.RelationalServerFactory;
+import services.galaxy.GalacticManager;
+import services.objects.ObjectManager;
+
+public class GotoCmdCallback implements ICmdCallback  {
+	
+	@Override
+	public void execute(GalacticManager galacticManager, Player player, SWGObject target, String args) {
+		SWGObject teleportee = player.getCreatureObject();
+		if (teleportee == null)
+			return;
+		String [] parts = args.split(" ");
+		if (parts.length == 0 || parts[0].trim().isEmpty())
+			return;
+		String loc = parts[0].trim();
+		String err = teleportToGotoLocation(galacticManager.getObjectManager(), teleportee, loc);
+		new ChatBroadcastIntent(player, err).broadcast();
+	}
+	
+	private String teleportToGotoLocation(ObjectManager objManager, SWGObject obj, String loc) {
+		final String whereClause = "(player_spawns.id = ?) AND (player_spawns.building_id = '' OR buildings.building_id = player_spawns.building_id)";
+		try (RelationalServerData data = RelationalServerFactory.getServerData("player/player_spawns.db", "building/buildings", "player_spawns")) {
+			try (ResultSet set = data.selectFromTable("player_spawns, buildings", new String[]{"player_spawns.*", "buildings.object_id"}, whereClause, loc)) {
+				if (!set.next())
+					return "No such location found: " + loc;
+				return teleportToGoto(objManager, obj, loc, set);
+			} catch (SQLException e) {
+				e.printStackTrace();
+				return "Exception thrown. Failed to teleport: ["+e.getErrorCode()+"] " + e.getMessage();
+			}
+		}
+	}
+	
+	private String teleportToGoto(ObjectManager objManager, SWGObject obj, String loc, ResultSet set) throws SQLException {
+		String building = set.getString("building_id");
+		Terrain t = Terrain.getTerrainFromName(set.getString("terrain"));
+		Location l = new Location(set.getDouble("x"), set.getDouble("y"), set.getDouble("z"), t);
+		if (building.isEmpty())
+			new ObjectTeleportIntent(obj, l).broadcast();
+		else
+			return teleportToGotoBuilding(objManager, obj, set.getLong("object_id"), set.getString("cell"), l);
+		return "Sucessfully teleported "+obj.getName()+" to " + loc;
+	}
+	
+	private String teleportToGotoBuilding(ObjectManager objManager, SWGObject obj, long buildingId, String cellName, Location l) {
+		SWGObject parent = objManager.getObjectById(buildingId);
+		if (parent == null || !(parent instanceof BuildingObject)) {
+			String err = String.format("Invalid parent! Either null or not a building: %s  BUID: %d", parent, buildingId);
+			Log.e("CharacterCreationService", err);
+			return err;
+		}
+		CellObject cell = ((BuildingObject) parent).getCellByName(cellName);
+		if (cell == null) {
+			String err = String.format("Invalid cell! Cell does not exist: %s  B-Template: %s  BUID: %d", cellName, parent.getTemplate(), buildingId);
+			Log.e("CharacterCreationService", err);
+			return err;
+		}
+		new ObjectTeleportIntent(obj, cell, l).broadcast();
+		return "Successfully teleported "+obj.getName()+" to "+buildingId+"/"+cellName;
+	}
+	
+}
diff --git a/src/resources/commands/callbacks/QaToolCmdCallback.java b/src/resources/commands/callbacks/QaToolCmdCallback.java
index 7a25b630..7729d916 100644
--- a/src/resources/commands/callbacks/QaToolCmdCallback.java
+++ b/src/resources/commands/callbacks/QaToolCmdCallback.java
@@ -35,9 +35,13 @@ import resources.Location;
 import resources.Terrain;
 import resources.commands.ICmdCallback;
 import resources.objects.SWGObject;
+import resources.objects.building.BuildingObject;
+import resources.objects.cell.CellObject;
 import resources.objects.creature.CreatureObject;
 import resources.player.Player;
 import resources.server_info.Log;
+import resources.server_info.RelationalServerData;
+import resources.server_info.RelationalServerFactory;
 import resources.sui.ISuiCallback;
 import resources.sui.SuiButtons;
 import resources.sui.SuiEvent;
@@ -47,8 +51,9 @@ import resources.sui.SuiMessageBox;
 import services.galaxy.GalacticManager;
 import services.objects.ObjectManager;
 import services.player.PlayerManager;
-import services.player.TerrainZoneInsertion;
 
+import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Map;
 
 import network.packets.soe.Disconnect.DisconnectReason;
@@ -151,27 +156,27 @@ public class QaToolCmdCallback implements ICmdCallback {
 	private void recoverPlayer(ObjectManager objManager, PlayerManager playerManager, Player player, String args) {
 		String name = args;
 		String [] nameParts = name.split(" ");
-		Terrain t = Terrain.TATOOINE;
+		String loc = "";
 		if (nameParts.length >= 2) {
-			if (nameParts.length > 3) {
-				sendSystemMessage(player, "Invalid arguments! Expected <playername> [opt]<terrain>");
-				return;
-			}
-			Terrain possible = null;
-			if (nameParts.length == 3) {
-				possible = getTerrain(nameParts[2]);
-				if (possible != null)
-					name = nameParts[0] + " " + nameParts[1];
-			}
-			if (nameParts.length == 2 || possible == null) {
-				possible = getTerrain(nameParts[1]);
-				if (possible != null)
+			switch (nameParts.length) {
+				case 2:
 					name = nameParts[0];
+					loc = nameParts[1];
+					break;
+				case 3:
+					name = nameParts[0] + " " + nameParts[1];
+					loc = nameParts[2];
+					break;
+				default:
+					sendSystemMessage(player, "Invalid arguments! Expected <playername> [opt]<terrain>");
+					break;
 			}
-			if (possible != null)
-				t = possible;
 		}
 		name = name.trim();
+		recoverPlayer(objManager, playerManager, player, name, loc);
+	}
+	
+	private void recoverPlayer(ObjectManager objManager, PlayerManager playerManager, Player player, String name, String loc) {
 		long id = playerManager.getCharacterIdByName(name);
 		if (id == 0) {
 			sendSystemMessage(player, "Could not find player by name: '" + name + "'");
@@ -184,19 +189,51 @@ public class QaToolCmdCallback implements ICmdCallback {
 			sendSystemMessage(player, "Internal Error. Recoveree is null! ID: " + id);
 			return;
 		}
-		Location l = TerrainZoneInsertion.getInsertionForTerrain(t);
-		new ObjectTeleportIntent(recoveree, l).broadcast();
+		sendSystemMessage(player, teleportToRecoveryLocation(objManager, recoveree, loc));
 	}
 	
-	private Terrain getTerrain(String str) {
-		for (Terrain t : Terrain.values()) {
-			if (t.getName().equalsIgnoreCase(str)) {
-				return t;
+	private String teleportToRecoveryLocation(ObjectManager objManager, SWGObject obj, String loc) {
+		final String whereClause = "(player_spawns.id = ?) AND (player_spawns.building_id = '' OR buildings.building_id = player_spawns.building_id)";
+		try (RelationalServerData data = RelationalServerFactory.getServerData("player/player_spawns.db", "building/buildings", "player_spawns")) {
+			try (ResultSet set = data.selectFromTable("player_spawns, buildings", new String[]{"player_spawns.*", "buildings.object_id"}, whereClause, loc)) {
+				if (!set.next())
+					return "No such location found: " + loc;
+				return teleportToRecovery(objManager, obj, loc, set);
+			} catch (SQLException e) {
+				e.printStackTrace();
+				return "Exception thrown. Failed to teleport: ["+e.getErrorCode()+"] " + e.getMessage();
 			}
 		}
-		return null;
 	}
-
+	
+	private String teleportToRecovery(ObjectManager objManager, SWGObject obj, String loc, ResultSet set) throws SQLException {
+		String building = set.getString("building_id");
+		Terrain t = Terrain.getTerrainFromName(set.getString("terrain"));
+		Location l = new Location(set.getDouble("x"), set.getDouble("y"), set.getDouble("z"), t);
+		if (building.isEmpty())
+			new ObjectTeleportIntent(obj, l).broadcast();
+		else
+			return teleportToRecoveryBuilding(objManager, obj, set.getLong("object_id"), set.getString("cell"), l);
+		return "Sucessfully teleported "+obj.getName()+" to " + loc;
+	}
+	
+	private String teleportToRecoveryBuilding(ObjectManager objManager, SWGObject obj, long buildingId, String cellName, Location l) {
+		SWGObject parent = objManager.getObjectById(buildingId);
+		if (parent == null || !(parent instanceof BuildingObject)) {
+			String err = String.format("Invalid parent! Either null or not a building: %s  BUID: %d", parent, buildingId);
+			Log.e("CharacterCreationService", err);
+			return err;
+		}
+		CellObject cell = ((BuildingObject) parent).getCellByName(cellName);
+		if (cell == null) {
+			String err = String.format("Invalid cell! Cell does not exist: %s  B-Template: %s  BUID: %d", cellName, parent.getTemplate(), buildingId);
+			Log.e("CharacterCreationService", err);
+			return err;
+		}
+		new ObjectTeleportIntent(obj, cell, l).broadcast();
+		return "Successfully teleported "+obj.getName()+" to "+buildingId+"/"+cellName+" "+l;
+	}
+	
 	private void displayHelp(Player player) {
 		String prompt = "The following are acceptable arguments that can be used as shortcuts to the various QA tools:\n" +
 				"item <template> -- Generates a new item and adds it to your inventory, not providing template parameter will display Item Creator window\n" +
diff --git a/src/resources/server_info/RelationalDatabase.java b/src/resources/server_info/RelationalDatabase.java
index 368a6a3e..b9204922 100644
--- a/src/resources/server_info/RelationalDatabase.java
+++ b/src/resources/server_info/RelationalDatabase.java
@@ -27,6 +27,7 @@
 ***********************************************************************************/
 package resources.server_info;
 
+import java.io.Closeable;
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
@@ -35,7 +36,7 @@ import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
 
-public abstract class RelationalDatabase {
+public abstract class RelationalDatabase implements Closeable {
 	
 	private DatabaseMetaData metaData;
 	private Connection connection;
@@ -108,13 +109,12 @@ public abstract class RelationalDatabase {
 		}
 	}
 	
-	public boolean close() {
+	public void close() {
 		try {
 			connection.close();
 			online = false;
-			return true;
 		} catch (SQLException e) {
-			return false;
+			e.printStackTrace();
 		}
 	}
 	
diff --git a/src/resources/server_info/RelationalServerData.java b/src/resources/server_info/RelationalServerData.java
index 47c49455..9fca1901 100644
--- a/src/resources/server_info/RelationalServerData.java
+++ b/src/resources/server_info/RelationalServerData.java
@@ -76,6 +76,54 @@ public class RelationalServerData extends RelationalDatabase {
 		return true;
 	}
 	
+	/**
+	 * Selects from the specified table with the supplied where clause, given
+	 * the supplied parameters
+	 * @param tables the tables to query, separated by commas
+	 * @param columns the columns to select, null to select all
+	 * @param where the where clause
+	 * @param params the parameters to put into the ?s in the where clause
+	 * @return the result set
+	 * @throws SQLException upon error
+	 */
+	public ResultSet selectFromTable(String tables, String [] columns, String where, Object ... params) throws SQLException {
+		String columnStr = "*";
+		if (columns == null && tables.contains(",")) {
+			StringBuilder bldr = new StringBuilder("");
+			for (String table : tables.split(",")) {
+				bldr.append(table.trim());
+				bldr.append(".*, ");
+			}
+			columnStr = bldr.substring(0, columnStr.length()-2);
+		} else if (columns != null) {
+			StringBuilder bldr = new StringBuilder("");
+			for (String column : columns) {
+				bldr.append(column);
+				bldr.append(", ");
+			}
+			columnStr = bldr.substring(0, bldr.length()-2);
+		}
+		final String sql = "SELECT " + columnStr + " FROM " + tables + " WHERE " + where;
+		PreparedStatement statement = prepareStatement(sql);
+		if (statement == null)
+			return null;
+		if (params != null) {
+			for (int i = 0; i < params.length; i++) {
+				if (params[i] instanceof Integer || params[i] instanceof Long)
+					statement.setLong(i+1, ((Number) params[i]).longValue());
+				else if (params[i] instanceof Float || params[i] instanceof Double)
+					statement.setDouble(i+1, ((Number) params[i]).doubleValue());
+				else if (params[i] instanceof String)
+					statement.setString(i+1, (String) params[i]);
+				else if (params[i] != null)
+					throw new IllegalArgumentException("Unknown object type: " + params[i].getClass().getSimpleName());
+				else
+					throw new NullPointerException("Parameters cannot have null elements!");
+			}
+		}
+		return statement.executeQuery();
+	}
+	
 	private long getLastImported(String table) {
 		synchronized (getTableMetadata) {
 			ResultSet set = null;
diff --git a/src/services/commands/CommandService.java b/src/services/commands/CommandService.java
index 5ef9b44c..85ab3dca 100644
--- a/src/services/commands/CommandService.java
+++ b/src/services/commands/CommandService.java
@@ -224,6 +224,7 @@ public class CommandService extends Service {
 		registerCallback("setPlayerAppearance", PlayerAppearanceCallback.class);
 		registerCallback("revertPlayerAppearance", RevertAppearanceCallback.class);
 		registerCallback("qatool", QaToolCmdCallback.class);
+		registerCallback("goto", GotoCmdCallback.class);
 	}
 	
 	private void clearCommands() {
diff --git a/src/services/faction/FactionService.java b/src/services/faction/FactionService.java
index 2b0b8d0e..c581572b 100644
--- a/src/services/faction/FactionService.java
+++ b/src/services/faction/FactionService.java
@@ -5,7 +5,6 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-import network.packets.Packet;
 import network.packets.swg.zone.UpdatePvpStatusMessage;
 import network.packets.swg.zone.chat.ChatSystemMessage;
 import network.packets.swg.zone.chat.ChatSystemMessage.SystemChatType;
diff --git a/src/services/objects/ObjectManager.java b/src/services/objects/ObjectManager.java
index bc00ea6d..d7bec8de 100644
--- a/src/services/objects/ObjectManager.java
+++ b/src/services/objects/ObjectManager.java
@@ -303,10 +303,16 @@ public class ObjectManager extends Manager {
 
 	private void processObjectTeleportIntent(ObjectTeleportIntent oti) {
 		SWGObject object = oti.getObject();
-		if (object instanceof CreatureObject && object.getOwner() != null){
-			objectAwareness.move(object, oti.getNewLocation());
-			sendPacket(object.getOwner(), new CmdStartScene(false, object.getObjectId(), ((CreatureObject)object).getRace(), object.getLocation(), (long)(ProjectSWG.getCoreTime()/1E3)));
-			object.createObject(object.getOwner());
+		if (object instanceof CreatureObject && object.getOwner() != null) {
+			Packet startScene = new CmdStartScene(false, object.getObjectId(), ((CreatureObject)object).getRace(), oti.getNewLocation(), (long)(ProjectSWG.getCoreTime()/1E3));
+			if (oti.getParent() != null) {
+				objectAwareness.move(object, oti.getParent(), oti.getNewLocation());
+				sendPacket(object.getOwner(), startScene);
+			} else {
+				objectAwareness.move(object, oti.getNewLocation());
+				sendPacket(object.getOwner(), startScene);
+				object.createObject(object.getOwner());
+			}
 			new PlayerEventIntent(object.getOwner(), PlayerEvent.PE_ZONE_IN).broadcast();
 		} else {
 			object.setLocation(oti.getNewLocation());
diff --git a/src/services/player/CharacterCreationService.java b/src/services/player/CharacterCreationService.java
index 717efb6f..f0b14fc9 100644
--- a/src/services/player/CharacterCreationService.java
+++ b/src/services/player/CharacterCreationService.java
@@ -195,25 +195,29 @@ public class CharacterCreationService extends Service {
 			err = ErrorMessage.SERVER_CHARACTER_CREATION_MAX_CHARS;
 		else if (!creationRestriction.isAbleToCreate(player))
 			err = ErrorMessage.NAME_DECLINED_TOO_FAST;
-		if (err == ErrorMessage.NAME_APPROVED) {
-			long characterId = createCharacter(objManager, player, create);
-			if (characterId == -1) {
-				err = ErrorMessage.NAME_DECLINED_INTERNAL_ERROR;
-			} else if (createCharacterInDb(characterId, create.getName(), player)) {
-				creationRestriction.createdCharacter(player);
-				System.out.println("[" + player.getUsername() + "] Create Character: " + create.getName() + ". IP: " + create.getAddress() + ":" + create.getPort());
-				Log.i("ZoneService", "%s created character %s from %s:%d", player.getUsername(), create.getName(), create.getAddress(), create.getPort());
-				sendPacket(player, new CreateCharacterSuccess(characterId));
-				new PlayerEventIntent(player, PlayerEvent.PE_CREATE_CHARACTER).broadcast();
-				return;
-			} else {
-				Log.e("ZoneService", "Failed to create character %s for user %s with server error from %s:%d", create.getName(), player.getUsername(), create.getAddress(), create.getPort());
-				objManager.deleteObject(characterId);
-			}
-		}
+		else if (err == ErrorMessage.NAME_APPROVED)
+			err = completeCharCreation(objManager, player, create);
 		sendCharCreationFailure(player, create, err);
 	}
 	
+	private ErrorMessage completeCharCreation(ObjectManager objManager, Player player, ClientCreateCharacter create) {
+		long characterId = createCharacter(objManager, player, create);
+		if (characterId == -1) {
+			return ErrorMessage.NAME_DECLINED_INTERNAL_ERROR;
+		} else if (createCharacterInDb(characterId, create.getName(), player)) {
+			creationRestriction.createdCharacter(player);
+			System.out.println("[" + player.getUsername() + "] Create Character: " + create.getName() + ". IP: " + create.getAddress() + ":" + create.getPort());
+			Log.i("ZoneService", "%s created character %s from %s:%d", player.getUsername(), create.getName(), create.getAddress(), create.getPort());
+			sendPacket(player, new CreateCharacterSuccess(characterId));
+			new PlayerEventIntent(player, PlayerEvent.PE_CREATE_CHARACTER).broadcast();
+			return ErrorMessage.NAME_APPROVED;
+		} else {
+			Log.e("ZoneService", "Failed to create character %s for user %s with server error from %s:%d", create.getName(), player.getUsername(), create.getAddress(), create.getPort());
+			objManager.deleteObject(characterId);
+			return ErrorMessage.NAME_DECLINED_INTERNAL_ERROR;
+		}
+	}
+	
 	private void sendCharCreationFailure(Player player, ClientCreateCharacter create, ErrorMessage err) {
 		NameFailureReason reason = NameFailureReason.NAME_SYNTAX;
 		switch (err) {
diff --git a/src/services/player/TerrainZoneInsertion.java b/src/services/player/TerrainZoneInsertion.java
index 9a8a1829..1a3a0098 100644
--- a/src/services/player/TerrainZoneInsertion.java
+++ b/src/services/player/TerrainZoneInsertion.java
@@ -27,7 +27,6 @@
 ***********************************************************************************/
 package services.player;
 
-import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 
@@ -38,33 +37,24 @@ import resources.server_info.RelationalServerFactory;
 
 public class TerrainZoneInsertion {
 	
-	private static final String GET_SPAWN_LOCATION_SQL = "SELECT player_spawns.*, buildings.object_id FROM player_spawns, buildings "
-			+ "WHERE (player_spawns.id = ?) AND (player_spawns.building_id = '' OR buildings.building_id = player_spawns.building_id)";
-	
 	private final RelationalServerData insertions;
-	private final PreparedStatement getSpawnLocation;
 	
 	public TerrainZoneInsertion() {
 		insertions = RelationalServerFactory.getServerData("player/player_spawns.db", "building/buildings", "player_spawns");
 		if (insertions == null)
 			throw new main.ProjectSWG.CoreException("Failed to load SDBs for TerrainZoneInsertion");
-		getSpawnLocation = insertions.prepareStatement(GET_SPAWN_LOCATION_SQL);
 	}
 	
 	public SpawnInformation generateSpawnLocation(String id) {
-		synchronized (getSpawnLocation) {
-			try {
-				getSpawnLocation.setString(1, id);
-				try (ResultSet set = getSpawnLocation.executeQuery()) {
-					if (!set.next())
-						return null;
-					String building = set.getString("building_id");
-					Location l = generateRandomLocation(Terrain.getTerrainFromName(set.getString("terrain")), set.getDouble("x"), set.getDouble("y"), set.getDouble("z"), set.getDouble("radius"));
-					return new SpawnInformation(!building.isEmpty(), l, set.getLong("object_id"), set.getString("cell"));
-				}
-			} catch (SQLException e) {
-				e.printStackTrace();
-			}
+		final String whereClause = "(player_spawns.id = ?) AND (player_spawns.building_id = '' OR buildings.building_id = player_spawns.building_id)";
+		try (ResultSet set = insertions.selectFromTable("player_spawns, buildings", new String[]{"player_spawns.*", "buildings.object_id"}, whereClause, id)) {
+			if (!set.next())
+				return null;
+			String building = set.getString("building_id");
+			Location l = generateRandomLocation(Terrain.getTerrainFromName(set.getString("terrain")), set.getDouble("x"), set.getDouble("y"), set.getDouble("z"), set.getDouble("radius"));
+			return new SpawnInformation(!building.isEmpty(), l, set.getLong("object_id"), set.getString("cell"));
+		} catch (SQLException e) {
+			e.printStackTrace();
 		}
 		return null;
 	}
diff --git a/src/services/spawn/SpawnerService.java b/src/services/spawn/SpawnerService.java
index a80c36c8..d05409d4 100644
--- a/src/services/spawn/SpawnerService.java
+++ b/src/services/spawn/SpawnerService.java
@@ -95,7 +95,8 @@ public final class SpawnerService extends Service {
 	
 	@Override
 	public boolean terminate() {
-		return super.terminate() && spawnerDatabase.close();
+		spawnerDatabase.close();
+		return super.terminate();
 	}
 	
 	private void loadSpawners() {