diff --git a/.babelrc b/.babelrc
new file mode 100644
index 0000000..002b4aa
--- /dev/null
+++ b/.babelrc
@@ -0,0 +1,3 @@
+{
+  "presets": ["env"]
+}
diff --git a/index.js b/index.js
index 78e960a..dcf9533 100755
--- a/index.js
+++ b/index.js
@@ -49,7 +49,9 @@ function getGraphQLValue(value) {
             return getGraphQLValue(item);
             }).join();
         value = `[${value}]`;
-      } else if ("object" === typeof value) {
+      } else if (value instanceof Date) {
+        value = JSON.stringify(value);
+      } else if (value !== null & "object" === typeof value) {
       /*if (value.toSource)
             value = value.toSource().slice(2,-2);
         else*/
diff --git a/lib/index.js b/lib/index.js
new file mode 100755
index 0000000..830d66a
--- /dev/null
+++ b/lib/index.js
@@ -0,0 +1,150 @@
+"use strict";
+
+//=====================================================
+//============================ parce properties to find
+//=====================================================
+
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+function parceFind(_levelA) {
+
+    //+++++++++++++++++++++++++++++++++++ work over Array
+    //++++++++++++++++++++++++++++++++++++++++++++++++++++
+
+    var propsA = _levelA.map(function (currentValue, index) {
+
+        var itemX = _levelA[index];
+
+        if (itemX instanceof Query) {
+            return itemX.toString();
+        } else if (!Array.isArray(itemX) && "object" === (typeof itemX === "undefined" ? "undefined" : _typeof(itemX))) {
+            var _propsA = Object.keys(itemX);
+            if (1 !== _propsA.length) {
+                throw new RangeError("Alias objects should only have one value. was passed: " + JSON.stringify(itemX));
+            }
+            var propS = _propsA[0];
+            var item = itemX[propS];
+            // contributor: https://github.com/charlierudolph/graphql-query-builder/commit/878328e857e92d140f5ba6f7cfe07837620ec490
+            if (Array.isArray(item)) {
+                return new Query(propS).find(item);
+            }
+            return propS + " : " + item + " ";
+        } else if ("string" === typeof itemX) {
+            return itemX;
+        } else {
+            throw new RangeError("cannot handle Find value of " + itemX);
+        }
+    });
+
+    return propsA.join(",");
+}
+
+//=====================================================
+//=================================== get GraphQL Value
+//=====================================================
+
+function getGraphQLValue(value) {
+    if ("string" === typeof value) {
+        value = JSON.stringify(value);
+    } else if (Array.isArray(value)) {
+        value = value.map(function (item) {
+            return getGraphQLValue(item);
+        }).join();
+        value = "[" + value + "]";
+    } else if (value instanceof Date) {
+        value = JSON.stringify(value);
+    } else if (value !== null & "object" === (typeof value === "undefined" ? "undefined" : _typeof(value))) {
+        /*if (value.toSource)
+              value = value.toSource().slice(2,-2);
+          else*/
+        value = objectToString(value);
+        //console.error("No toSource!!",value);
+    }
+    return value;
+}
+
+function objectToString(obj) {
+
+    var sourceA = [];
+
+    for (var prop in obj) {
+        if ("function" === typeof obj[prop]) {
+            continue;
+        }
+        // if ("object" === typeof obj[prop]) {
+        sourceA.push(prop + ":" + getGraphQLValue(obj[prop]));
+        // } else {
+        //      sourceA.push(`${prop}:${obj[prop]}`);
+        // }
+    }
+    return "{" + sourceA.join() + "}";
+}
+
+//=====================================================
+//========================================= Query Class
+//=====================================================
+
+function Query(_fnNameS, _aliasS_OR_Filter) {
+    var _this = this;
+
+    this.fnNameS = _fnNameS;
+    this.headA = [];
+
+    this.filter = function (filtersO) {
+
+        for (var propS in filtersO) {
+            if ("function" === typeof filtersO[propS]) {
+                continue;
+            }
+            var val = getGraphQLValue(filtersO[propS]);
+            if ("{}" === val) {
+                continue;
+            }
+            _this.headA.push(propS + ":" + val);
+        }
+        return _this;
+    };
+
+    if ("string" === typeof _aliasS_OR_Filter) {
+        this.aliasS = _aliasS_OR_Filter;
+    } else if ("object" === (typeof _aliasS_OR_Filter === "undefined" ? "undefined" : _typeof(_aliasS_OR_Filter))) {
+        this.filter(_aliasS_OR_Filter);
+    } else if (undefined === _aliasS_OR_Filter && 2 === arguments.length) {
+        throw new TypeError("You have passed undefined as Second argument to 'Query'");
+    } else if (undefined !== _aliasS_OR_Filter) {
+        throw new TypeError("Second argument to 'Query' should be an alias name(String) or filter arguments(Object). was passed " + _aliasS_OR_Filter);
+    }
+
+    this.setAlias = function (_aliasS) {
+        _this.aliasS = _aliasS;
+        return _this;
+    };
+
+    this.find = function (findA) {
+        // THIS NEED TO BE A "FUNCTION" to scope 'arguments'
+        if (!findA) {
+            throw new TypeError("find value can not be >>falsy<<");
+        }
+        // if its a string.. it may have other values
+        // else it sould be an Object or Array of maped values
+        this.bodyS = parceFind(Array.isArray(findA) ? findA : Array.from(arguments));
+        return this;
+    };
+}
+
+//=====================================================
+//===================================== Query prototype
+//=====================================================
+
+Query.prototype = {
+
+    toString: function toString() {
+        if (undefined === this.bodyS) {
+            throw new ReferenceError("return properties are not defined. use the 'find' function to defined them");
+        }
+
+        return (this.aliasS ? this.aliasS + ":" : "") + " " + this.fnNameS + " " + (0 < this.headA.length ? "(" + this.headA.join(",") + ")" : "") + "  { " + this.bodyS + " }";
+    }
+};
+
+module.exports = Query;
\ No newline at end of file
diff --git a/package.json b/package.json
index 4c5f302..16a4605 100644
--- a/package.json
+++ b/package.json
@@ -2,19 +2,22 @@
   "name": "graphql-query-builder",
   "version": "1.0.7",
   "description": "a simple but powerful graphQL query builder",
-  "main": "index.js",
+  "main": "lib/index.js",
   "bin": {},
   "directories": {
     "example": "example"
   },
   "dependencies": {},
   "devDependencies": {
+    "babel-cli": "^6.24.1",
+    "babel-preset-env": "^1.6.0",
     "chai": "^3.5.0",
     "coveralls": "^2.11.12",
     "istanbul": "^0.4.4",
     "mocha": "^3.0.1"
   },
   "scripts": {
+    "build": "babel index.js -d lib",
     "test": "mocha ./test.js",
     "test-travis": "./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha -- -R spec ./test.js"
   },