diff --git a/dungeonbattle/game.py b/dungeonbattle/game.py
index aa91a7e..262469c 100644
--- a/dungeonbattle/game.py
+++ b/dungeonbattle/game.py
@@ -1,8 +1,9 @@
 import sys
 from typing import Any
 
-from .display.display import Display
+from .display.mapdisplay import MapDisplay
 from .display.menudisplay import MenuDisplay
+from .display.texturepack import TexturePack
 from .entities.player import Player
 from .interfaces import Map
 from .settings import Settings
@@ -39,7 +40,11 @@ class Game:
         self.player = Player()
         self.player.move(1, 6)
         self.m.add_entity(self.player)
-        self.current_display = MenuDisplay(self, self.main_menu, 0, 0)
+        self.menu_display = MenuDisplay(screen, self.main_menu, 0, 0)
+        self.map_display = MapDisplay(
+            screen, self.m, self.player,
+            TexturePack.get_pack(self.settings.TEXTURE_PACK))
+        self.current_display = self.menu_display
 
     @staticmethod
     def load_game(filename: str) -> None:
@@ -90,6 +95,7 @@ class Game:
                 option = self.main_menu.validate()
                 if option == menus.MainMenuValues.START:
                     self.state = GameMode.PLAY
+                    self.current_display = self.map_display
                 elif option == menus.MainMenuValues.SETTINGS:
                     self.state = GameMode.SETTINGS
                 elif option == menus.MainMenuValues.EXIT:
diff --git a/dungeonbattle/mapdisplay.py b/dungeonbattle/mapdisplay.py
deleted file mode 100644
index 095b7cb..0000000
--- a/dungeonbattle/mapdisplay.py
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env python
-import curses
-
-from dungeonbattle.entities.player import Player
-from dungeonbattle.interfaces import Map
-
-
-class MapDisplay:
-    def __init__(self, m: Map, player: Player, init_pad: bool = True):
-        self.map = m
-        self.player = player
-        if init_pad:
-            self.pad = curses.newpad(m.height, m.width + 1)
-
-    def update_pad(self) -> None:
-        self.pad.addstr(0, 0, self.map.draw_string())
-        # TODO Not all entities should be a player
-        for e in self.map.entities:
-            self.pad.addstr(e.y, e.x, '🐿')
-
-    def display(self, y: int, x: int) -> None:
-        deltay, deltax = (curses.LINES // 2) + 1, (curses.COLS // 2) + 1
-        pminrow, pmincol = y - deltay, x - deltax
-        sminrow, smincol = max(-pminrow, 0), max(-pmincol, 0)
-        deltay, deltax = curses.LINES - deltay, curses.COLS - deltax
-        smaxrow = self.map.height - (y + deltay) + curses.LINES - 1
-        smaxrow = min(smaxrow, curses.LINES - 1)
-        smaxcol = self.map.width - (x + deltax) + curses.COLS - 1
-        smaxcol = min(smaxcol, curses.COLS - 1)
-        pminrow = max(0, min(self.map.height, pminrow))
-        pmincol = max(0, min(self.map.width, pmincol))
-        self.pad.clear()
-        self.update_pad()
-        self.pad.refresh(pminrow, pmincol, sminrow, smincol, smaxrow, smaxcol)