diff --git a/server/characters/character_api.cpp b/server/characters/character_api.cpp
index 2873c27..ead28ac 100644
--- a/server/characters/character_api.cpp
+++ b/server/characters/character_api.cpp
@@ -28,50 +28,42 @@
 #include "server_utilities.hpp"
 
 #include <stdexcept>
-
+#include <iostream>
 static int setRoom(lua_State* L) {
-	//reverse engineer the character index
-	int characterIndex = -1;
+	//variables
 	CharacterData* character = static_cast<CharacterData*>(lua_touserdata(L, 1));
 	CharacterManager& characterMgr = CharacterManager::GetSingleton();
 
-	for (auto& it : *characterMgr.GetContainer()) {
-		if (character == &it.second) {
-			characterIndex = it.first;
-			break;
-		}
-	}
-
 	//error checking
-	if (characterIndex == -1) {
-		throw(std::runtime_error("Lua Error: Failed to find character index by reference"));
+	if (characterMgr.Find(character->GetIndex()) != character) {
+		throw(std::runtime_error("Lua Error: Failed to verify character index by reference"));
 	}
 
 	//get the room index, depending on the parameter type
 	int roomIndex = -1;
-	RoomManager& roomMgr = RoomManager::GetSingleton();
 	switch(lua_type(L, 2)) {
 		case LUA_TNUMBER:
+			//simple integer
 			roomIndex = lua_tointeger(L, 2);
 		break;
-		case LUA_TLIGHTUSERDATA:
-			//reverse engineer the room index
-			for (auto& it : *roomMgr.GetContainer()) {
-				if (lua_touserdata(L, 2) == &it.second) {
-					roomIndex = it.first;
-					break;
-				}
-			}
-		break;
-	}
+		case LUA_TLIGHTUSERDATA: {
+			//check that this is a room first
+			RoomData* room = static_cast<RoomData*>(lua_touserdata(L, 2));
+			RoomManager& roomMgr = RoomManager::GetSingleton();
 
-	//error checking
-	if (roomIndex == -1) {
-		throw(std::runtime_error("Lua Error: Failed to find room index by reference"));
+			if (roomMgr.Find(room->GetRoomIndex()) != room) {
+				std::cout << room->GetRoomIndex() << std::endl;
+				throw(std::runtime_error("Lua Error: Failed to verify room index by reference"));
+			}
+			roomIndex = room->GetRoomIndex();
+		}
+		break;
+		default:
+			throw(std::runtime_error("Lua Error: Failed to find room index by reference"));
 	}
 
 	//send the delete & create messages
-	pumpAndChangeRooms(character, roomIndex, characterIndex);
+	pumpAndChangeRooms(character, roomIndex, character->GetIndex());
 	return 0;
 }
 
diff --git a/server/characters/character_data.cpp b/server/characters/character_data.cpp
index ef462d9..9b32090 100644
--- a/server/characters/character_data.cpp
+++ b/server/characters/character_data.cpp
@@ -30,6 +30,10 @@ CharacterData::CharacterData(): Entity("character") {
 	});
 }
 
+int CharacterData::GetIndex() {
+	return index;
+}
+
 int CharacterData::GetOwner() {
 	return owner;
 }
diff --git a/server/characters/character_data.hpp b/server/characters/character_data.hpp
index d0c0f0a..099fd1e 100644
--- a/server/characters/character_data.hpp
+++ b/server/characters/character_data.hpp
@@ -36,6 +36,7 @@ public:
 	~CharacterData() = default;
 
 	//database stuff
+	int GetIndex();
 	int GetOwner();
 	std::string GetHandle();
 	std::string GetAvatar();
@@ -44,6 +45,7 @@ public:
 private:
 	friend class CharacterManager;
 
+	int index = -1;
 	int owner = -1;
 	std::string handle;
 	std::string avatar;
diff --git a/server/characters/character_manager.cpp b/server/characters/character_manager.cpp
index 39d8267..902c1da 100644
--- a/server/characters/character_manager.cpp
+++ b/server/characters/character_manager.cpp
@@ -141,6 +141,7 @@ int CharacterManager::Load(int owner, std::string handle, std::string avatar) {
 		CharacterData& newChar = elementMap[uid];
 
 		//metadata
+		newChar.index = uid;
 		newChar.owner = owner;
 		newChar.handle = reinterpret_cast<const char*>(sqlite3_column_text(statement, 2));
 		newChar.avatar = reinterpret_cast<const char*>(sqlite3_column_text(statement, 3));
diff --git a/server/rooms/room_data.hpp b/server/rooms/room_data.hpp
index d6b0494..bffbc18 100644
--- a/server/rooms/room_data.hpp
+++ b/server/rooms/room_data.hpp
@@ -89,7 +89,7 @@ private:
 	std::string tilesetName;
 
 	//members
-	int roomIndex = 0; //NOTE: What's this doing here?
+	int roomIndex = 0;
 	BarrierManager barrierMgr;
 	std::list<CharacterData*> characterList;
 	BattleManager battleMgr;