diff --git a/composer/schema/field.py b/composer/schema/field.py
index afed0ac..52832c2 100644
--- a/composer/schema/field.py
+++ b/composer/schema/field.py
@@ -187,6 +187,7 @@ class NumberFieldInstance(FieldInstance):
         if not value:
             return None
         try:
+            #return int(str(value))
             return int(value)
         except (TypeError, ValueError):
             return float(value)
diff --git a/composer/schema/grid/field.py b/composer/schema/grid/field.py
index af359d5..c7fd645 100644
--- a/composer/schema/grid/field.py
+++ b/composer/schema/grid/field.py
@@ -59,12 +59,13 @@ class GridFieldInstance(ListFieldInstance):
     def marshall(self, value):
         if isinstance(value, basestring):
             return value
-        # TODO: marshall values!
         v = value or []
         for row in v:
-            for k, vr in row.items():
-                if isinstance(vr, basestring):
-                    row[k] = vr.replace('\n', '\\n').replace('"', '\\"')
+            #for k, vr in row.items():
+            for fi in self.columnFieldInstances:
+                vr = fi.marshall(row[fi.name])
+                #if isinstance(vr, basestring):
+                row[fi.name] = vr.replace('\n', '\\n').replace('"', '\\"')
         empty = {}
         for fi in self.columnFieldInstances:
             default = fi.default