diff --git a/game.jim b/game.jim
index 846c6cf..3a6b8b0 100755
Binary files a/game.jim and b/game.jim differ
diff --git a/map.jim b/map.jim
index 71c915f..461060d 100755
Binary files a/map.jim and b/map.jim differ
diff --git a/map.jor b/map.jor
index b92e0f5..fb8c1e4 100755
--- a/map.jor
+++ b/map.jor
@@ -30,6 +30,8 @@ array tileflags
 ( countertop ) 0 b,
 ( sink )       0 b,
 ( house )      0 b,
+( fence )      0 b,
+( storefront ) 0 b,
 
 here tileflags - 1 - const MAXTILE
 
diff --git a/pete.jim b/pete.jim
index e2d70ab..9545ee1 100755
Binary files a/pete.jim and b/pete.jim differ
diff --git a/pete.jor b/pete.jor
index 17e92f0..b9eccba 100755
--- a/pete.jor
+++ b/pete.jor
@@ -3,27 +3,35 @@
 13 8 N ' {car} defentity car
 
 car :touch
+  player move-entity
   1 player.state DRIVING f!
-  car entity>pos player entity.pos!
 ;entity
 
 :noname
- :| player yield
-     player.driving? not if car yield then
-     0 |; ' entities redefine
+:| player yield
+   player.driving? not if car yield then
+   0 |; ' entities redefine
 
- :| touch-begin S leaving? dup
-      if player.driving? not
-	if   pete say" It's too far to walk to town."
-	else 5 10 road.jor queue-level
-	then
-      then
-    touch-next 13 8 2= player.driving? and dup
-      if 0 player.state DRIVING f!
-	 12 8 tile>world player entity.pos!
-      then
-    touch-next 12 7 2= player.driving? not and dup
-      if 16 9 petehous.jor queue-level then
-    touch-last |; ' player-touch redefine
-  s" pete.map" load-map
+ :|
+touch-begin S leaving? dup
+  if player.driving? not
+    if   pete say" It's too far to walk to town."
+    else player move-entity 5 10 road.jor queue-level
+    then
+  then
+touch-next 13 8 2= player.driving? and dup
+  if player move-entity
+    0 player.state DRIVING f!
+    W player entity.dir !
+    player move-entity
+  then
+touch-next 12 7 2= player.driving? not and dup
+  if player move-entity 16 9 petehous.jor queue-level then
+touch-next 30 7 2= dup
+  if pete say" It's... kinda swampy.\I don't wanna get wet if I\don't have to." then
+touch-next 30 9 2= dup
+  if pete say" Feels spooky over here,\somehow." then
+touch-last |; ' player-touch redefine
+
+s" pete.map" load-map
 ; ' onload redefine
diff --git a/petehous.jim b/petehous.jim
index 89ca4a6..320c43b 100755
Binary files a/petehous.jim and b/petehous.jim differ
diff --git a/petehous.jor b/petehous.jor
index 7a94fc7..8cc1bf6 100755
--- a/petehous.jor
+++ b/petehous.jor
@@ -4,7 +4,7 @@
   reset-level
   :|
 touch-begin 16 10 2= dup if
-  12 8 pete.jor queue-level
+  player move-entity 12 8 pete.jor queue-level
 then touch-next 9 4 2= dup if
   pete say" The closet is a disaster.\I don't want to deal with that\right now."
 then touch-next 11 4 2= dup if
diff --git a/road.jim b/road.jim
index 0afbdd8..d79a256 100755
Binary files a/road.jim and b/road.jim differ
diff --git a/road.jor b/road.jor
index 687d93d..32f0722 100755
--- a/road.jor
+++ b/road.jor
@@ -8,11 +8,19 @@
 touch-begin E leaving? dup
   if pete say" It's 100 miles to the next town." then
 touch-next 5 9 2= dup
-  if 13 12 pete.jor queue-level then
+  if player move-entity 13 12 pete.jor queue-level then
 touch-next 13 6 2= dup
   if pete say" Old hiking trail." then
 touch-next 24 6 2= dup
   if mary say" Welcome to my place, Pete!" then
+touch-next 39 33 2= dup
+  if pete say" School's out for the day,\looks like." then
+touch-next 32 36 2= dup
+  if mary say" General store and post office." then
+touch-next 35 39 2= dup
+  if pete say" Community center." then
+touch-next tile b@ 17 = dup
+  if pete say" I'm not one to drop in\unannounced." then
 touch-last |; ' player-touch redefine
 s" road.map" load-map
 
diff --git a/road.map b/road.map
index dd0d26e..5f99885 100755
Binary files a/road.map and b/road.map differ
diff --git a/tiles.tif b/tiles.tif
index eb2d365..9aa18bf 100755
Binary files a/tiles.tif and b/tiles.tif differ