diff --git a/dialog.js b/dialog.js
new file mode 100644
index 0000000..12850e9
--- /dev/null
+++ b/dialog.js
@@ -0,0 +1,18 @@
+"use strict";
+
+function DialogNode {
+  this.text = "Foo bar baz.";
+  this.hooks = [];
+
+  this.visit = function() {
+    for (let i=0; i<this.hooks.length; i++)
+      this.hooks[i]();
+    return this.text;
+  }
+
+  this.choices = [];
+
+  this.addChoice = function(text,node) {
+    this.choices.push({"text": text, "node": node});
+  }
+}
diff --git a/feast.js b/feast.js
index 5b41465..65ff3c3 100644
--- a/feast.js
+++ b/feast.js
@@ -61,7 +61,6 @@ function move(direction) {
     update(["You move to " + currentRoom.name,currentRoom.description]);
     updateDisplay();
   }
-
 }
 
 window.addEventListener('load', function(event) {
diff --git a/world.js b/world.js
index eaf3d1a..de63b32 100644
--- a/world.js
+++ b/world.js
@@ -1,5 +1,8 @@
 "use strict";
 
+/*jshint browser: true*/
+/*jshint devel: true*/
+
 let NORTH = 0;
 let NORTH_EAST = 1;
 let EAST = 2;
@@ -9,12 +12,64 @@ let SOUTH_WEST = 5;
 let WEST = 6;
 let NORTH_WEST = 7;
 
-/*jshint browser: true*/
-/*jshint devel: true*/
+let startLocation = "Bedroom";
+
+let locations = {};
+
+let locationsSrc = [
+  {
+    "name": "Bedroom",
+    "desc": "A bedroom",
+    "conn": [
+      {
+        "name": "Bathroom",
+        "dir": EAST
+      },
+      {
+        "name": "Living Room",
+        "dir": NORTH
+      }
+    ]
+  },
+  {
+    "name": "Bathroom",
+    "desc": "The bathroom",
+    "conn": [
+
+    ]
+  },
+  {
+    "name": "Living Room",
+    "desc": "A bare living room",
+    "conn": [
+      {
+        "name": "Street",
+        "dir": NORTH
+      }
+    ]
+  },
+  {
+    "name": "Street",
+    "desc": "It's a street",
+    "conn": [
+      {
+        "name": "Alley",
+        "dir": WEST
+      }
+    ]
+  },
+  {
+    "name": "Alley",
+    "desc": "A suspicious alley",
+    "conn": [
 
-function Location(name="Nowhere") {
+    ]
+  }
+]
+
+function Location(name="Nowhere",desc="Nada") {
   this.name = name;
-  this.description = "";
+  this.description = desc;
   this.exits = [null,null,null,null,null,null,null,null];
 }
 
@@ -38,19 +93,20 @@ function connectLocations(loc1,loc2,loc1Exit) {
 }
 
 function createWorld() {
-  let bedroom = new Location("Bedroom");
-  let bathroom = new Location("Bathroom");
-  let livingroom = new Location("Living Room");
-  let street = new Location("Street");
-  let alley = new Location("Alley");
-  let hotvore = new Location("Sexy vore scene");
-  hotvore.description = "Oh murr";
-
-  connectLocations(bedroom,bathroom,EAST);
-  connectLocations(bedroom,livingroom,NORTH);
-  connectLocations(livingroom,street,NORTH);
-  connectLocations(street,alley,WEST);
-  connectLocations(alley,hotvore,NORTH_WEST);
-
-  return bedroom;
+  for (let i = 0; i < locationsSrc.length; i++) {
+    let src = locationsSrc[i];
+    let location = new Location(src.name,src.desc);
+    locations[src.name] = location;
+  }
+
+  for (let i = 0; i < locationsSrc.length; i++) {
+    let src = locationsSrc[i];
+    let from = locations[src.name];
+    for (let j = 0; j < src.conn.length; j++) {
+      let to = locations[src.conn[j].name];
+      connectLocations(from, to, src.conn[j].dir);
+    }
+  }
+
+  return locations[startLocation];
 }