3 files changed, 11 insertions, 13 deletions
diff --git a/elm/battlemap/src/Shim/Battlemap.elm b/elm/battlemap/src/Shim/Battlemap.elm
index f35cb67..5a2e29b 100644
--- a/elm/battlemap/src/Shim/Battlemap.elm
+++ b/elm/battlemap/src/Shim/Battlemap.elm
@@ -5,7 +5,8 @@ import Shim.Battlemap.Tile
 --generate : Battlemap.Type
 generate =
    {
-      width = 32,
-      height = 32,
-      content = (Shim.Battlemap.Tile.generate 32)
+      width = 16,
+      height = 16,
+      content = (Shim.Battlemap.Tile.generate 16),
+      navigator = Nothing
    }
diff --git a/elm/battlemap/src/Shim/Battlemap/Tile.elm b/elm/battlemap/src/Shim/Battlemap/Tile.elm
index c243f0a..1e11cb5 100644
--- a/elm/battlemap/src/Shim/Battlemap/Tile.elm
+++ b/elm/battlemap/src/Shim/Battlemap/Tile.elm
@@ -3,20 +3,17 @@ module Shim.Battlemap.Tile exposing (generate)
 import Array
 import List
 
-import Battlemap.Location
 import Battlemap.Tile
 
 from_int : Int -> Int -> (Int, Int) -> Battlemap.Tile.Type
-from_int map_width index (class, cost) =
+from_int map_width index (icon_id, cost) =
    {
       location =
-         (Battlemap.Location.get_ref
-            {
-               x = (index % map_width),
-               y = (index // map_width)
-            }
-         ),
-      class = class,
+         {
+            x = (index % map_width),
+            y = (index // map_width)
+         },
+      icon_id = (toString icon_id),
       crossing_cost = cost
    }
 
diff --git a/elm/battlemap/src/Shim/Model.elm b/elm/battlemap/src/Shim/Model.elm
index 1ebe723..f82a0d3 100644
--- a/elm/battlemap/src/Shim/Model.elm
+++ b/elm/battlemap/src/Shim/Model.elm
@@ -10,7 +10,7 @@ import Shim.Battlemap
 generate =
    {
       state = Model.Default,
-      selection = Nothing,
+      selection = Model.None,
       error = Nothing,
       battlemap = (Shim.Battlemap.generate),
       characters =