diff --git a/controllers/board/board.controller.js b/controllers/board/board.controller.js
index 6629924..25cabb1 100644
--- a/controllers/board/board.controller.js
+++ b/controllers/board/board.controller.js
@@ -48,7 +48,7 @@ const BoardCtrl = {
     },
 
     keyListener(e) {
-        if (e.keyCode !== 32 && MessageCtrl.isShowing() === false) {
+        if (e.keyCode !== 32 && e.keyCode !== 13 && MessageCtrl.isShowing() === false) {
             MuncherCtrl.move(e);
         }
         else if (ScorebarCtrl.isGameOver()) {
diff --git a/controllers/board/grid.controller.js b/controllers/board/grid.controller.js
index 7be27b6..131dbfe 100644
--- a/controllers/board/grid.controller.js
+++ b/controllers/board/grid.controller.js
@@ -1,21 +1,22 @@
 import * as GridActions from '../../actions/board/grid.actions';
-import FactorsModel from '../../models/factors.model';
 import SETTINGS from '../../AppSettings';
 
 let values;
 let dispatch;
+let model;
 
 const GridCtrl = {
     setDispatch: d => dispatch = d,
+    setModel: m => model = m,
     getValues: () => values,
 
     generateValues: (level) => {
-        values = FactorsModel.generate(SETTINGS.GRID_WIDTH * SETTINGS.GRID_HEIGHT, level);
+        values = model.generate(SETTINGS.GRID_WIDTH * SETTINGS.GRID_HEIGHT, level);
         dispatch(GridActions.update(values));
     },
 
     isCompleted: (level) => {
-        return FactorsModel.checkComplete(values, level)
+        return model.checkComplete(values, level)
     },
 
     hideValue: (index) => {
diff --git a/controllers/board/titlebar.controller.js b/controllers/board/titlebar.controller.js
index 6197ef9..5526a1d 100644
--- a/controllers/board/titlebar.controller.js
+++ b/controllers/board/titlebar.controller.js
@@ -1,13 +1,14 @@
 import * as TitlebarActions from '../../actions/board/titlebar.actions';
-import FactorsModel from '../../models/factors.model';
 
 let dispatch;
+let model;
 
 const TitlebarCtrl = {
     setDispatch: d => dispatch = d,
+    setModel: m => model = m,
 
     setTitle: (level) => {
-        const title = FactorsModel.getTitle(level);
+        const title = model.getTitle(level);
         dispatch(TitlebarActions.update(title));
     }
 };
diff --git a/controllers/high-score/high-score.controller.js b/controllers/high-score/high-score.controller.js
index 70041b6..08efe7c 100644
--- a/controllers/high-score/high-score.controller.js
+++ b/controllers/high-score/high-score.controller.js
@@ -26,8 +26,6 @@ const HighScoreCtrl = {
             }
         }
 
-        console.log(found)
-
         if (found === -1) {
             dispatch(ModeActions.welcome());
         }
diff --git a/controllers/options/options.controller.js b/controllers/options/options.controller.js
index c69e2aa..6a188ff 100644
--- a/controllers/options/options.controller.js
+++ b/controllers/options/options.controller.js
@@ -1,5 +1,12 @@
 import * as OptionsActions from '../../actions/options/options.actions';
 import ModeCtrl from '../mode.controller';
+import GridCtrl from '../board/grid.controller';
+import TitlebarCtrl from '../board/titlebar.controller';
+
+import MultiplesModel from '../../models/multiples.model';
+import FactorsModel from '../../models/factors.model';
+import AdditionModel from '../../models/addition.model';
+import SubtractionModel from '../../models/subtraction.model';
 
 let dispatch;
 const values = ['Multiples', 'Factors', 'Addition', 'Subtraction'];
@@ -15,11 +22,25 @@ const OptionsCtrl = {
     },
 
     keyListener(e) {
-        if (e.keyCode === 32) {
-            let model =
-            // switch (selected) {
-            //     case 0:
-            // }
+        if (e.keyCode === 32 || e.keyCode === 13) {
+            let model;
+            switch (selected) {
+                case 0:
+                    model = MultiplesModel;
+                    break;
+                case 1:
+                    model = FactorsModel;
+                    break;
+                case 2:
+                    model = AdditionModel;
+                    break;
+                case 3:
+                    model = SubtractionModel;
+                    break;
+            }
+
+            GridCtrl.setModel(model);
+            TitlebarCtrl.setModel(model);
             ModeCtrl.board();
         }
         else if (e.keyCode === 38) {
diff --git a/controllers/welcome/welcome.controller.js b/controllers/welcome/welcome.controller.js
index 15e5913..a3fce28 100644
--- a/controllers/welcome/welcome.controller.js
+++ b/controllers/welcome/welcome.controller.js
@@ -23,7 +23,7 @@ const WelcomeCtrl = {
     },
 
     keydown: (e) => {
-        if (e.keyCode === 32) {
+        if (e.keyCode === 32 || e.keyCode === 13) {
             dispatch(ModeActions.options());
         }
     }