diff --git a/gr-sim/tfv/Makefile b/gr-sim/tfv/Makefile
index e576d0a4..42116ca6 100644
--- a/gr-sim/tfv/Makefile
+++ b/gr-sim/tfv/Makefile
@@ -38,7 +38,9 @@ tfv_backgrounds.c:	$(PNG2RLE) \
 			$(ARTDIR)/metro.png \
 			$(ARTDIR)/talbot.png \
 			$(ARTDIR)/waterfall.png \
-			$(ARTDIR)/fountain.png
+			$(ARTDIR)/fountain.png \
+			$(ARTDIR)/jc.png \
+			$(ARTDIR)/jc_hallway.png
 	$(PNG2RLE) c $(ARTDIR)/title.png title_rle > tfv_backgrounds.c
 	$(PNG2RLE) c $(ARTDIR)/map.png map_rle >> tfv_backgrounds.c
 	$(PNG2RLE) c $(ARTDIR)/landing.png landing_rle >> tfv_backgrounds.c
@@ -53,6 +55,8 @@ tfv_backgrounds.c:	$(PNG2RLE) \
 	$(PNG2RLE) c $(ARTDIR)/talbot.png talbot_rle >> tfv_backgrounds.c
 	$(PNG2RLE) c $(ARTDIR)/waterfall.png waterfall_rle >> tfv_backgrounds.c
 	$(PNG2RLE) c $(ARTDIR)/fountain.png fountain_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/jc.png jc_rle >> tfv_backgrounds.c
+	$(PNG2RLE) c $(ARTDIR)/jc_hallway.png jc_hallway_rle >> tfv_backgrounds.c
 
 
 
diff --git a/gr-sim/tfv/tfv.game_data b/gr-sim/tfv/tfv.game_data
index b0092983..5cb45e33 100644
--- a/gr-sim/tfv/tfv.game_data
+++ b/gr-sim/tfv/tfv.game_data
@@ -96,6 +96,7 @@ JC
 		GUS	I FOUND THIS
 		RAISTLIN
 			THIS MAY AID YOU ON YOUR JOURNEY
+			AMIGA
 		FORD
 			557-0868 UTOPIA BBS IS REALLY GREAT
 
diff --git a/gr-sim/tfv/tfv_backgrounds.c b/gr-sim/tfv/tfv_backgrounds.c
index 1d1f704f..613922f6 100644
--- a/gr-sim/tfv/tfv_backgrounds.c
+++ b/gr-sim/tfv/tfv_backgrounds.c
@@ -198,15 +198,20 @@ unsigned char video_hr_rle[]={
 	0xEE,0x88,0xA4,0x07,0x88,0xA6,0x07,0x55,0x55,0xA4,0x07,
 	0x44,0xAD,0x07,0x77,0x77,0x87,0x00,0x30,0x3D,
 	0xDD,0x8E,0x08,0xA3,0x00,0x08,0xB8,0x08,
-	0xA5,0x00,0x55,0x55,0xA4,0x00,0x44,0xAD,0x00,0x77,0x08,
-	0x00,0x22,0x22,0x33,0x8D,0x08,0xA5,0x00,0xBB,
-	0xA6,0x00,0x55,0x55,0xA4,0x00,0x44,0xAD,0x00,0x08,0x00,
+	0xA5,0x00,0x55,0x55,0xA4,0x00,0x44,0xA9,0x00,0xB6,0xB6,0xE0,
+	0x00,0x77,0x08,0x00,0x22,0x22,0x33,0x8D,
+	0x08,0xA5,0x00,0xBB,0xA6,0x00,0x55,0x55,0xA4,0x00,0x44,
+	0xA8,0x00,0x0B,0xBB,0xBB,0xEE,0x00,0x08,0x00,
 	0x10,0x12,0x22,0x83,0x08,0xA6,0x00,0x08,0x08,
-	0xA4,0x00,0xA3,0x08,0xA3,0x00,0x08,0x08,0xAE,0x00,0x40,0x41,
-	0x11,0x82,0x08,0xA0,0x22,0x00,0x19,0x99,0x44,
-	0x11,0x88,0xA0,0x23,0x00,0x11,0x99,0x44,0x88,
-	0xA0,0x24,0x00,0x11,0x99,0x88,0xA0,0x25,0x00,0x11,0x88,
-	0xA0,0x26,0x00,0x88,0xA0,0x27,0x00,0xA1,	};
+	0xA4,0x00,0xA3,0x08,0xA3,0x00,0x08,0x08,0xA9,0x00,0x60,0x6B,
+	0x0E,0x00,0x00,0x40,0x41,0x11,0x82,0x08,
+	0xA0,0x19,0x00,0x78,0xA3,0x88,0x80,0xA3,0x66,0x00,0x19,
+	0x99,0x44,0x11,0x88,0xA0,0x1A,0x00,0x88,0x87,
+	0x78,0xA3,0x88,0x86,0x66,0x00,0x11,0x99,
+	0x44,0x88,0xA0,0x1B,0x00,0xA3,0x88,0x87,0x78,0x8B,
+	0x86,0x88,0x80,0x11,0x99,0x88,0xA0,0x1C,0x00,
+	0xA5,0x88,0x77,0xA3,0x87,0x11,0x88,0xA0,0x1D,0x00,0xA5,0x88,
+	0x77,0xA4,0x88,0xA0,0x1F,0x00,0x08,0xA3,0x88,0x77,0xA3,0x88,0xA1,	};
 unsigned char collegep_rle[]={
 	0x28, /* ysize=40 */
 	0xA0,0x21,0x66,0xF6,0xF6,0xA8,0x66,0xF6,0xF6,0xA3,0xFF,0xF6,0xA0,0x15,0x66,
@@ -506,3 +511,77 @@ unsigned char fountain_rle[]={
 	0xCD,0xA0,0x14,0xCC,0xC5,0x77,0x55,0x55,0x57,0xD5,0xD5,
 	0xAA,0xDD,0xCD,0xA0,0x17,0xCC,0xC5,0xC5,0xCD,0xAA,0xDD,0xCD,0xCD,
 	0xAA,0xCC,0xA1,	};
+unsigned char jc_rle[]={
+	0x28, /* ysize=40 */
+	0xA0,0x29,0x00,0x70,0x00,0x00,0xA7,0x85,0xA9,0x00,0x70,0xF7,
+	0x70,0xA3,0x00,0xA5,0x80,0xA3,0x00,0x0D,0xD0,0xA4,0x00,
+	0x07,0x7F,0x07,0x00,0xA7,0x88,0xAA,0x00,0x07,
+	0xA4,0x00,0x88,0x58,0x88,0x58,0x88,0xA4,0x00,
+	0xDD,0xA8,0x00,0xA7,0x88,0xAF,0x00,0x88,0x85,0x88,
+	0x85,0x88,0xA3,0x00,0x0D,0xA6,0x00,0x40,0x00,0x00,
+	0xA7,0x88,0xA5,0x00,0x40,0x44,0x40,0xA7,0x00,0x88,
+	0x58,0x88,0x58,0x88,0xA6,0x00,0x60,0xE6,
+	0x60,0x04,0x44,0x04,0x00,0xA7,0x88,0x55,
+	0xAD,0x85,0x55,0x88,0x85,0x88,0x85,0x88,
+	0xA7,0x00,0x06,0x00,0x04,0x84,0x04,0x00,
+	0xA7,0x88,0x55,0x88,0x00,0xA3,0x88,0x78,0xA5,0x88,
+	0x00,0x88,0x55,0x88,0x58,0x08,0x58,
+	0x88,0xA9,0x00,0x40,0x48,0x40,0x40,0xA7,0x48,0x45,
+	0x48,0x40,0x48,0x48,0xA3,0x45,0xA4,0x48,0x40,0x48,
+	0x45,0x48,0x48,0x00,0x88,0x88,0xA9,0x00,0xA0,0x1E,0x44,0x48,
+	0xA5,0x00,0x70,0x00,0x70,0x00,0xA0,0x20,0x44,0xA4,0x00,
+	0x77,0x00,0x77,0x00,0xA0,0x21,0x44,0xA3,0x00,0x07,
+	0x77,0x07,0x00,0xAF,0x44,0x04,0x04,0xA7,0x40,0x04,0x04,
+	0xA7,0x44,0x40,0xA3,0x00,0x77,0x00,0x00,0xAD,0x44,0x04,
+	0x40,0xA4,0x44,0xDD,0x44,0xDD,0x4D,0x4D,0x44,0x44,
+	0x40,0x04,0xA0,0x19,0x44,0x00,0xA3,0x44,0xD4,0x44,
+	0xDD,0x44,0xDD,0xA5,0x44,0x00,0xA0,0x1A,0x44,0x40,
+	0x04,0x04,0xA3,0x4D,0x44,0xA3,0x4D,0x04,0x04,0x40,0xA0,0x1E,0x44,
+	0xA7,0x40,0xA0,0xB0,0x44,0xA1,	};
+unsigned char jc_hallway_rle[]={
+	0x28, /* ysize=40 */
+	0xA3,0xDD,0x77,0xA3,0x00,0x77,0xA4,0xDD,0x77,0x88,
+	0x80,0x77,0x08,0x88,0x77,0x77,0x7D,0xA4,0xDD,
+	0xD4,0x44,0x41,0x44,0x11,0x44,0x11,
+	0x44,0x11,0x44,0x4D,0xA7,0xDD,0x77,0xA3,0x00,
+	0x77,0xA4,0xDD,0x77,0x88,0x88,0x77,0x88,0x80,
+	0x77,0x55,0x07,0x77,0x7D,0xA4,0xDD,0xD4,
+	0x44,0x41,0x44,0x11,0x44,0x11,0x44,
+	0x14,0x44,0x4D,0xA5,0xDD,0x77,0xA3,0x00,0x77,
+	0xA4,0xDD,0x77,0x88,0x68,0x77,0x88,0x88,0x77,
+	0x55,0x00,0x00,0x89,0x98,0x8D,0xA4,0xDD,0xD4,
+	0x44,0x41,0x14,0x11,0x44,0x11,0x44,
+	0x14,0x44,0x4D,0xA3,0xDD,0x77,0xA3,0x00,0x77,
+	0xA4,0xDD,0x77,0x88,0x8E,0x77,0x88,0x68,
+	0x77,0x55,0x00,0x00,0x88,0x88,0x89,0x78,0x8D,
+	0xA4,0xDD,0xD4,0x44,0x41,0x44,0x11,0x41,
+	0x11,0x44,0x14,0xA3,0xDD,0x77,0xA3,0x00,0x77,
+	0xA4,0xDD,0x77,0x88,0x88,0x77,0x88,0x8E,0x77,
+	0x55,0x00,0x00,0x88,0x80,0x08,0x77,0x89,
+	0x98,0x8D,0xA4,0xDD,0xD4,0x44,0x41,0x44,
+	0x11,0x44,0x11,0xA3,0xDD,0x77,0xA3,0x00,0x77,
+	0xA4,0xDD,0x77,0x88,0x88,0x77,0x88,0x88,0x77,0x55,
+	0x00,0x00,0xA3,0x88,0x77,0x88,0x88,0x89,0x78,0x7D,
+	0xA4,0xDD,0xD4,0x44,0x41,0x44,0x11,0xA4,0x07,
+	0xA3,0x00,0xA6,0x07,0x78,0x88,0x77,0x88,0x88,0x77,
+	0x55,0x00,0x00,0xA3,0x88,0x77,0x88,0x80,0x08,
+	0x77,0x57,0x77,0x7D,0xA4,0xDD,0xD4,0x44,
+	0x41,0xAE,0x00,0x07,0x77,0x88,0x88,0x77,0x55,
+	0x00,0x00,0x88,0x88,0xE6,0x77,0xA3,0x88,0x77,0x55,
+	0x00,0x07,0x77,0x8D,0xA4,0xDD,0xD4,0xA0,0x10,0x00,
+	0x07,0x78,0x77,0x55,0x00,0x00,0xA3,0x88,0x77,
+	0xA3,0x88,0x77,0x55,0x00,0x00,0x88,0x89,0x98,
+	0x8D,0xA3,0xDD,0xA0,0x12,0x00,0x07,0xA3,0x00,0xA3,0x88,0x77,
+	0x88,0x88,0xE6,0x77,0x55,0x00,0x00,0xA3,0x88,0x89,
+	0x78,0x8D,0xDD,0xA0,0x16,0x00,0xA3,0x88,0x77,0xA3,0x88,
+	0x77,0x55,0x00,0x00,0x88,0x88,0x80,0x08,0x77,
+	0x89,0x98,0xA0,0x16,0x00,0x07,0x78,0x88,0x77,
+	0xA3,0x88,0x77,0x55,0x00,0x00,0xA4,0x88,0x77,0x88,0x88,
+	0xA0,0x18,0x00,0x07,0x77,0xA3,0x88,0x77,0x55,0x00,0x00,
+	0xA4,0x88,0x77,0x88,0x80,0xA0,0x1A,0x00,0x07,0x78,
+	0x88,0x77,0x55,0x00,0x00,0xA3,0x88,0xE6,0x77,
+	0x88,0x88,0xA0,0x1C,0x00,0x07,0x77,0x05,0x00,0x00,0xA4,0x88,
+	0x77,0x88,0x88,0xA0,0x21,0x00,0xA4,0x88,0x77,0x88,0x88,0xA0,0x21,0x00,
+	0x78,0xA3,0x88,0x77,0x88,0x88,0xA0,0x22,0x00,0x07,0x78,
+	0x88,0x77,0x88,0x88,0xA0,0x24,0x00,0x07,0x77,0x88,0x88,
+	0xA0,0x26,0x00,0x07,0x78,0xA1,	};
diff --git a/gr-sim/tfv/tfv_backgrounds.h b/gr-sim/tfv/tfv_backgrounds.h
index 13a105a8..f102a4da 100644
--- a/gr-sim/tfv/tfv_backgrounds.h
+++ b/gr-sim/tfv/tfv_backgrounds.h
@@ -10,3 +10,7 @@ extern unsigned char dining_rle[];
 extern unsigned char waterfall_rle[];
 extern unsigned char fountain_rle[];
 extern unsigned char belair_rle[];
+extern unsigned char jc_rle[];
+extern unsigned char jc_hallway_rle[];
+extern unsigned char math_office_rle[];
+extern unsigned char video_hr_rle[];
diff --git a/gr-sim/tfv/tfv_defines.h b/gr-sim/tfv/tfv_defines.h
index 9396af60..a02939ab 100644
--- a/gr-sim/tfv/tfv_defines.h
+++ b/gr-sim/tfv/tfv_defines.h
@@ -30,18 +30,19 @@
 //#define MINIGOLF		25
 #define JOHN_CARROLL		23
 
+#define JC_UPSTAIRS		24
+#define JC_DOWNSTAIRS		25
+#define JC_OFFICE		26
+
 // UPSTAIRS
-#define VIDEO_HOMEROOM		24
-#define DEUTSCH			26
-#define HOMEROOM		27
+#define VIDEO_HOMEROOM		27
+#define DEUTSCH			28
+#define HOMEROOM		29
 
 // DOWNSTAIRS
-#define AP_CALCULUS		25
-#define MATH_OFFICE		28
-#define PATRIOT_ROOM		29
-
-// OFFICE
-#define MAIN_OFFICE		30
+#define AP_CALCULUS		30
+#define MATH_OFFICE		31
+#define PATRIOT_ROOM		32
 
 #define NOEXIT			255
 
@@ -76,7 +77,7 @@ struct map_info_type {
 	char *name;
 	int land_type;
 	int num_locations;
-	struct location_type location[6];
+	struct location_type location[5];
 	int ground_color;
 	int n_exit,s_exit,e_exit,w_exit;
 	int miny;
diff --git a/gr-sim/tfv/tfv_mapinfo.h b/gr-sim/tfv/tfv_mapinfo.h
index a2bdbcc8..b3221fee 100644
--- a/gr-sim/tfv/tfv_mapinfo.h
+++ b/gr-sim/tfv/tfv_mapinfo.h
@@ -467,30 +467,188 @@ struct map_info_type map_info[33] = {
 		},
 		.location[3] = {
 			.name="Minigolf",
-			.x0 = 34, .x1 = 39,
+			.x0 = 32, .x1 = 39,
 			.y0 = 27, .y1 = 35,
 			.type=LOCATION_CONVERSATION,
 		},
 	},
+	[JOHN_CARROLL]={	// 23: John Carroll
+		.name="JC School",
+		.ground_color=(COLOR_DARKGREEN|(COLOR_DARKGREEN<<4)),
+		.n_exit=NOEXIT,
+		.s_exit=BEL_AIR,
+		.e_exit=NOEXIT,
+		.w_exit=NOEXIT,
+		.miny=4,
+		.scatter=SCATTER_NONE,
+		.background_image=jc_rle,
+		.num_locations=3,
+		.location[0] = {
+			.name="Main Office",
+			.x0 = 12, .x1 = 15,
+			.y0 = 10,  .y1 = 22,
+			.destination=JC_OFFICE,
+			.type=LOCATION_PLACE,
+		},
+		.location[1] = {
+			.name="Upstairs",
+			.x0 = 21, .x1 = 25,
+			.y0 = 10, .y1 = 22,
+			.destination=JC_UPSTAIRS,
+			.type=LOCATION_PLACE,
+		},
+		.location[2] = {
+			.name="Downstairs",
+			.x0 = 26, .x1 = 31,
+			.y0 = 10, .y1 = 24,
+			.destination=JC_DOWNSTAIRS,
+			.type=LOCATION_PLACE,
+		},
+	},
+	[JC_UPSTAIRS]={	// 24: JC_UPSTAIRS
+		.name="JC Upstairs",
+		.ground_color=(COLOR_BLACK|(COLOR_BLACK<<4)),
+		.n_exit=NOEXIT,
+		.s_exit=JOHN_CARROLL,
+		.e_exit=NOEXIT,
+		.w_exit=JOHN_CARROLL,
+		.miny=4,
+		.scatter=SCATTER_NONE,
+		.background_image=jc_hallway_rle,
+		.num_locations=3,
+		.location[0] = {
+			.name="Video Homeroom",
+			.x0 = 2, .x1 = 9,
+			.y0 = 10,  .y1 = 18,
+			.destination=VIDEO_HOMEROOM,
+			.type=LOCATION_PLACE,
+		},
+		.location[1] = {
+			.name="Homeroom 12E",
+			.x0 = 18, .x1 = 24,
+			.y0 = 14, .y1 = 25,
+			.destination=HOMEROOM,
+			.type=LOCATION_PLACE,
+		},
+		.location[2] = {
+			.name="Deutsch Klasse",
+			.x0 = 27, .x1 = 34,
+			.y0 = 23, .y1 = 35,
+			.destination=DEUTSCH,
+			.type=LOCATION_PLACE,
+		},
+	},
+	[JC_DOWNSTAIRS]={	// 25: JC_DOWNSTAIRS
+		.name="JC Downstairs",
+		.ground_color=(COLOR_BLACK|(COLOR_BLACK<<4)),
+		.n_exit=NOEXIT,
+		.s_exit=JOHN_CARROLL,
+		.e_exit=NOEXIT,
+		.w_exit=JOHN_CARROLL,
+		.miny=4,
+		.scatter=SCATTER_NONE,
+		.background_image=jc_hallway_rle,
+		.num_locations=3,
+		.location[0] = {
+			.name="Patriot Room",
+			.x0 = 2, .x1 = 9,
+			.y0 = 10,  .y1 = 18,
+			.destination=PATRIOT_ROOM,
+			.type=LOCATION_PLACE,
+		},
+		.location[1] = {
+			.name="AP Calculus",
+			.x0 = 18, .x1 = 24,
+			.y0 = 14, .y1 = 25,
+			.destination=AP_CALCULUS,
+			.type=LOCATION_PLACE,
+		},
+		.location[2] = {
+			.name="Math Office",
+			.x0 = 27, .x1 = 34,
+			.y0 = 23, .y1 = 35,
+			.destination=MATH_OFFICE,
+			.type=LOCATION_PLACE,
+		},
+	},
+	[VIDEO_HOMEROOM]={	// 27: VIDEO_HOMEROOM
+		.name="Video Homeroom",
+		.ground_color=(COLOR_BLACK|(COLOR_BLACK<<4)),
+		.n_exit=NOEXIT,
+		.s_exit=JC_UPSTAIRS,
+		.e_exit=NOEXIT,
+		.w_exit=NOEXIT,
+		.miny=4,
+		.scatter=SCATTER_NONE,
+		.background_image=video_hr_rle,
+		.num_locations=3,
+		.location[0] = {
+			.name="Gus",
+			.x0 = 10, .x1 = 16,
+			.y0 = 22,  .y1 = 30,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[1] = {
+			.name="Raistlin",
+			.x0 = 17, .x1 = 22,
+			.y0 = 22, .y1 = 30,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[2] = {
+			.name="Ford",
+			.x0 = 23, .x1 = 28,
+			.y0 = 22, .y1 = 30,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[3] = {
+			.name="Sister Scarynun",
+			.x0 = 22, .x1 = 28,
+			.y0 = 21, .y1 = 34,
+			.type=LOCATION_CONVERSATION,
+		},
+	},
+	[MATH_OFFICE]={	// 31: MATH_OFFICE
+		.name="Math Office",
+		.ground_color=(COLOR_BLACK|(COLOR_BLACK<<4)),
+		.n_exit=NOEXIT,
+		.s_exit=JC_DOWNSTAIRS,
+		.e_exit=NOEXIT,
+		.w_exit=NOEXIT,
+		.miny=4,
+		.scatter=SCATTER_NONE,
+		.background_image=math_office_rle,
+		.num_locations=3,
+		.location[0] = {
+			.name="Rachael YRBK",
+			.x0 = 0, .x1 = 8,
+			.y0 = 21,  .y1 = 34,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[1] = {
+			.name="Brighid",
+			.x0 = 10, .x1 = 15,
+			.y0 = 21, .y1 = 34,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[2] = {
+			.name="Captain Steve",
+			.x0 = 15, .x1 = 22,
+			.y0 = 21, .y1 = 34,
+			.type=LOCATION_CONVERSATION,
+		},
+		.location[3] = {
+			.name="Mree",
+			.x0 = 22, .x1 = 28,
+			.y0 = 21, .y1 = 34,
+			.type=LOCATION_CONVERSATION,
+		},
+	},
+
 
 };
 
 #if 0
 
-	jc_rle:
-		"VIDEO HOMEROOM"
-		"AP CALCULUS, TEAM I-1"
-		"DEUTSCH"
-		"HOMEROOM"
-		"MATH OFFICE"
-		"PATRIOT ROOM"
-
-	math_office_rle:
-		"CAPTAIN STEVE",
-		"BRIGHID",
-		"RACHAEL YRBK",
-		"MREE",
-
 	video_hr_rle:
 		"GUS",
 		"RAISTLIN",
@@ -498,6 +656,7 @@ struct map_info_type map_info[33] = {
 		"SISTER SCARYNUN",
 
 	calculs_rle:
+		team I-1
 		PADRINO
 		JENNI
 		MR. APPLEBY
diff --git a/tfv/art/jc.png b/tfv/art/jc.png
new file mode 100644
index 00000000..682f1378
Binary files /dev/null and b/tfv/art/jc.png differ
diff --git a/tfv/art/jc_hallway.png b/tfv/art/jc_hallway.png
new file mode 100644
index 00000000..40f98d05
Binary files /dev/null and b/tfv/art/jc_hallway.png differ
diff --git a/tfv/art/video_hr.png b/tfv/art/video_hr.png
index c7f2af0c..7c04d1af 100644
Binary files a/tfv/art/video_hr.png and b/tfv/art/video_hr.png differ