     else
       null
 
-  @create: (layout) ->
-
-expandWorldMap = (layout) ->
-  roomGrid = mapLayoutToRoomGrid(layout, RoomDefs)
+expandWorldMap = (mapDef) ->
+  roomGrid = mapDefToRoomGrid(mapDef, RoomDefs)
   tileGrid = roomGridToTileGrid(roomGrid)
-  areas = _.map layout.areas, (areaDef) -> makeArea(areaDef)
-  setRoomAreas(roomGrid,areas)
+  # areas = _.map layout.areas, (areaDef) -> makeArea(areaDef)
+  # setRoomAreas(roomGrid,areas)
   new WorldMap
     roomGrid: roomGrid
     tileGrid: tileGrid
-    areas: areas
-
-mapDef =
-  rows: 10
-  cols: 10
+
+proto_mapDef =
+  rows: 5
+  cols: 15
   data: [
-    # mainEntry-------------------  |--|   roomA-----------------   roomB----------------------- 
-    [0x08, 0x17, 0x09, 0x14, 0x13,  0x18,  0x12, 0x14, 0x19, 0x13,  0x12, 0x14, 0x14, 0x14, 0x13]
+    # mainEntry-------------------                       |--|       roomA-----------------   roomB----------------------- 
+    ['0x13-E',null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null,null]
+    ['0x08-A', '0x17-A', '0x09-A', '0x14-A', '0x13-A',  '0x18-B',  '0x12-C', '0x14-C', '0x19-C', '0x13-C',  '0x12-D', '0x14-D', '0x14-D', '0x14-D', '0x13-D']
   ]
-  areas: [
-    ["mainEntry", [0,0], [0,4]]
-    ["bridge", [0,5], [0,5]]
-    ["roomA", [0,6], [0,9]]
-    ["roomB", [0,10], [0,14]]
-  ]
+  # areas: [
+  #   ["mainEntry", [0,0], [0,4]]
+  #   ["bridge", [0,5], [0,5]]
+  #   ["roomA", [0,6], [0,9]]
+  #   ["roomB", [0,10], [0,14]]
+  # ]
 
 module.exports =
-  getDefaultWorldMap: FnUtils.memoizeThunk -> expandWorldMap(mapDef)
+  getDefaultWorldMap: FnUtils.memoizeThunk -> expandWorldMap(proto_mapDef)
 
 
 window.WorldMap = module.exports.getDefaultWorldMap

  else
    null

# Convert a grid of room types into a grid of room data objects
mapLayoutToRoomGrid = (mapLayout, roomDefs, mapConfig) ->
  roomGrid = emptyGrid(mapLayout.rows, mapLayout.cols)
  for row,r in mapLayout.data
    for roomTypeId,c in row
      roomDef = roomDefs.get(roomTypeId)
      roomGrid[r][c] = instanceRoom(roomDef,r,c)

  roomGrid


    music: "brinstar"

class WorldMap
  constructor: ({@roomGrid,@tileGrid}) ->
    [@rooms, @_roomsById] = indexRoomGrid(@roomGrid)

  # Return an array of Rooms that overlap the given px rectangle
