diff --git a/roguebasin/__main__.py b/roguebasin/__main__.py
index e4615c7..b02b0e9 100644
--- a/roguebasin/__main__.py
+++ b/roguebasin/__main__.py
@@ -5,6 +5,7 @@ from . import actions
 from . import events
 from . import geometry
 from . import main
+from . import map
 from . import object
 from . import tile
 
diff --git a/roguebasin/map.py b/roguebasin/map.py
new file mode 100644
index 0000000..9e91341
--- /dev/null
+++ b/roguebasin/map.py
@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+# Eryn Wells <eryn@erynwells.me>
+
+import logging
+import tcod
+from .geometry import Point, Rect, Size
+from .tile import Tile
+from typing import List
+
+LOG = logging.getLogger('map')
+
+class Map:
+    def __init__(self, size: Size):
+        self.size = size
+
+        self.tiles: List[List[Tile]] = [[Tile(False) for y in range(size.height)] for x in range(size.width)]
+
+        self.rng = tcod.random.Random()
+
+        # BSP partitions
+        self.partitions = list(self.generate_partitions())
+        # Rooms, which are always some small portion of the above partitions.
+        self.rooms: List[Rect] = self.generate_rooms(self.partitions)
+
+        self.update_tiles()
+
+    def tile_for_point(self, point: Point) -> Tile:
+        return self.tiles[point.x][point.y]
+
+    def generate_partitions(self):
+        bsp = tcod.bsp.BSP(x=0, y=0, width=self.size.width, height=self.size.height)
+        # TODO: Parameterize this. Maybe a MapConfiguration class?
+        bsp.split_recursive(
+            depth=4,
+            min_width=8, min_height=8,
+            max_horizontal_ratio=1.5, max_vertical_ratio=1.5)
+        return bsp.pre_order()
+
+    def generate_rooms(self, partitions):
+        rooms = []
+
+        # For nicer debug logging
+        indent = 0
+
+        for node in partitions:
+            if node.children:
+                if LOG.getEffectiveLevel() == logging.DEBUG:
+                    LOG.debug(f'{" " * indent}{Rect(node.x, node.y, node.width, node.height)}')
+                    indent += 2
+                # TODO: Connect the two child rooms
+            else:
+                LOG.debug(f'{" " * indent}{Rect(node.x, node.y, node.width, node.height)} (room)')
+                size = Size(self.rng.randint(5, min(15, max(5, node.width - 2))),
+                            self.rng.randint(5, min(15, max(5, node.height - 2))))
+                origin = Point(node.x + self.rng.randint(1, max(1, node.width - size.width - 1)),
+                            node.y + self.rng.randint(1, max(1, node.height - size.height - 1)))
+                room = Rect(origin.x, origin.y, size.width, size.height)
+                LOG.debug(f'{" " * indent}`-> {room}')
+
+                rooms.append(room)
+
+                if LOG.getEffectiveLevel() == logging.DEBUG:
+                    indent -= 2
+
+        return rooms
+
+    def update_tiles(self):
+        for column in self.tiles:
+            for tile in column:
+                tile.blocks_movement = False
+                tile.blocks_sight = False
+
+        for room in self.rooms:
+            for y in range(room.min_y, room.max_y + 1):
+                for x in range(room.min_x, room.max_x + 1):
+                    if y == room.min_y or y == room.max_y or x == room.min_x or x == room.max_x:
+                        self.tiles[x][y].blocks_movement = True
+
+    def print_to_console(self, console: tcod.Console):
+        # for part in self.partitions:
+        #     console.draw_frame(part.x, part.y, part.width, part.height, bg=(40, 40, 80), clear=True, decoration="···· ····")
+
+        for room in self.rooms:
+            console.draw_frame(room.origin.x, room.origin.y, room.size.width, room.size.height,
+                fg=(255, 255, 255), bg=(80, 40, 40), clear=True)
\ No newline at end of file