diff --git a/companion/src/mdichild.cpp b/companion/src/mdichild.cpp
index d7b8de825..abf609ad5 100644
--- a/companion/src/mdichild.cpp
+++ b/companion/src/mdichild.cpp
@@ -186,7 +186,10 @@ void MdiChild::wizardEdit()
   if (row > 0) {
     checkAndInitModel(row);
     WizardDialog *wizard = new WizardDialog(this);
-    wizard->show();
+    wizard->exec();
+    if (wizard->mix.complete){
+      //TODO Save data accessible in wizard->mix.
+    }
   }
 }
 
diff --git a/companion/src/wizarddata.cpp b/companion/src/wizarddata.cpp
index db5686221..3b0d063df 100644
--- a/companion/src/wizarddata.cpp
+++ b/companion/src/wizarddata.cpp
@@ -65,11 +65,18 @@ QString Channel::toString()
   return str;
 }
 
+Mix::Mix()
+{
+  complete = false;
+  name = "";
+  vehicle = NOVEHICLE;
+}
+
 QString Mix::toString()
 {
   QString str;
   str = QString(tr("Model Name: ")) + name + "\n";
-  str += QString(tr("Model Type: ")) + vehicleName(vehicleType) + "\n";
+  str += QString(tr("Model Type: ")) + vehicleName(vehicle) + "\n";
   for (int i=0; i<MAX_CHANNELS; i++){
     if (!channel[i].isEmpty()){
       str += QString(tr("Channel %1: ").arg(i+1));
@@ -78,4 +85,4 @@ QString Mix::toString()
     }
   }
   return str;
-}
\ No newline at end of file
+}
diff --git a/companion/src/wizarddata.h b/companion/src/wizarddata.h
index 8b26f6993..b1842dfc3 100644
--- a/companion/src/wizarddata.h
+++ b/companion/src/wizarddata.h
@@ -43,11 +43,13 @@ class Mix:QObject
 {
   Q_OBJECT
 public:
+  bool complete;
   QString name;
-  Vehicle vehicleType;
+  Vehicle vehicle;
   Channel channel[MAX_CHANNELS];
 
+  Mix();
   QString toString();
 };
 
-#endif // WIZARDDATA_H
\ No newline at end of file
+#endif // WIZARDDATA_H
diff --git a/companion/src/wizarddialog.cpp b/companion/src/wizarddialog.cpp
index 289d6e4fe..ad39ecde2 100644
--- a/companion/src/wizarddialog.cpp
+++ b/companion/src/wizarddialog.cpp
@@ -213,11 +213,11 @@ bool ModelSelectionPage::validatePage()
 {
   wizDlg->mix.name = nameLineEdit->text();
   if (multirotorRB->isChecked())
-    wizDlg->mix.vehicleType = MULTICOPTER;
+    wizDlg->mix.vehicle = MULTICOPTER;
   else if (helicopterRB->isChecked())
-    wizDlg->mix.vehicleType = HELICOPTER;
+    wizDlg->mix.vehicle = HELICOPTER;
   else
-    wizDlg->mix.vehicleType = PLANE;
+    wizDlg->mix.vehicle = PLANE;
   return true;
 }
 
@@ -723,4 +723,9 @@ void ConclusionPage::initializePage(){
   textLabel->setText(wizDlg->mix.toString());
 }
 
+bool ConclusionPage::validatePage() {
+  wizDlg->mix.complete = true;
+  return true;
+}
+
 
diff --git a/companion/src/wizarddialog.h b/companion/src/wizarddialog.h
index 34c4fdf70..57dedd019 100644
--- a/companion/src/wizarddialog.h
+++ b/companion/src/wizarddialog.h
@@ -302,6 +302,7 @@ class ConclusionPage: public StandardPage
 public:
   ConclusionPage(WizardDialog *dlg, QString image, QString title, QString text, int nextPage=-1);  
   void initializePage();
+  bool validatePage();
 private:
   QCheckBox *proceedCB;
   QLabel *textLabel;