diff --git a/tfv/tfv.game_data b/gr-sim/tfv/tfv.game_data
similarity index 98%
rename from tfv/tfv.game_data
rename to gr-sim/tfv/tfv.game_data
index 2abbc70b..1c6982d9 100644
--- a/tfv/tfv.game_data
+++ b/gr-sim/tfv/tfv.game_data
@@ -32,6 +32,8 @@ TALBOT HALL
 		LET'S DISCUSS COOL THINGS IN THE LOUNGE
 		--> YES!
 		--> SORRY, NEED TO DO ENGINEERING HOMEWORK
+		*FOUR HOURS PASS*
+
 
 	PETE
 		YOUR JOURNEY MAY TAKE YOU TO DARKEST BEL AIR
@@ -172,3 +174,5 @@ OTHER IDEAS:
 	When return to college park with bird, automatically return
 		to stable (so can't take into desert where bird
 		looks awful)
+
+	Mirror-lake by Moria
diff --git a/gr-sim/tfv/tfv_defines.h b/gr-sim/tfv/tfv_defines.h
index 80ce005e..274ba2d4 100644
--- a/gr-sim/tfv/tfv_defines.h
+++ b/gr-sim/tfv/tfv_defines.h
@@ -40,6 +40,9 @@
 
 #define NOEXIT			255
 
+#define LOCATION_PLACE		0
+#define LOCATION_CONVERSATION	1
+
 struct location_type {
 	char *name;
 	int x0,x1,y0,y1;
diff --git a/gr-sim/tfv/tfv_mapinfo.h b/gr-sim/tfv/tfv_mapinfo.h
index 71db9fa7..1685c916 100644
--- a/gr-sim/tfv/tfv_mapinfo.h
+++ b/gr-sim/tfv/tfv_mapinfo.h
@@ -245,24 +245,28 @@ struct map_info_type map_info[33] = {
 			.x0 = 0,  .x1 = 10,
 			.y0 = 18, .y1 = 31,
 			.destination = TALBOT_HALL,
+			.type=LOCATION_PLACE,
 		},
 		.location[1] = {
 			.name="Dining Hall",
 			.x0 = 13, .x1 = 26,
 			.y0 = 10, .y1 = 24,
 			.destination = DINING_HALL,
+			.type=LOCATION_PLACE,
 		},
 		.location[2] = {
 			.name="Metro Station",
 			.x0 = 30, .x1 = 39,
 			.y0 = 10, .y1 = 39,
 			.destination = METRO_STATION,
+			.type=LOCATION_PLACE,
 		},
 		.location[3] = {
 			.name="Fountain",
 			.x0 = 14, .x1 = 29,
 			.y0 = 28, .y1 = 39,
 			.destination = FOUNTAIN,
+			.type=LOCATION_PLACE,
 		},
 	},
 	{	// 17: Waterfall
@@ -279,6 +283,42 @@ struct map_info_type map_info[33] = {
 		.scatter=SCATTER_NONE,
 		.land_type=LAND_BORING,
 		.background_image=talbot_rle,
+		.num_locations=5,
+		.location[0] = {
+			.name="Liz and Will",
+			.x0 = 8,  .x1 = 12,
+			.y0 = 22, .y1 = 38,
+			//.destination = TALBOT_HALL,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[1] = {
+			.name="Pete",
+			.x0 = 13,  .x1 = 19,
+			.y0 = 15, .y1 = 21,
+			//.destination = TALBOT_HALL,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[2] = {
+			.name="Kenjesu",
+			.x0 = 21,  .x1 = 26,
+			.y0 = 19, .y1 = 28,
+			//.destination = TALBOT_HALL,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[3] = {
+			.name="Mathemagician",
+			.x0 = 28,  .x1 = 34,
+			.y0 = 20, .y1 = 26,
+			//.destination = TALBOT_HALL,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[4] = {
+			.name="Darth Tater",
+			.x0 = 28,  .x1 = 36,
+			.y0 = 26, .y1 = 38,
+			//.destination = TALBOT_HALL,
+			.type=LOCATION_CONVERSATION,
+		},
 	},
 	{	// 19: Dining Hall
 		.name="Dining Hall",