8 files changed, 164 insertions, 21 deletions

diff --git a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
index 1bfe66a4..652d3bc0 100644
--- a/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
+++ b/js/components/treeview/ninja-leaf.reel/ninja-leaf.js
@@ -8,9 +8,12 @@ var Montage   = require("montage/core/core").Montage,
     TreeNode = require("js/components/treeview/tree-node").TreeNode;
 
 exports.Leaf = Montage.create(TreeNode, {
-    hasTemplate: {
-        value: true
+
+    label: {
+        value: null,
+        serializable: true
     },
+
     templateDidLoad : {
         value: function() {
             var event = this.treeView.activationEvent;
diff --git a/js/components/ui/icon-list-basic/icon.reel/icon.js b/js/components/ui/icon-list-basic/icon.reel/icon.js
index 7d36bc59..cfda4a1a 100755
--- a/js/components/ui/icon-list-basic/icon.reel/icon.js
+++ b/js/components/ui/icon-list-basic/icon.reel/icon.js
@@ -7,7 +7,17 @@ No rights, expressed or implied, whatsoever to this software are provided by Mot
 var Montage = require("montage/core/core").Montage;
 var Component = require("montage/ui/component").Component;
 
-var Icon = exports.Icon = Montage.create(Component, {
+exports.Icon = Montage.create(Component, {
+
+    iconImg: {
+        value: null,
+        serializable: true
+    },
+
+    iconLabel: {
+        value: null,
+        serializable: true
+    },
 
     _icondata:{
         enumerable : false,
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
index 05d3ea7d..9d4e0103 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.html
@@ -16,16 +16,8 @@
                 "element": {"#": "icon"}
             },
             "bindings": {
-                "icondata": {
-                    "boundObject": {"@": "repetition1"},
-                    "boundObjectPropertyPath": "objectAtCurrentIteration",
-                    "oneway": true
-                },
-                "selectedUri": {
-                    "boundObject": {"@": "owner"},
-                    "boundObjectPropertyPath": "selected",
-                    "oneway": true
-                }
+                "icondata": {"<-": "@repetition1.objectAtCurrentIteration"},
+                "selectedUri": {"<-": "@owner.selected"}
             }
         },
 
@@ -35,20 +27,14 @@
                 "element": {"#": "iconsView"}
             },
             "bindings": {
-                "objects": {
-                    "boundObject": {"@": "owner"},
-                    "boundObjectPropertyPath": "iconsViewDataObject",
-                    "oneway": true
-                }
+                "objects": {"<-": "@owner.iconsViewDataObject"}
             }
-
         },
 
         "owner" : {
             "prototype" : "js/components/ui/icon-list-basic/iconsList.reel",
             "properties" : {
-                "element" : {"#": "list"},
-                "components": [{"@": "repetition1"}]
+                "element" : {"#": "list"}
             }
         }
     }
diff --git a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
index d36aa40f..230c7f64 100755
--- a/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
+++ b/js/components/ui/icon-list-basic/iconsList.reel/iconsList.js
@@ -9,6 +9,10 @@ var Component = require("montage/ui/component").Component;
 
 var IconsList = exports.IconsList = Montage.create(Component, {
 
+    components: {
+        value: null
+    },
+
     anItemData:{
         enumerable:true,
         value: null
diff --git a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
index a5fab11c..11d7e5b2 100755
--- a/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
+++ b/js/io/ui/file-picker/file-input-field.reel/file-input-field.js
@@ -9,6 +9,16 @@ var Montage = require("montage/core/core").Montage,
 
 var FileInputField = exports.FileInputField = Montage.create(Component, {
 
+    findDirectory: {
+        value: null,
+        serializable: true
+    },
+
+    newFileDirectory: {
+        value: null,
+        serializable: true
+    },
+
     didDraw: {
         enumerable: false,
         value: function() {
diff --git a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
index 945b0301..8295c68e 100644
--- a/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
+++ b/js/io/ui/file-picker/picker-navigator.reel/picker-navigator.js
@@ -11,6 +11,86 @@ var Montage = require("montage/core/core").Montage,
 
 var PickerNavigator = exports.PickerNavigator = Montage.create(Component, {
 
+    filterVal: {
+        value: null,
+        serializable: true
+    },
+
+    error: {
+        value: null,
+        serializable: true
+    },
+
+    addressBarUri: {
+        value: null,
+        serializable: true
+    },
+
+    forwardArrow: {
+        value: null,
+        serializable: true
+    },
+
+    backArrow: {
+        value: null,
+        serializable: true
+    },
+
+    leftNav: {
+        value: null,
+        serializable: true
+    },
+
+    iconViewContainer: {
+        value: null,
+        serializable: true
+    },
+
+    iconView: {
+        value: null,
+        serializable: true
+    },
+
+    treeView: {
+        value: null,
+        serializable: true
+    },
+
+    treeViewContainer: {
+        value: null,
+        serializable: true
+    },
+
+    okButton: {
+        value: null,
+        serializable: true
+    },
+
+    metadataSection: {
+        value: null,
+        serializable: true
+    },
+
+    filters: {
+        value: null,
+        serializable: true
+    },
+
+    refreshButton: {
+        value: null,
+        serializable: true
+    },
+
+    cancelButton: {
+        value: null,
+        serializable: true