diff --git a/bundles.json b/bundles.json
index d7edba5db7..74eca7c166 100644
--- a/bundles.json
+++ b/bundles.json
@@ -2,10 +2,11 @@
     "platform/framework",
     "platform/core",
     "platform/representation",
-    "platform/commonUI/browse",
-    "platform/commonUI/edit",
     "platform/commonUI/dialog",
     "platform/commonUI/general",
+    "platform/forms",
+
+    "example/forms",
 
     "example/persistence"
 ]
\ No newline at end of file
diff --git a/platform/forms/res/templates/controls/checkbox.html b/platform/forms/res/templates/controls/checkbox.html
index a33eb4b86e..0152677ce6 100644
--- a/platform/forms/res/templates/controls/checkbox.html
+++ b/platform/forms/res/templates/controls/checkbox.html
@@ -1,7 +1,7 @@
 <label class="checkbox custom no-text">
     <input type="checkbox"
-           name="{{name}}"
-           ng-model="ngModel[name]"
+           name="mctControl"
+           ng-model="ngModel[field]"
            ng-disabled="ngDisabled">
     <em>&nbsp;</em>
 </label>
diff --git a/platform/forms/res/templates/controls/select.html b/platform/forms/res/templates/controls/select.html
index 01e32892e0..6d1186f625 100644
--- a/platform/forms/res/templates/controls/select.html
+++ b/platform/forms/res/templates/controls/select.html
@@ -1,7 +1,7 @@
 <select class='form-control input select'
-        ng-model="ngModel[name]"
+        ng-model="ngModel[field]"
         ng-options="o.name for o in options"
-        name="name">
-    <option value="" ng-if="!ngModel[name]">- Select One -</option>
+        name="mctControl">
+    <option value="" ng-if="!ngModel[field]">- Select One -</option>
     <span class='ui-symbol arw colorKey'>v</span>
 </select>
diff --git a/platform/forms/res/templates/controls/textfield.html b/platform/forms/res/templates/controls/textfield.html
index 420a7fbb7c..a09786337d 100644
--- a/platform/forms/res/templates/controls/textfield.html
+++ b/platform/forms/res/templates/controls/textfield.html
@@ -1,7 +1,7 @@
 <span class='form-control shell'>
     <span class='field control'>
         <input type="text"
-               ng-model="ngModel[name]"
-               name="{{name}}">
+               ng-model="ngModel[field]"
+               name="mctControl">
     </span>
 </span>
diff --git a/platform/forms/res/templates/form.html b/platform/forms/res/templates/form.html
index c9b2148279..33da4caf08 100644
--- a/platform/forms/res/templates/form.html
+++ b/platform/forms/res/templates/form.html
@@ -18,23 +18,26 @@
                     </span>
                 </div>
                 <div class='controls'>
-                    <div class="wrapper" ng-if="row.control">>
-                        <mct-control key="row.control"
-                                     ng-model="ngModel"
-                                     ng-required="row.required"
-                                     options="row.options"
-                                     structure="row"
-                                     name="{{row.key}}">
-                        </mct-control>
+                    <div class="wrapper" ng-if="row.control">
+                        <ng-form name="mctFormInner">
+                            <mct-control key="row.control"
+                                         ng-model="ngModel"
+                                         ng-required="row.required"
+                                         options="row.options"
+                                         structure="row"
+                                         field="row.key">
+                            </mct-control>
+                        </ng-form>
                     </div>
                     <div ng-repeat="item in row.items" class="validates">
-                        <mct-control key="item.control"
-                                     ng-model="ngModel"
-                                     ng-required="item.required"
-                                     options="item.options"
-                                     structure="item"
-                                     name="{{item.key}}">
-                        </mct-control>
+                        <ng-form name="mctFormInner">
+                            <mct-control key="item.control"
+                                         ng-model="ngModel"
+                                         ng-required="item.required"
+                                         options="item.options"
+                                         structure="item">
+                            </mct-control>
+                        </ng-form>
                     </div>
                 </div>
 
diff --git a/platform/forms/src/MCTControl.js b/platform/forms/src/MCTControl.js
index e564be239d..ba3713492b 100644
--- a/platform/forms/src/MCTControl.js
+++ b/platform/forms/src/MCTControl.js
@@ -60,7 +60,7 @@ define(
                     structure: "=",
 
                     // Name, as in "<input name="...
-                    name: "@"
+                    field: "="
                 }
             };
         }
diff --git a/platform/forms/src/MCTForm.js b/platform/forms/src/MCTForm.js
index 5a342bd2fc..00f7f7065f 100644
--- a/platform/forms/src/MCTForm.js
+++ b/platform/forms/src/MCTForm.js
@@ -21,8 +21,9 @@ define(
 
             function controller($scope) {
                 $scope.$watch("mctForm", function (mctForm) {
+                    console.log(JSON.stringify(mctForm));
                     if ($scope.name) {
-                        $scope.$parent.mctForm = mctForm;
+                        $scope.$parent[$scope.name] = mctForm;
                     }
                 });
             }