diff --git a/gr-sim/tfv/tfv_dialog.h b/gr-sim/tfv/tfv_dialog.h
index ad997310..0bf79fab 100644
--- a/gr-sim/tfv/tfv_dialog.h
+++ b/gr-sim/tfv/tfv_dialog.h
@@ -1,14 +1,21 @@
 #define ACTION_NONE	0
-#define ACTION_ITEM	1
-#define ACTION_TIME	2
+#define ACTION_ITEM1	1
+#define ACTION_ITEM2	2
+#define ACTION_ITEM3	3
+#define ACTION_TIME	4
 
 
-#define DIALOG_LIZ_WILL	0
+#define DIALOG_LIZ_WILL		0
+#define DIALOG_PETE		1
+#define DIALOG_KENJESU		2
+#define DIALOG_MATHEMAGICIAN	3
+#define DIALOG_DARTH_TATER	4
 
 struct dialog_words {
 	char *words;
 	int next;
 	int action;
+	int item;
 };
 
 struct dialog_type {
@@ -28,21 +35,29 @@ struct dialog_type dialog[100]={
 		/* FOUR HOURS PASS */
 		.statement[2].action=ACTION_TIME,
 	},
-
+	[DIALOG_PETE] = {
+		.statement[0].words="Your journey may take you to darkest Bel Air.",
+		.statement[0].next=1,
+		.statement[1].words="PLOT!",
+		.statement[1].next=1,
+	},
+	[DIALOG_KENJESU] = {
+		.statement[0].words="Have you found your lost guinea pig?",
+		.statement[0].next=0,
+	},
+	[DIALOG_MATHEMAGICIAN] = {
+		.statement[0].words="Have you tried finding the eigenvalues?",
+		.statement[0].next=0,
+	},
+	[DIALOG_DARTH_TATER] = {
+		.statement[0].words="In Talbot 0101B",
+		.statement[0].next=1,
+		.statement[1].words="There lived a big giant bee",
+		.statement[1].next=2,
+		.statement[2].action=ACTION_ITEM2,
+		.statement[2].item=ITEM_5K_RESISTOR,
+	},
 #if 0
-
-
-	PETE
-		YOUR JOURNEY MAY TAKE YOU TO DARKEST BEL AIR
-		PLOT!
-	KENJESU
-		HAVE YOU FOUND YOUR LOST GUINEA PIG
-	MATHEMAGICIAN
-		HAVE YOU TRIED FINDING THE EIGENVALUES
-	DARTH TATER
-		IN TALBOT 0101B
-		THERE LIVED A BIG GIANT BEE
-
 DINING HALL
 	OSCAR
 		BEWARE THE KILLER CRABS
diff --git a/gr-sim/tfv/tfv_mapinfo.h b/gr-sim/tfv/tfv_mapinfo.h
index 2aece1a1..214d1b9f 100644
--- a/gr-sim/tfv/tfv_mapinfo.h
+++ b/gr-sim/tfv/tfv_mapinfo.h
@@ -337,35 +337,35 @@ struct map_info_type map_info[34] = {
 			.name="Liz and Will",
 			.x0 = 8,  .x1 = 12,
 			.y0 = 22, .y1 = 38,
-			//.destination = TALBOT_HALL,
+			.destination = DIALOG_LIZ_WILL,
 			.type=LOCATION_CONVERSATION,
 		},
 		.location[1] = {
 			.name="Pete",
 			.x0 = 13,  .x1 = 19,
 			.y0 = 15, .y1 = 21,
-			//.destination = TALBOT_HALL,
+			.destination = DIALOG_PETE,
 			.type=LOCATION_CONVERSATION,
 		},
 		.location[2] = {
 			.name="Kenjesu",
 			.x0 = 21,  .x1 = 26,
 			.y0 = 19, .y1 = 28,
-			//.destination = TALBOT_HALL,
+			.destination = DIALOG_KENJESU,
 			.type=LOCATION_CONVERSATION,
 		},
 		.location[3] = {
 			.name="Mathemagician",
 			.x0 = 28,  .x1 = 34,
 			.y0 = 20, .y1 = 28,
-			//.destination = TALBOT_HALL,
+			.destination = DIALOG_MATHEMAGICIAN,
 			.type=LOCATION_CONVERSATION,
 		},
 		.location[4] = {
 			.name="Darth Tater",
 			.x0 = 28,  .x1 = 36,
 			.y0 = 30, .y1 = 38,
-			//.destination = TALBOT_HALL,
+			.destination = DIALOG_DARTH_TATER,
 			.type=LOCATION_CONVERSATION,
 		},
 	},
diff --git a/gr-sim/tfv/tfv_worldmap.c b/gr-sim/tfv/tfv_worldmap.c
index 35ed2efa..cc700605 100644
--- a/gr-sim/tfv/tfv_worldmap.c
+++ b/gr-sim/tfv/tfv_worldmap.c
@@ -11,9 +11,12 @@
 #include "tfv_sprites.h"
 #include "tfv_backgrounds.h"
 
+#include "tfv_items.h"
+#include "tfv_dialog.h"
+
 #include "tfv_mapinfo.h"
 
-#include "tfv_dialog.h"
+
 
 unsigned char map_location=LANDING_SITE;