diff --git a/modules/contrib/commerce/modules/wizard/src/Form/WizardForm.php b/modules/contrib/commerce/modules/wizard/src/Form/WizardForm.php
index 6250c2e..b4461fa 100644
--- a/modules/contrib/commerce/modules/wizard/src/Form/WizardForm.php
+++ b/modules/contrib/commerce/modules/wizard/src/Form/WizardForm.php
@@ -6,121 +6,170 @@ use Drupal\Core\Url;
 use Drupal\Core\Form\FormBase;
 use Drupal\Core\Form\FormStateInterface;
 
+
 /**
  * Contribute form.
  */
 class WizardForm extends FormBase {
 
-  /**
-   * {@inheritdoc}
-   */
-  public function getFormId() {
-    return 'commerce_wizard_form';
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function buildForm(array $form, FormStateInterface $form_state) {
-
-    /*
-     * 1. Store Details
-     */
-    $form['commerce_details'] = [
-      '#type' => 'stepper',
-      '#title' => t('1. Add Store Details'),
-    // '#open' => TRUE,.
-      '#button_text' => t('Next, location'),
-    ];
-
-    /*
-     * 2. Store Location
-     */
-    $form['commerce_location'] = [
-      '#type' => 'stepper',
-      '#title' => t('2. Enter the stores location'),
-      '#button_text' => t('Next, currency'),
-    ];
-
-    /*
-     * 3. Currency
+    /**
+     * {@inheritdoc}
      */
-    $form['commerce_currency'] = [
-      '#type' => 'stepper',
-      '#title' => t('3. Confirm the stores primary currency'),
-      '#markup' => t('<p>We\'ve determined that based on your stores location, the following currency: <strong>Canadian Dollar (CAD)</strong> will be imported.</p>'),
-      '#button_text' => t('Confirm'),
-      '#skip_text' => t('I\'ll set it up later'),
-    ];
-
-    /*
-     * 4. Tax
-     */
-    $form['commerce_tax'] = [
-      '#type' => 'stepper',
-      '#title' => t('4. Confirm the stores primary tax rate(s)'),
-      '#markup' => t('<p>We\'ve determined that based on your stores location, the following tax rates; <strong>GST & PST</strong> will be imported.</p>'),
-      '#button_text' => t('Confirm'),
-      '#skip_text' => t('I\'ll set it up later'),
-    ];
-
-    /*
-     * 5. Cart Block
+    public function getFormId() {
+        return 'commerce_wizard_form';
+    }
+
+    /**
+     * {@inheritdoc}
      */
-    $form['commerce_cart_block'] = [
-      '#type' => 'stepper',
-      '#title' => t('5. Place your cart block in a region'),
-      '#markup' => t('<p>As a default, the cart block consists of; the number of items added to the users cart, their total, and a link to proceed to their cart for review & checkout.</p>
+    public function buildForm(array $form, FormStateInterface $form_state) {
+
+        /*
+         *   1. Store Details
+         */
+        $form['store_details'] = [
+            //'#type' => 'textfield',
+            '#type' => 'stepper',
+            '#title' => $this->t('1. Store Details'),
+            '#button_text' => t('Next, location'),
+        ];
+
+        $form['store_details']['name'] = [
+            '#type' => 'textfield',
+            '#title' => $this->t('Name'),
+            '#required' => TRUE,
+        ];
+
+        $form['store_details']['e-mail'] = [
+            '#type' => 'textfield',
+            '#title' => $this->t('E-mail'),
+            '#required' => TRUE,
+        ];
+
+        $form['store_details']['owner'] = [
+            '#type' => 'textfield',
+            '#title' => $this->t('Owner'),
+        ];
+
+        /*
+         * 2. Store Location
+         */
+        $form['commerce_location'] = [
+            '#type' => 'stepper',
+            '#title' => t('2. Enter the stores location'),
+            '#button_text' => t('Next, currency'),
+        ];
+
+        $form['commerce_location']['country'] = [
+            '#type' => 'textfield',
+            '#title' => $this->t('Country'),
+            '#required' => TRUE,
+        ];
+
+        $form['commerce_location']['street_address'] = [
+            '#type' => 'textfield',
+            '#title' => $this->t('Street Address'),
+            '#required' => TRUE,
+        ];
+
+        $form['commerce_location']['city'] = [
+            '#type' => 'textfield',
+            '#title' => $this->t('City'),
+            '#required' => TRUE,
+        ];
+
+        $form['commerce_location']['province'] = [
+            '#type' => 'dropdown',
+            '#title' => $this->t('Province'),
+            '#required' => TRUE,
+        ];
+
+        $form['commerce_location']['postal_code'] = [
+            '#type' => 'textfield',
+            '#title' => $this->t('Postal Code'),
+            '#required' => TRUE,
+        ];
+
+        /*
+         * 3. Currency
+         */
+        $form['commerce_currency'] = [
+            '#type' => 'stepper',
+            '#title' => t('3. Confirm the stores primary currency'),
+            '#markup' => t('<p>We\'ve determined that based on your stores location, the following currency: <strong>Canadian Dollar (CAD)</strong> will be imported.</p>'),
+            '#button_text' => t('Confirm'),
+            '#skip_text' => t('I\'ll set it up later'),
+        ];
+
+        /*
+         * 4. Tax
+         */
+        $form['commerce_tax'] = [
+            '#type' => 'stepper',
+            '#title' => t('4. Confirm the stores primary tax rate(s)'),
+            '#markup' => t('<p>We\'ve determined that based on your stores location, the following tax rates; <strong>GST & PST</strong> will be imported.</p>'),
+            '#button_text' => t('Confirm'),
+            '#skip_text' => t('I\'ll set it up later'),
+        ];
+
+        /*
+         * 5. Cart Block
+         */
+        $form['commerce_cart_block'] = [
+            '#type' => 'stepper',
+            '#title' => t('5. Place your cart block in a region'),
+            '#markup' => t('<p>As a default, the cart block consists of; the number of items added to the users cart, their total, and a link to proceed to their cart for review & checkout.</p>
 											<p>Select a region on your site where you’d like customers to view this block.</p>'),
-      '#button_text' => t('Place block'),
-      '#skip_text' => t('I\'ll set it up later'),
-    ];
-
-    /*
-     * 6. Payment
+            '#button_text' => t('Place block'),
+            '#skip_text' => t('I\'ll set it up later'),
+        ];
+
+        /*
+         * 6. Payment
+         */
+        $form['commerce_payment'] = [
+            '#type' => 'stepper',
+            '#title' => t('6. Add a payment processor'),
+            '#markup' => t('<p>Start accepting payments by choosing from 30+ supported <a href="#">payment processors</a>.</p>'),
+            '#change_link' => FALSE,
+        ];
+
+
+        /*
+         * Form Actions
+         */
+        //$form['actions'] = ['#type' => 'actions'];
+        $form['actions']['submit'] = [
+            '#type' => 'submit',
+            '#value' => t('Create Store'),
+            '#attributes' => [
+                'class' => ['button', 'button--primary'],
+            ],
+            '#disabled' => TRUE,
+        ];
+
+        $form['actions']['cancel'] = [
+            '#type' => 'link',
+            '#title' => $this->t('Exit wizard'),
+            '#url' => Url::fromRoute('commerce.commerce_wizard'),
+            '#attributes' => [
+                'class' => ['button', 'button--danger'],
+            ],
+        ];
+
+        return $form;
+    }
+
+    /**
+     * {@inheritdoc}
      */
-    $form['commerce_payment'] = [
-      '#type' => 'stepper',
-      '#title' => t('6. Add a payment processor'),
-      '#markup' => t('<p>Start accepting payments by choosing from 30+ supported <a href="#">payment processors</a>.</p>'),
-      '#change_link' => FALSE,
-    ];
-
-    /*
-     * Form Actions
+    public function validateForm(array &$form, FormStateInterface $form_state) {
+    }
+
+    /**
+     * {@inheritdoc}
      */
-    $form['actions'] = ['#type' => 'actions'];
-    $form['actions']['submit'] = [
-      '#type' => 'submit',
-      '#value' => t('Create Store'),
-      '#attributes' => [
-        'class' => ['button', 'button--primary'],
-      ],
-      '#disabled' => TRUE,
-    ];
-
-    $form['actions']['cancel'] = [
-      '#type' => 'link',
-      '#title' => $this->t('Exit wizard'),
-      '#url' => Url::fromRoute('commerce.commerce_wizard'),
-      '#attributes' => [
-        'class' => ['button', 'button--danger'],
-      ],
-    ];
-
-    return $form;
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function validateForm(array &$form, FormStateInterface $form_state) {
-  }
-
-  /**
-   * {@inheritdoc}
-   */
-  public function submitForm(array &$form, FormStateInterface $form_state) {
-  }
+    public function submitForm(array &$form, FormStateInterface $form_state) {
+    }
 
 }