diff --git a/gr-sim/tfv/tfv_mapinfo.h b/gr-sim/tfv/tfv_mapinfo.h
index e47bc2c7..c4c77987 100644
--- a/gr-sim/tfv/tfv_mapinfo.h
+++ b/gr-sim/tfv/tfv_mapinfo.h
@@ -82,59 +82,109 @@ struct map_info_type map_info[16] = {
 	{
 		.name="North Mountain",
 		.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
+		.n_exit=ARCTIC_MOUNTAINS,
+		.s_exit=MORIA,
+		.e_exit=NORTH_FOREST,
+		.w_exit=LANDING_SITE,
+		.miny=0,
 		.land_type=LAND_MOUNTAIN,
 		.background_image=NULL,
 	},
 	{
 		.name="North Forest",
 		.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
+		.n_exit=HARFORD_COUNTY,
+		.s_exit=SOUTH_FOREST,
+		.e_exit=NOEXIT,
+		.w_exit=NORTH_MOUNTAIN,
+		.miny=0,
 		.land_type=LAND_FOREST|LAND_RIGHT_BEACH,
 		.background_image=NULL,
 	},
 	{
 		.name="Palm Beach",
 		.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
+		.n_exit=PINE_BEACH,
+		.s_exit=SOUTH_BEACH,
+		.e_exit=GRASSLAND,
+		.w_exit=NOEXIT,
+		.miny=0,
 		.land_type=LAND_LEFT_BEACH,
 		.background_image=NULL,
 	},
 	{
 		.name="Grassland",
 		.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
+		.n_exit=LANDING_SITE,
+		.s_exit=CACTUS_RANCH,
+		.e_exit=MORIA,
+		.w_exit=PALM_BEACH,
+		.miny=0,
 		.land_type=LAND_GRASSLAND,
 		.background_image=NULL,
 	},
 	{
-		.name="Moria",
+		.name="Khazad-dum",
 		.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
+		.n_exit=NORTH_MOUNTAIN,
+		.s_exit=COLLEGE_PARK,
+		.e_exit=SOUTH_FOREST,
+		.w_exit=GRASSLAND,
+		.miny=0,
 		.land_type=LAND_MOUNTAIN,
 		.background_image=NULL,
 	},
 	{
 		.name="South Forest",
 		.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
+		.n_exit=NORTH_FOREST,
+		.s_exit=OCEAN_CITY,
+		.e_exit=NOEXIT,
+		.w_exit=MORIA,
+		.miny=0,
 		.land_type=LAND_FOREST|LAND_RIGHT_BEACH,
 		.background_image=NULL,
 	},
 	{
 		.name="South Beach",
 		.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
+		.n_exit=PALM_BEACH,
+		.s_exit=NOEXIT,
+		.e_exit=CACTUS_RANCH,
+		.w_exit=NOEXIT,
+		.miny=0,
 		.land_type=LAND_LEFT_BEACH|LAND_SOUTHSHORE,
 		.background_image=NULL,
 	},
 	{
 		.name="Cactus Ranch",
 		.ground_color=(COLOR_ORANGE|(COLOR_ORANGE<<4)),
+		.n_exit=GRASSLAND,
+		.s_exit=NOEXIT,
+		.e_exit=COLLEGE_PARK,
+		.w_exit=SOUTH_BEACH,
+		.miny=0,
 		.land_type=LAND_GRASSLAND|LAND_SOUTHSHORE,
 		.background_image=NULL,
 	},
 	{
 		.name="College Park",
 		.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
+		.n_exit=MORIA,
+		.s_exit=NOEXIT,
+		.e_exit=OCEAN_CITY,
+		.w_exit=CACTUS_RANCH,
+		.miny=0,
 		.background_image=collegep_rle,
 	},
 	{
 		.name="Ocean City",
 		.ground_color=(COLOR_LIGHTGREEN|(COLOR_LIGHTGREEN<<4)),
+		.n_exit=SOUTH_FOREST,
+		.s_exit=NOEXIT,
+		.e_exit=NOEXIT,
+		.w_exit=COLLEGE_PARK,
+		.miny=0,
 		.land_type=LAND_RIGHT_BEACH|LAND_SOUTHSHORE,
 		.background_image=NULL,
 	},
diff --git a/gr-sim/tfv/tfv_worldmap.c b/gr-sim/tfv/tfv_worldmap.c
index dc06189f..80da2a6a 100644
--- a/gr-sim/tfv/tfv_worldmap.c
+++ b/gr-sim/tfv/tfv_worldmap.c
@@ -220,34 +220,39 @@ int world_map(void) {
 			odd=!odd;
 			steps++;
 
-//			if (collision(newx,newy+10,ground_color)) {
-//			}
-//			else {
+			if (newx>36) {
+				if (map_info[map_location].e_exit!=NOEXIT) {
+					map_location=map_info[map_location].e_exit;
+					tfv_x=0;
+					refresh=1;
+				}
+			}
+			else if (newx<=0) {
+				if (map_info[map_location].w_exit!=NOEXIT) {
+					map_location=map_info[map_location].w_exit;
+					tfv_x=35;
+					refresh=1;
+				}
+			}
+			else if (newy<4) {
+				if (map_info[map_location].n_exit!=NOEXIT) {
+					map_location=map_info[map_location].n_exit;
+					tfv_y=28;
+					refresh=1;
+				}
+			}
+			else if (newy>=28) {
+				if (map_info[map_location].s_exit!=NOEXIT) {
+					map_location=map_info[map_location].s_exit;
+					tfv_y=4;
+					refresh=1;
+				}
+			}
+			else {
 				tfv_x=newx;
 				tfv_y=newy;
-//			}
-
-			if (tfv_x>36) {
-				map_location++;
-				tfv_x=0;
-				refresh=1;
-			}
-			else if (tfv_x<=0) {
-				map_location--;
-				tfv_x=35;
-				refresh=1;
 			}
 
-			if ((tfv_y<4) && (map_location>=4)) {
-				map_location-=4;
-				tfv_y=28;
-				refresh=1;
-			}
-			else if (tfv_y>=28) {
-				map_location+=4;
-				tfv_y=4;
-				refresh=1;
-			}
 		}
 
 		if (refresh) {
diff --git a/tfv/tfv.game_data b/tfv/tfv.game_data
index ccbf1e82..2abbc70b 100644
--- a/tfv/tfv.game_data
+++ b/tfv/tfv.game_data
@@ -164,3 +164,11 @@ Then RK attack
 
 OTHER IDEAS:
 	Fountain in college park?  Look at eclipse?  Mermaids?
+
+	Visit waterfall?
+
+	Guinea Pig and Goat Farm?
+
+	When return to college park with bird, automatically return
+		to stable (so can't take into desert where bird
+		looks awful)