diff --git a/prep_form.php b/prep_form.php
index 111720d..856bc9c 100644
--- a/prep_form.php
+++ b/prep_form.php
@@ -8,10 +8,14 @@ $field_data_json = file_get_contents('definitions/' . $action . '.json');
 $field_data = json_decode($field_data_json, true);
 
 foreach ($field_data['groups'] as $id=>$group) {
-    $by_group[$group] = array();
+    $by_group[$group] = array(
+        'group_name' => $group,
+        'fields' => array(),
+    );
 }
 
 foreach ($field_data['fields'] as $key=>$meta) {
+    $meta['field_id'] = $key;
     $group_name = $field_data['groups'][$meta['group']];
     $meta['group_name'] = $group_name;
     if (isset($_SESSION[$skey][$key])) {
@@ -19,16 +23,27 @@ foreach ($field_data['fields'] as $key=>$meta) {
     } elseif (isset($meta['default'])) {
         switch ($meta['default']) {
             case 'USER_NAME':
-                $meta['value'] = 'User Name';
+                $meta['value'] = $data['user']['name_first'] . ' ' . $data['user']['name_last'];
                 break;
             case 'USER_EMAIL':
-                $meta['value'] = 'user@email.com';
+                $meta['value'] = $data['user']['email'];
                 break;
             default:
                 $meta['value'] = $meta['default'];
                 break;
         }
     }
-    $by_group[$group_name][$key] = $meta;
+    $meta['fieldtype_' . $meta['type']] = true;
+    if ($meta['type'] == 'datetime') {
+        $meta['min'] = date('Y-m-d');
+    }
+    $by_group[$group_name]['fields'][$key] = $meta;
 }
-print_r($by_group);
+
+foreach ($by_group as $group=>$group_data) {
+    $by_group[$group]['fields'] = array_values($group_data['fields']);
+}
+
+#print_r($by_group);
+$by_group = array_values($by_group);
+$data['form_data'] = $by_group;
diff --git a/templates/hotel_html.mustache b/templates/hotel_html.mustache
index 6eb2c50..6292349 100644
--- a/templates/hotel_html.mustache
+++ b/templates/hotel_html.mustache
@@ -10,22 +10,15 @@
 
 <form action="./" method="post">
 
-<p>
-  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-    <input class="mdl-textfield__input" type="text" required id="reservationFor_name">
-    <label class="mdl-textfield__label" for="reservationFor_name">Name</label>
-    <span class="mdl-textfield__error">Please input a name!</span>
-  </div>
-</p>
+{{#form_data}}
+<h4>{{group_name}}</h4>
 
-<p>
-<!-- Numeric Textfield with Floating Label -->
-  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
-    <input class="mdl-textfield__input" type="datetime-local" min="{{date_today}}" required id="reservationFor_startDate">
-    <label class="mdl-textfield__label" for="reservationFor_checkinDate">Checkin Time</label>
-    <span class="mdl-textfield__error">Input is empty or not a date!</span>
-  </div>
-</p>
+    {{#fields}}
+        {{>mdl_input}}
+    {{/fields}}
+
+
+{{/form_data}}
 
 <button id="frs-button-send" type="submit" class="mdl-button mdl-js-button mdl-button--fab mdl-js-ripple-effect mdl-button--colored">
   <i class="material-icons">send</i>
diff --git a/templates/partials/mdl_input.mustache b/templates/partials/mdl_input.mustache
new file mode 100644
index 0000000..fc8656a
--- /dev/null
+++ b/templates/partials/mdl_input.mustache
@@ -0,0 +1,27 @@
+{{#fieldtype_text}}
+    {{>mdl_input_text}}
+{{/fieldtype_text}}
+{{#fieldtype_url}}
+    {{>mdl_input_url}}
+{{/fieldtype_url}}
+{{#fieldtype_tel}}
+    {{>mdl_input_tel}}
+{{/fieldtype_tel}}
+{{#fieldtype_datetime}}
+    {{>mdl_input_datetime}}
+{{/fieldtype_datetime}}
+{{#fieldtype_country}}
+    {{>mdl_input_country}}
+{{/fieldtype_country}}
+{{#fieldtype_number}}
+    {{>mdl_input_number}}
+{{/fieldtype_number}}
+{{#fieldtype_decimal}}
+    {{>mdl_input_decimal}}
+{{/fieldtype_decimal}}
+{{#fieldtype_email}}
+    {{>mdl_input_email}}
+{{/fieldtype_email}}
+{{#fieldtype_status}}
+    {{>mdl_input_status}}
+{{/fieldtype_status}}
diff --git a/templates/partials/mdl_input_country.mustache b/templates/partials/mdl_input_country.mustache
new file mode 100644
index 0000000..05c54b7
--- /dev/null
+++ b/templates/partials/mdl_input_country.mustache
@@ -0,0 +1,7 @@
+<p>
+  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+    <input class="mdl-textfield__input" type="text" {{#required}}required{{/required}} id="{{field_id}}" value="{{value}}"/>
+    <label class="mdl-textfield__label" for="{{field_id}}">{{title}} (SELECTOR tbd!)</label>
+    <span class="mdl-textfield__error">Please input a country!</span>
+  </div>
+</p>
diff --git a/templates/partials/mdl_input_datetime.mustache b/templates/partials/mdl_input_datetime.mustache
new file mode 100644
index 0000000..a801965
--- /dev/null
+++ b/templates/partials/mdl_input_datetime.mustache
@@ -0,0 +1,7 @@
+<p>
+  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+    <input class="mdl-textfield__input" type="datetime-local" min="{{min}}T00:00:00.0" max="2032-12-31T00:00:00.0" {{#required}}required{{/required}} id="{{field_id}}" value="{{value}}"/>
+    <label class="mdl-textfield__label" for="{{field_id}}">{{title}}</label>
+    <span class="mdl-textfield__error">Please input a valid date!</span>
+  </div>
+</p>
diff --git a/templates/partials/mdl_input_decimal.mustache b/templates/partials/mdl_input_decimal.mustache
new file mode 100644
index 0000000..c29ecc7
--- /dev/null
+++ b/templates/partials/mdl_input_decimal.mustache
@@ -0,0 +1,7 @@
+<p>
+  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+    <input class="mdl-textfield__input" type="number" {{#required}}required{{/required}} step="0.5" id="{{field_id}}" value="{{value}}"/>
+    <label class="mdl-textfield__label" for="{{field_id}}">{{title}}</label>
+    <span class="mdl-textfield__error">Please input a value!</span>
+  </div>
+</p>
diff --git a/templates/partials/mdl_input_email.mustache b/templates/partials/mdl_input_email.mustache
new file mode 100644
index 0000000..3afa84e
--- /dev/null
+++ b/templates/partials/mdl_input_email.mustache
@@ -0,0 +1,7 @@
+<p>
+  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+    <input class="mdl-textfield__input" type="email" {{#required}}required{{/required}} id="{{field_id}}" value="{{value}}"/>
+    <label class="mdl-textfield__label" for="{{field_id}}">{{title}}</label>
+    <span class="mdl-textfield__error">Please input a valid email address!</span>
+  </div>
+</p>
diff --git a/templates/partials/mdl_input_number.mustache b/templates/partials/mdl_input_number.mustache
new file mode 100644
index 0000000..1b77723
--- /dev/null
+++ b/templates/partials/mdl_input_number.mustache
@@ -0,0 +1,7 @@
+<p>
+  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+    <input class="mdl-textfield__input" type="number" {{#required}}required{{/required}} id="{{field_id}}" value="{{value}}"/>
+    <label class="mdl-textfield__label" for="{{field_id}}">{{title}}</label>
+    <span class="mdl-textfield__error">Please input a value!</span>
+  </div>
+</p>
diff --git a/templates/partials/mdl_input_status.mustache b/templates/partials/mdl_input_status.mustache
new file mode 100644
index 0000000..9699c2a
--- /dev/null
+++ b/templates/partials/mdl_input_status.mustache
@@ -0,0 +1,8 @@
+<p>
+    Select your status:
+    <select name="{{field_id}}" size="1">
+        <option value="http://schema.org/Confirmed">Confirmed</option>
+        <option value="http://schema.org/Cancelled">Cancelled</option>
+        <option value="http://schema.org/Pending">Pending</option>
+    </select>
+</p>
diff --git a/templates/partials/mdl_input_tel.mustache b/templates/partials/mdl_input_tel.mustache
new file mode 100644
index 0000000..10f8ee9
--- /dev/null
+++ b/templates/partials/mdl_input_tel.mustache
@@ -0,0 +1,7 @@
+<p>
+  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+    <input class="mdl-textfield__input" type="tel" {{#required}}required{{/required}} id="{{field_id}}" value="{{value}}"/>
+    <label class="mdl-textfield__label" for="{{field_id}}">{{title}}</label>
+    <span class="mdl-textfield__error">Please input a valid phone number!</span>
+  </div>
+</p>
diff --git a/templates/partials/mdl_input_text.mustache b/templates/partials/mdl_input_text.mustache
new file mode 100644
index 0000000..379a270
--- /dev/null
+++ b/templates/partials/mdl_input_text.mustache
@@ -0,0 +1,7 @@
+<p>
+  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+    <input class="mdl-textfield__input" type="text" {{#required}}required{{/required}} id="{{field_id}}" value="{{value}}"/>
+    <label class="mdl-textfield__label" for="{{field_id}}">{{title}}</label>
+    <span class="mdl-textfield__error">Please input a value!</span>
+  </div>
+</p>
diff --git a/templates/partials/mdl_input_url.mustache b/templates/partials/mdl_input_url.mustache
new file mode 100644
index 0000000..1f8734e
--- /dev/null
+++ b/templates/partials/mdl_input_url.mustache
@@ -0,0 +1,7 @@
+<p>
+  <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
+    <input class="mdl-textfield__input" type="url" {{#required}}required{{/required}} id="{{field_id}}" value="{{value}}"/>
+    <label class="mdl-textfield__label" for="{{field_id}}">{{title}}</label>
+    <span class="mdl-textfield__error">Please input a valid URL!</span>
+  </div>
+</p>