4 files changed, 32 insertions, 9 deletions

diff --git a/elm/battlemap/src/Init.elm b/elm/battlemap/src/Init.elm
new file mode 100644
index 0000000..25509d1
--- /dev/null
+++ b/elm/battlemap/src/Init.elm
@@ -0,0 +1,9 @@
+module Init exposing (init)
+
+import Model
+import Event
+
+import Shim.Model
+
+init : (Model.Type, (Cmd Event.Type))
+init = ((Shim.Model.generate), Cmd.none)
diff --git a/elm/battlemap/src/Main.elm b/elm/battlemap/src/Main.elm
index c92f59c..5a9d843 100644
--- a/elm/battlemap/src/Main.elm
+++ b/elm/battlemap/src/Main.elm
@@ -1,13 +1,20 @@
 import Html
+
+import Model
+import Event
+
+import Init
+import Subscriptions
 import View
-import Shim.Model
 import Update
 
+main : (Program Never Model.Type Event.Type)
 main =
-   (Html.beginnerProgram
+   (Html.program
       {
-         model = Shim.Model.generate,
+         init = Init.init,
          view = View.view,
-         update = Update.update
+         update = Update.update,
+         subscriptions = Subscriptions.subscriptions
       }
    )
diff --git a/elm/battlemap/src/Subscriptions.elm b/elm/battlemap/src/Subscriptions.elm
new file mode 100644
index 0000000..83df587
--- /dev/null
+++ b/elm/battlemap/src/Subscriptions.elm
@@ -0,0 +1,7 @@
+module Subscriptions exposing (..)
+
+import Model
+import Event
+
+subscriptions : Model.Type -> (Sub Event.Type)
+subscriptions model = Sub.none
diff --git a/elm/battlemap/src/Update.elm b/elm/battlemap/src/Update.elm
index 1a84481..7ee61a3 100644
--- a/elm/battlemap/src/Update.elm
+++ b/elm/battlemap/src/Update.elm
@@ -8,20 +8,20 @@ import Model.SelectTile
 import Model.SelectCharacter
 import Model.EndTurn
 
-update : Event.Type -> Model.Type -> Model.Type
+update : Event.Type -> Model.Type -> (Model.Type, (Cmd Event.Type))
 update event model =
    let
       new_model = (Model.clear_error model)
    in
    case event of
       (Event.DirectionRequested d) ->
-         (Model.RequestDirection.apply_to new_model d)
+         ((Model.RequestDirection.apply_to new_model d), Cmd.none)
 
       (Event.TileSelected loc) ->
-         (Model.SelectTile.apply_to new_model loc)
+         ((Model.SelectTile.apply_to new_model loc), Cmd.none)
 
       (Event.CharacterSelected char_id) ->
-         (Model.SelectCharacter.apply_to new_model char_id)
+         ((Model.SelectCharacter.apply_to new_model char_id), Cmd.none)
 
       Event.TurnEnded ->
-         (Model.EndTurn.apply_to new_model)
+         ((Model.EndTurn.apply_to new_model), Cmd.none)