diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3a4edf6
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.project
diff --git a/CHANGELOG b/CHANGELOG
index c7e8092..4562fa1 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,11 @@
+v6 11/20/2010
+  Simplified the "setDefault" functions to be a single function call that takes in a selector
+  Implemented issue 5 -- JSS now supports comma delimited selectors (ex "#Label1,#Label2,.Label3 { text: 'Hi!' }")
+  Fixed issue 7 -- includeJSSGlobal broken by subdirectories
+  Implemented issue 8 -- Create test / demo project
+  Included json.org's JSON2 functions as redux.JSON to contend with Titanium's misimplementation on Android
+  Tweaked global storage to use json.org's JSON2 functions instead of Titanium's
+
 v5 11/18/2010
 	Added two new include functions: includeJSSGlobal and includeGlobal
 	JSS now caches cross context, so the parsing performance hit is reduced
diff --git a/README b/README
index 45ab823..acf9083 100644
--- a/README
+++ b/README
@@ -40,18 +40,14 @@ Include files or JSS across all of your JavaScript contexts, so long as they hav
 **Normal Code**
 <pre>
 /* In every file */
-Ti.include('a.js');
-Ti.include('b.js');
-Ti.include('c.js');
+Ti.include('a.js', 'b.js', 'c.js');
 </pre>
 
 **Redux Code**
 <pre>
 /* In your app.js */
 Ti.include('redux.js');
-includeGlobal('a.js');
-includeGlobal('b.js');
-includeGlobal('c.js');
+includeGlobal('a.js', 'b.js', 'c.js');
 includeJSSGlobal('d.jss');
 
 /* In your other js files */
@@ -120,7 +116,7 @@ var label = new Label();
 alert(label.font.fontWeight == 'bold');</pre>		
 
 
-UI PROPERTY DEFAULTS BY ID AND CLASS NAME
+UI PROPERTY DEFAULTS BY SELECTOR
 ----------------------------------------------
 
 Using a similar method to setting UI Property Defaults by Element Type, you can set them
@@ -131,8 +127,8 @@ important than default properties by element type and class names, and will over
 <pre>Not Supported</pre>	
 
 **Redux Code**		
-<pre>$.setDefaultByID('myID', { text: 'Hello, World!', color: 'red' });	
-$.setDefaultByClassName('myClass', { font: { fontSize: 12 }, color: 'green' });
+<pre>$.setDefault('#myID', { text: 'Hello, World!', color: 'red' });	
+$.setDefault('.myClassName', { font: { fontSize: 12 }, color: 'green' });
 var label = new Label({ id: 'myID', className: 'myClass', color: 'blue' });	
 alert(label.text == 'Hello, World!');	
 alert(label.color == 'blue');
@@ -207,11 +203,15 @@ Label {
     text: 'Hello, World!'
 }
 [Platform.locale="es"] #HelloWorld {
-    text: 'ˇBienvenido, Mundo!'
+    text: 'Bienvenido, Mundo!'
 }
-/* select by className */
+/* by className */
 .myClass {
 	text: 'Set by class'
+}
+/* by multiple selectors */
+.selector1, #selector2, Label {
+  text: 'Set for all three selectors'
 }</pre>
 
 
@@ -224,11 +224,9 @@ Here are some key features to note--you'll want to use them:
 	6) White space doesn't matter; put it where you want it.
 	7) You can localize your app using the [Platform.locale="whatever"] attribute.
 	8) The includeJSS function can take in multiple files or just one; it's up to you.
-	9) #HelloWorld has higher precedence than the Label rule.
-
-Here are some things you CANNOT do yet, but that will be supported soon:
-	1) Chaining selectors (ie Window, Label { backgroundColor: '#fff' }).
-	2) Chaining attributes (ie Window[Platform.osname="iphone"][Platform.osname="ipad"]).
+  9) #HelloWorld has higher precedence than the Label rule.
+  10) Chain selectors to reduce the amount of JSS you need to write (ie Window, Label { backgroundColor: '#fff' }).
+  11) Chaining attributes (ie [Platform.osname="iphone"][Platform.osname="ipad"] Window { backgroundColor: '#bef'}).
 
 
 CONTACT INFORMATION
diff --git a/redux.js b/redux.js
index 66a7879..0796d18 100644
--- a/redux.js
+++ b/redux.js
@@ -1,60 +1,197 @@
 /*!
-* Appcelerator Redux v5 by Dawson Toth
+* Appcelerator Redux v6 by Dawson Toth
 * http://tothsolutions.com/
+*
+* NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
 */
 
 /**
-* Create shorthand for commonly used functions.
-*/
+ * Create shorthand for commonly used functions.
+ */
 var info = Ti.API.info,
-	error = Ti.API.error,
-	warn = Ti.API.warn,
-	log = Ti.API.log,
-	include = Ti.include;
+error = Ti.API.error,
+warn = Ti.API.warn,
+log = Ti.API.log,
+include = Ti.include;
 
 /**
-* Provide a central context for dealing with elements and configuring redux.
-*/
+ * Provide a central context for dealing with elements and configuring redux.
+ */
 var redux = function (selector) {
     return new redux.fn.init(selector);
 };
+/*
+ * Include the json2.js JSON definition, because Titanium's Android JSON function doesn't stringify arrays properly as of 1.4.2.
+ *
+ * http://www.JSON.org/json2.js
+ * 2010-11-17
+ * Public Domain.
+ * NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
+ * See http://www.JSON.org/js.html
+ */
+redux.JSON={};
+(function() {
+    function l(b) {
+        return b<10?"0"+b:b;
+    }
+
+    function o(b) {
+        p.lastIndex=0;
+        return p.test(b)?'"'+b.replace(p, function(f) {
+            var c=r[f];
+            return typeof c==="string"?c:"\\u"+("0000"+f.charCodeAt(0).toString(16)).slice(-4);
+        })+'"':'"'+b+'"';
+    }
+
+    function m(b,f) {
+        var c,d,g,j,i=h,e,a=f[b];
+        if(a&&typeof a==="object"&&typeof a.toJSON==="function") {
+            a=a.toJSON(b);
+        }
+        if(typeof k==="function") {
+            a=k.call(f,b,a);
+        }
+        switch(typeof a) {
+            case "string":
+                return o(a);
+            case "number":
+                return isFinite(a)?String(a):"null";
+            case "boolean":
+            case "null":
+                return String(a);
+            case "object":
+                if(!a) {
+                    return"null";
+                }
+                h+=n;
+                e=[];
+                if(Object.prototype.toString.apply(a)==="[object Array]") {
+                    j=a.length;
+                    for(c=0;c<j;c+=1) {
+                        e[c]=m(c,a)||"null";
+                    }
+                    g=e.length===0?"[]":h?"[\n"+h+e.join(",\n"+h)+"\n"+i+"]":"["+e.join(",")+"]";
+                    h=i;
+                    return g;
+                }
+                if(k&&typeof k==="object") {
+                    j=k.length;
+                    for(c=0;c<j;c+=1) {
+                        d=k[c];
+                        if(typeof d==="string") {
+                            if(g=m(d,a)) {
+                                e.push(o(d)+(h?": ":":")+g);
+                            }
+                        }
+                    }
+                } else {
+                    for(d in a) {
+                        if(Object.hasOwnProperty.call(a,d)) {
+                            if(g=m(d,a)) {
+                                e.push(o(d)+(h?": ":":")+g);
+                            }
+                        }
+                    }
+                }
+                g=e.length===0?"{}":h?"{\n"+h+e.join(",\n"+h)+"\n"+i+"}":"{"+e.join(",")+"}";
+                h=i;
+                return g;
+        }
+    }
+
+    if(typeof Date.prototype.toJSON!=="function") {
+        Date.prototype.toJSON= function() {
+            return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+l(this.getUTCMonth()+1)+"-"+l(this.getUTCDate())+"T"+l(this.getUTCHours())+":"+l(this.getUTCMinutes())+":"+l(this.getUTCSeconds())+"Z":null;
+        };
+        String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON= function() {
+            return this.valueOf();
+        };
+    }
+    var q=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+    p=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,h,n,r={"\u0008":"\\b","\t":"\\t","\n":"\\n","\u000c":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},k;
+    redux.JSON.stringify= function(b,f,c) {
+        var d;
+        n=h="";
+        if(typeof c==="number") {
+            for(d=0;d<c;d+=1) {
+                n+=" ";
+            }
+        } else if(typeof c==="string") {
+            n=c;
+        }
+        if((k=f)&&typeof f!=="function"&&(typeof f!=="object"||typeof f.length!=="number")) {throw Error("JSON.stringify");
+        }
+        return m("",{"":b});
+    };
+    redux.JSON.parse= function(b,f) {
+        function c(g,j) {
+            var i,e,a=g[j];
+            if(a&&typeof a==="object") {
+                for(i in a) {
+                    if(Object.hasOwnProperty.call(a,i)) {
+                        e=c(a,i);
+                        if(e!==undefined) {
+                            a[i]=e;
+                        } else {
+                            delete a[i];
+                        }
+                    }
+                }
+            }
+            return f.call(g,j,a);
+        }
 
+        var d;
+        b=String(b);
+        q.lastIndex=0;
+        if(q.test(b)) {
+            b=b.replace(q, function(g) {
+                return"\\u"+("0000"+g.charCodeAt(0).toString(16)).slice(-4);
+            });
+        }
+        if(/^[\],:{}\s]*$/.test(b.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,
+        "]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))) {
+            d=eval("("+b+")");
+            return typeof f==="function"?c({"":d},""):d;
+        }throw new SyntaxError("JSON.parse");
+    };
+})();
 /**
-* Tracks and stores various data for redux, like events, elements, and included files.
-*/
+ * Tracks and stores various data for redux, like events, elements, and included files.
+ */
 redux.data = {
     events: [
-		'beforeload', 'blur', 'change', 'click', 'close', 'dblclick', 'delete', 'doubletap',
-	    'error', 'focus', 'load', 'move', 'open', 'return', 'scroll', 'scrollEnd', 'selected', 'singletap',
-	    'swipe', 'touchcancel', 'touchend', 'touchmove', 'touchstart', 'twofingertap'
-	],
+    'beforeload', 'blur', 'change', 'click', 'close', 'dblclick', 'delete', 'doubletap',
+    'error', 'focus', 'load', 'move', 'open', 'return', 'scroll', 'scrollEnd', 'selected', 'singletap',
+    'swipe', 'touchcancel', 'touchend', 'touchmove', 'touchstart', 'twofingertap'
+    ],
     types: {
         Contacts: [
-			'Group', 'Person'
-		],
+        'Group', 'Person'
+        ],
         Facebook: [
-			'LoginButton'
-		],
+        'LoginButton'
+        ],
         Filesystem: [
-			'File', 'TempDirectory', 'TempFile'
-		],
+        'File', 'TempDirectory', 'TempFile'
+        ],
         Media: [
-			'AudioPlayer', 'AudioRecorder', 'Item', 'MusicPlayer', 'Sound', 'VideoPlayer'
-		],
+        'AudioPlayer', 'AudioRecorder', 'Item', 'MusicPlayer', 'Sound', 'VideoPlayer'
+        ],
         Network: [
-			'BonjourBrowser', 'BonjourService', 'HTTPClient', 'TCPSocket'
-		],
+        'BonjourBrowser', 'BonjourService', 'HTTPClient', 'TCPSocket'
+        ],
         Platform: [
-			'UUID'
-		],
+        'UUID'
+        ],
         UI: [
-		    '2DMatrix', '3DMatrix', 'ActivityIndicator', 'AlertDialog', 'Animation', 'Button',
-		    'ButtonBar', 'CoverFlowView', 'DashboardItem', 'DashboardView', 'EmailDialog',
-		    'ImageView', 'Label', 'OptionDialog', 'Picker', 'PickerColumn', 'PickerRow',
-		    'ProgressBar', 'ScrollView', 'ScrollableView', 'SearchBar', 'Slider', 'Switch',
-		    'Tab', 'TabGroup', 'TabbedBar', 'TableView', 'TableViewRow', 'TableViewSection',
-		    'TextArea', 'TextField', 'Toolbar', 'View', 'WebView', 'Window'
-		]
+        '2DMatrix', '3DMatrix', 'ActivityIndicator', 'AlertDialog', 'Animation', 'Button',
+        'ButtonBar', 'CoverFlowView', 'DashboardItem', 'DashboardView', 'EmailDialog',
+        'ImageView', 'Label', 'OptionDialog', 'Picker', 'PickerColumn', 'PickerRow',
+        'ProgressBar', 'ScrollView', 'ScrollableView', 'SearchBar', 'Slider', 'Switch',
+        'Tab', 'TabGroup', 'TabbedBar', 'TableView', 'TableViewRow', 'TableViewSection',
+        'TextArea', 'TextField', 'Toolbar', 'View', 'WebView', 'Window'
+        ]
     },
     maps: {
         byID: {},
@@ -68,29 +205,34 @@ redux.data = {
     },
     global: {
         /* dynamically generated based on variables in Ti.App.redux */
+        jss: '', files: '', parsedjss: ''
     }
 };
-for (var i in { jss: '', files: '', parsedjss: '' }) {
-    (function (i) {
-        redux.data.global['get' + i] = function () {
-            if (!Ti.App['redux-' + i]) {
-                return [];
-            }
-            return JSON.parse(Ti.App['redux-' + i]);
-        };
-        redux.data.global['set' + i] = function (value) { Ti.App['redux-' + i] = JSON.stringify(value); };
-    })(i);
+for (var i in redux.data.global) {
+    if (redux.data.global.hasOwnProperty(i)) {
+        (function (i) {
+            redux.data.global['get' + i] = function () {
+                if (!Ti.App['redux-' + i]) {
+                    return null;
+                }
+                return redux.JSON.parse(Ti.App['redux-' + i]);
+            };
+            redux.data.global['set' + i] = function (value) {
+                Ti.App['redux-' + i] = redux.JSON.stringify(value);
+            };
+        })(i);
+    }
 }
 
 /**
-* The core redux functions.
-*/
+ * The core redux functions.
+ */
 redux.fn = redux.prototype = {
     /**
-    * Returns the objects that match your selector, or the root redux object if you did not provide a selector. Note that only
-    * objects created by redux constructors can be selected (ex use new Label() instead of Ti.UI.createLabel()).
-    * @param {Object} selector
-    */
+     * Returns the objects that match your selector, or the root redux object if you did not provide a selector. Note that only
+     * objects created by redux constructors can be selected (ex use new Label() instead of Ti.UI.createLabel()).
+     * @param {Object} selector
+     */
     init: function (selector) {
         if (!selector) {
             return this;
@@ -118,80 +260,79 @@ redux.fn = redux.prototype = {
         return redux.fn.mergeObjects(this, this.context);
     },
     /**
-    * Includes one or more files in every JavaScript context that that will exist, so long as redux is loaded
-    * with it.
-    * @param {Array} One or more files to include globally
-    */
+     * Includes one or more files in every JavaScript context that that will exist, so long as redux is loaded
+     * with it.
+     * @param {Array} One or more files to include globally
+     */
     includeGlobal: function () {
-        var files = redux.data.global.getfiles();
+        var files = redux.data.global.getfiles() || [];
         for (var i = 0; i < arguments.length; i++) {
             if (!redux.fn.contains(arguments[i], files)) {
                 files.push(arguments[i]);
-                redux.data.global.setfiles(files);
                 include(arguments[i]);
             }
         }
+        redux.data.global.setfiles(files);
     },
     /**
-    * Turns a string of JSS into JavaScript that can be safely evaluated. JSS is a way to create JavaScript
-    * objects quickly, and is primarily used to style your UI elements.
-    * 
-    * Inspired by, but not derived from, John Resig's Micro-Templating
-    * http://ejohn.org/blog/javascript-micro-templating/
-    *
-    * @param {String} The raw JSS contents to parse into executable JavaScript
-    * @returns Executable JavaScript
-    */
+     * Turns a string of JSS into JavaScript that can be safely evaluated. JSS is a way to create JavaScript
+     * objects quickly, and is primarily used to style your UI elements.
+     *
+     * Inspired by, but not derived from, John Resig's Micro-Templating
+     * http://ejohn.org/blog/javascript-micro-templating/
+     *
+     * @param {String} The raw JSS contents to parse into executable JavaScript
+     * @returns Executable JavaScript
+     */
     parseJSS: function (file) {
-        var parsedJSS = redux.data.global.getparsedjss();
-        if (parsedJSS[file]) {
-            return parsedJSS[file];
+        var parsedjss = redux.data.global.getparsedjss() || {};
+        if (parsedjss[file]) {
+            return parsedjss[file];
         }
-        var parsed = ('\n' + Ti.Filesystem.getFile(file).read())
-            .split('}').join('});') // close off everywhere we find a curly brace (yes, even nested braces)
-            .replace(/}\);\s*}\);/gm, '}}\);').replace(/}\);,/g, '},') // fix any nested braces that we over closed
-            .replace(/\n\s+/gm, '\n') // remove extra white space
-            .split('=').join('==') // replace the equal signs in attributes with the proper comparison operator
-            .split('!==').join('!=') // fix extra equal sign we added to inequality operator
-            .split('[').join('[Ti.') // add the Ti. namespace to all attributes
-            .replace(/\n\[([^\]]+)\]/gm, 'if($1)\n') // finish replacing attributes with an if statement
-            .replace(/\n\.([^{]+)\s*\{/gm, 'redux.fn.setDefaultByClassName("$1".split(" ").join(""),{') // replace all .classNames with a call to redux.setDefaultByClassName
-            .replace(/\n#([^{]+)\s*\{/gm, 'redux.fn.setDefaultByID("$1".split(" ").join(""),{') // replace all #ids with a call to redux.fn.setDefaultByID
-            .replace(/\n([a-zA-Z0-9_-]+)\s*\{/gm, 'redux.fn.setDefaultByType("$1",{');   // replace the other selects with a call to redux.fn.setDefaultByType
-        parsedJSS[file] = parsed;
-        redux.data.global.setparsedjss(parsedJSS);
+        var parsed = ('({\n}\n' + Ti.Filesystem.getFile(file).read()) // append nonesense to avoid fringe cases in our regex below
+        .replace(/\/\*[^*]*\*\//gm, '') // replace C style comments
+        .split('}').join('});\n') // close off everywhere we find a curly brace (yes, even nested braces)
+        .replace(/\}\);\s*\}\);/gm, '}});\n').replace(/\}\);\s*,/g, '},') // fix any nested braces that we over closed
+        .replace(/\n\s+/gm, '\n') // remove extra white space
+        .split('=').join('==') // replace the equal signs in attributes with the proper comparison operator
+        .split('!==').join('!=') // fix extra equal sign we added to inequality operator
+        .split('[').join('[Ti.') // add the Ti. namespace to all attributes
+        .replace(/\n\[([^\]]+)\]/gm, '\nif($1)\n') // finish replacing attributes with an if statement
+        .replace(/\n([#.,_\-\sA-Za-z0-9]+)\{/gm, '\nredux.fn.setDefault("$1",{'); // replace all selectors with a call to redux.setDefault
+        parsedjss[file] = parsed;
+        redux.data.global.setparsedjss(parsedjss);
         return parsed;
     },
     /**
-    * Includes and parses one or more JSS files. Styles will be applied to any elements you create after calling this.
-    * @param {Array} One or more JSS files to include and parse
-    */
+     * Includes and parses one or more JSS files. Styles will be applied to any elements you create after calling this.
+     * @param {Array} One or more JSS files to include and parse
+     */
     includeJSS: function () {
         for (var i = 0; i < arguments.length; i++) {
             eval(redux.fn.parseJSS(arguments[i]));
         }
     },
     /**
-    * Includes and parses one or more JSS file in every JavaScript context that will exist, so long as
-    * redux is loaded within it.
-    * @param {Array} One or more JSS files to include globally
-    */
+     * Includes and parses one or more JSS file in every JavaScript context that will exist, so long as
+     * redux is loaded within it.
+     * @param {Array} One or more JSS files to include globally
+     */
     includeJSSGlobal: function () {
-        var files = redux.data.global.getjss();
+        var files = redux.data.global.getjss() || [];
         for (var i = 0; i < arguments.length; i++) {
             if (!redux.fn.contains(arguments[i], files)) {
                 files.push(arguments[i]);
-                redux.data.global.setjss(files);
                 redux.fn.includeJSS(arguments[i]);
             }
         }
+        redux.data.global.setjss(files);
     },
     /**
-    * Returns true if the element is in the array.
-    * @param {Object} element
-    * @param {Object} array
-    * @return {Boolean} true if the element is in the array
-    */
+     * Returns true if the element is in the array.
+     * @param {Object} element
+     * @param {Object} array
+     * @return {Boolean} true if the element is in the array
+     */
     contains: function (element, array) {
         if (array.indexOf) {
             return array.indexOf(element) !== -1;
@@ -204,55 +345,51 @@ redux.fn = redux.prototype = {
         return false;
     },
     /**
-    * Merges the properties of the two objects.
-    * @param {Object} original
-    * @param {Object} overrider
-    */
+     * Merges the properties of the two objects.
+     * @param {Object} original
+     * @param {Object} overrider
+     */
     mergeObjects: function mergeObjects(original, overrider) {
-        if (original == null)
+        if (original == null) {
             return overrider || {};
-        if (overrider == null)
+        }
+        if (overrider == null) {
             return original;
+        }
         for (var index in overrider) {
-            if (!overrider.hasOwnProperty(index))
-                continue;
-            if (typeof original[index] == 'undefined')
-                original[index] = overrider[index];
-            else if (typeof overrider[index] == 'object') {
-                original[index] = mergeObjects(original[index], overrider[index]);
+            if (overrider.hasOwnProperty(index)) {
+                if (typeof original[index] == 'undefined') {
+                    original[index] = overrider[index];
+                } else if (typeof overrider[index] == 'object') {
+                    original[index] = mergeObjects(original[index], overrider[index]);
+                }
             }
         }
         return original;
     },
     /**
-    * Adds an event binder that can bind listen events or fire events, similar to how jQuery's events stack works.
-    * @param {Object} event
-    */
+     * Adds an event binder that can bind listen events or fire events, similar to how jQuery's events stack works.
+     * @param {Object} event
+     */
     addEventBinder: function (event) {
         redux.fn.init.prototype[event] = function () {
-            if (arguments.length == 0) {
-                for (var i = 0; i < this.context.length; i++) {
-                    this.context[i].fireEvent(event, arguments[0]);
-                }
-            }
-            else if (arguments[0] instanceof Function) {
-                for (var i = 0; i < this.context.length; i++) {
-                    this.context[i].addEventListener(event, arguments[0]);
-                }
+            var action;
+            if (arguments.length == 0 || !(arguments[0] instanceof Function)) {
+                action = 'fireEvent';
+            } else {
+                action = 'addEventListener';
             }
-            else {
-                for (var i = 0; i < this.context.length; i++) {
-                    this.context[i].fireEvent(event, arguments[0]);
-                }
+            for (var i = 0; i < this.context.length; i++) {
+                this.context[i][action](event, arguments[0]);
             }
             return this;
         };
     },
     /**
-    * Starts tracking an element with redux. This lets us select the element later by its ID
-    * class or type.
-    * @param {Object} element
-    */
+     * Starts tracking an element with redux. This lets us select the element later by its ID
+     * class or type.
+     * @param {Object} element
+     */
     trackElement: function (element) {
         var maps = redux.data.maps;
         if (element.id) {
@@ -262,125 +399,124 @@ redux.fn = redux.prototype = {
             if (!maps.byClassName[element.className]) {
                 maps.byClassName[element.className] = [];
                 maps.byClassName[element.className].push(element);
-            }
-            else if (!redux.fn.contains(element, maps.byClassName[element.className])) {
+            } else if (!redux.fn.contains(element, maps.byClassName[element.className])) {
                 maps.byClassName[element.className].push(element);
             }
         }
         if (!maps.byType[element.toString()]) {
             maps.byType[element.toString()] = [];
             maps.byType[element.toString()].push(element);
-        }
-        else if (!redux.fn.contains(element, maps.byType[element.toString()])) {
+        } else if (!redux.fn.contains(element, maps.byType[element.toString()])) {
             maps.byType[element.toString()].push(element);
         }
     },
     /**
-    * Set the default properties for an element with a particular ID.
-    * @param {Object} id
-    * @param {Object} defaults
-    */
-    setDefaultByID: function (id, defaults) {
-        redux.data.defaults.byID[id] = this.mergeObjects(redux.data.defaults.byID[id], defaults);
-    },
-    /**
-    * Set the default properties for all elements with a particular class name.
-    * @param {Object} className
-    * @param {Object} defaults
-    */
-    setDefaultByClassName: function (className, defaults) {
-        redux.data.defaults.byClassName[className] = this.mergeObjects(redux.data.defaults.byClassName[className], defaults);
-    },
-    /**
-    * Set the default properties for all elements of a particular type.
-    * @param {Object} type
-    * @param {Object} defaults
-    */
-    setDefaultByType: function (type, defaults) {
-        redux.data.defaults.byType[type] = this.mergeObjects(redux.data.defaults.byType[type], defaults);
+     * Set the default properties for any elements matched by the JSS selector.
+     * @param {Object} selector
+     * @param {Object} defaults
+     */
+    setDefault: function (selector, defaults) {
+        var selectors = selector.split(',');
+        for (var i = 0; i < selectors.length; i++) {
+            var cleanSelector = selectors[i].split(' ').join(''); // remove spaces
+            var target;
+            switch (cleanSelector.charAt(0)) {
+                case '#': // set by ID
+                    target = redux.data.defaults.byID;
+                    cleanSelector = cleanSelector.substring(1); // remove the '#'
+                    break;
+                case '.': // set by className
+                    target = redux.data.defaults.byClassName;
+                    cleanSelector = cleanSelector.substring(1); // remove the '.'
+                    break;
+                default: // set by element type
+                    target = redux.data.defaults.byType;
+                    break;
+            }
+            target[cleanSelector] = this.mergeObjects(target[cleanSelector] || {}, defaults);
+        }
+        return this;
     }
 };
 
-/** 
-* Add shorthand events.
-*/
+/**
+ * Add shorthand events.
+ */
 for (var i = 0; i < redux.data.events.length; i++) {
     redux.fn.addEventBinder(redux.data.events[i]);
 }
 
 /**
-* Add natural constructors and shortcuts to setting defaults by type.
-*/
+ * Add natural constructors and shortcuts to setting defaults by type.
+ */
 for (var i in redux.data.types) {
     // iterate over type namespaces (UI, Network, Facebook, etc)
-    if (!redux.data.types.hasOwnProperty(i)) {
-        continue;
-    }
-    for (var j = 0; j < redux.data.types[i].length; j++) {
-        // iterate over types within parent namespace (Label, LoginButton, HTTPClient, etc)
-        (function (parent, type) {
-            /**
-            * Natural constructors for all the different things you can create with Ti, like Labels, LoginButtons, HTTPClients, etc.
-            * @param {Object} args
-            */
-            this[type] = function cstor(args) {
-                if (!(this instanceof arguments.callee)) {
-                    return new cstor(args);
-                }
-                // merge defaults by id
-                if (args && args.id && redux.data.defaults.byID[args.id]) {
-                    args = redux.fn.mergeObjects(args, redux.data.defaults.byID[args.id]);
-                }
-                // merge defaults by class name
-                if (args && args.className && redux.data.defaults.byClassName[args.className]) {
-                    args = redux.fn.mergeObjects(args, redux.data.defaults.byClassName[args.className]);
-                }
-                // merge defaults by type
-                args = redux.fn.mergeObjects(args, redux.data.defaults.byType[type]);
-                // return created object with merged defaults by type
-                var createdElement = Ti[parent]['create' + type](args);
-                redux.fn.trackElement(createdElement);
-                return createdElement;
-            };
-            /**
-            * Shortcut to setting defaults by type. Will only apply to objects you create in the future using redux's constructors.
-            * @param {Object} args
-            */
-            this[type].setDefault = function (args) {
-                redux.fn.setDefaultByType(type, args);
-            };
-        })(i, redux.data.types[i][j]);
+    if (redux.data.types.hasOwnProperty(i)) {
+        for (var j = 0; j < redux.data.types[i].length; j++) {
+            // iterate over types within parent namespace (Label, LoginButton, HTTPClient, etc)
+            (function (parent, type) {
+                /**
+                 * Natural constructors for all the different things you can create with Ti, like Labels, LoginButtons, HTTPClients, etc.
+                 * @param {Object} args
+                 */
+                this[type] = function cstor(args) {
+                    if (!(this instanceof arguments.callee)) {
+                        return new cstor(args);
+                    }
+                    // merge defaults by id
+                    if (args && args.id && redux.data.defaults.byID[args.id]) {
+                        args = redux.fn.mergeObjects(args, redux.data.defaults.byID[args.id]);
+                    }
+                    // merge defaults by class name
+                    if (args && args.className && redux.data.defaults.byClassName[args.className]) {
+                        args = redux.fn.mergeObjects(args, redux.data.defaults.byClassName[args.className]);
+                    }
+                    // merge defaults by type
+                    args = redux.fn.mergeObjects(args, redux.data.defaults.byType[type]);
+                    // return created object with merged defaults by type
+                    var createdElement = Ti[parent]['create' + type](args);
+                    redux.fn.trackElement(createdElement);
+                    return createdElement;
+                };
+                /**
+                 * Shortcut to setting defaults by type. Will only apply to objects you create in the future using redux's constructors.
+                 * @param {Object} args
+                 */
+                this[type].setDefault = function (args) {
+                    redux.fn.setDefault(type, args);
+                };
+            })(i, redux.data.types[i][j]);
+        }
     }
 }
 
-
 /**
-* Includes a file in every JavaScript context with redux loaded that exists or that will exist.
-*/
+ * Includes a file in every JavaScript context with redux loaded that exists or that will exist.
+ */
 var includeGlobal = redux.fn.includeGlobal;
 /**
-* Includes and parses one or more JSS files. Styles will be applied to any elements you create after calling this.
-*/
+ * Includes and parses one or more JSS files. Styles will be applied to any elements you create after calling this.
+ */
 var includeJSS = redux.fn.includeJSS;
 /**
-* Includes a JSS file in every JavaScript context with redux loaded that exists or that will exist.
-*/
+ * Includes a JSS file in every JavaScript context with redux loaded that exists or that will exist.
+ */
 var includeJSSGlobal = redux.fn.includeJSSGlobal;
 
 /**
-* Include any normal files or JSS files from before this context existed.
-*/
+ * Include any normal files or JSS files from before this context existed.
+ */
 (function () {
-    var jssFiles = redux.data.global.getjss();
+    var jssFiles = redux.data.global.getjss() || [];
     for (var i = 0; i < jssFiles.length; i++) {
         includeJSS(jssFiles[i]);
     }
-    var files = redux.data.global.getfiles();
-    for (var i = 0; i < files.length; i++) {
-        include(files[i]);
+    var files = redux.data.global.getfiles() || [];
+    for (var j = 0; j < files.length; j++) {
+        include(files[j]);
     }
 })();
 /**
-* Create a shorthand for redux itself -- $, if it is available.
-*/
-this.$ = this.$ || redux;
\ No newline at end of file
+ * Create a shorthand for redux itself -- $, if it is available.
+ */
+this.$ = this.$ || redux;
diff --git a/redux.min.js b/redux.min.js
index 3aef152..7684810 100644
--- a/redux.min.js
+++ b/redux.min.js
@@ -1,17 +1,24 @@
-/*!
-* Appcelerator Redux v5 by Dawson Toth
-* http://tothsolutions.com/
+/*!
+* Appcelerator Redux v6 by Dawson Toth
+* http://tothsolutions.com/
+*
+* NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
 */
-var info=Ti.API.info,error=Ti.API.error,warn=Ti.API.warn,log=Ti.API.log,include=Ti.include,redux=function(a){return new redux.fn.init(a)};
-redux.data={events:["beforeload","blur","change","click","close","dblclick","delete","doubletap","error","focus","load","move","open","return","scroll","scrollEnd","selected","singletap","swipe","touchcancel","touchend","touchmove","touchstart","twofingertap"],types:{Contacts:["Group","Person"],Facebook:["LoginButton"],Filesystem:["File","TempDirectory","TempFile"],Media:["AudioPlayer","AudioRecorder","Item","MusicPlayer","Sound","VideoPlayer"],Network:["BonjourBrowser","BonjourService","HTTPClient",
-"TCPSocket"],Platform:["UUID"],UI:["2DMatrix","3DMatrix","ActivityIndicator","AlertDialog","Animation","Button","ButtonBar","CoverFlowView","DashboardItem","DashboardView","EmailDialog","ImageView","Label","OptionDialog","Picker","PickerColumn","PickerRow","ProgressBar","ScrollView","ScrollableView","SearchBar","Slider","Switch","Tab","TabGroup","TabbedBar","TableView","TableViewRow","TableViewSection","TextArea","TextField","Toolbar","View","WebView","Window"]},maps:{byID:{},byClassName:{},byType:{}},
-defaults:{byID:{},byClassName:{},byType:{}},global:{}};for(var i in{jss:"",files:"",parsedjss:""})(function(a){redux.data.global["get"+a]=function(){if(!Ti.App["redux-"+a])return[];return JSON.parse(Ti.App["redux-"+a])};redux.data.global["set"+a]=function(b){Ti.App["redux-"+a]=JSON.stringify(b)}})(i);
-redux.fn=redux.prototype={init:function(a){if(!a)return this;this.selector=a;if(typeof a=="object"){this.context=[this[0]=a];this.length=1;return this}if(a.indexOf("#")===0){this.context=[this[0]=redux.data.maps.byID[a.split("#")[1]]];this.length=this.context!=null;return this}if(a.indexOf(".")===0){this.context=redux.data.maps.byClassName[a.split(".")[0]];return redux.fn.mergeObjects(this,this.context)}this.context=redux.data.maps.byType[a];return redux.fn.mergeObjects(this,this.context)},includeGlobal:function(){for(var a=
-redux.data.global.getfiles(),b=0;b<arguments.length;b++)if(!redux.fn.contains(arguments[b],a)){a.push(arguments[b]);redux.data.global.setfiles(a);include(arguments[b])}},parseJSS:function(a){var b=redux.data.global.getparsedjss();if(b[a])return b[a];var d=("\n"+Ti.Filesystem.getFile(a).read()).split("}").join("});").replace(/}\);\s*}\);/gm,"}});").replace(/}\);,/g,"},").replace(/\n\s+/gm,"\n").split("=").join("==").split("!==").join("!=").split("[").join("[Ti.").replace(/\n\[([^\]]+)\]/gm,"if($1)\n").replace(/\n\.([^{]+)\s*\{/gm,
-'redux.fn.setDefaultByClassName("$1".split(" ").join(""),{').replace(/\n#([^{]+)\s*\{/gm,'redux.fn.setDefaultByID("$1".split(" ").join(""),{').replace(/\n([a-zA-Z0-9_-]+)\s*\{/gm,'redux.fn.setDefaultByType("$1",{');b[a]=d;redux.data.global.setparsedjss(b);return d},includeJSS:function(){for(var a=0;a<arguments.length;a++)eval(redux.fn.parseJSS(arguments[a]))},includeJSSGlobal:function(){for(var a=redux.data.global.getjss(),b=0;b<arguments.length;b++)if(!redux.fn.contains(arguments[b],a)){a.push(arguments[b]);
-redux.data.global.setjss(a);redux.fn.includeJSS(arguments[b])}},contains:function(a,b){if(b.indexOf)return b.indexOf(a)!==-1;for(var d=0,c=b.length;d<c;d++)if(b[d]===a)return true;return false},mergeObjects:function a(b,d){if(b==null)return d||{};if(d==null)return b;for(var c in d)if(d.hasOwnProperty(c))if(typeof b[c]=="undefined")b[c]=d[c];else if(typeof d[c]=="object")b[c]=a(b[c],d[c]);return b},addEventBinder:function(a){redux.fn.init.prototype[a]=function(){if(arguments.length==0)for(var b=0;b<
-this.context.length;b++)this.context[b].fireEvent(a,arguments[0]);else if(arguments[0]instanceof Function)for(b=0;b<this.context.length;b++)this.context[b].addEventListener(a,arguments[0]);else for(b=0;b<this.context.length;b++)this.context[b].fireEvent(a,arguments[0]);return this}},trackElement:function(a){var b=redux.data.maps;if(a.id)b.byID[a.id]=a;if(a.className)if(b.byClassName[a.className])redux.fn.contains(a,b.byClassName[a.className])||b.byClassName[a.className].push(a);else{b.byClassName[a.className]=
-[];b.byClassName[a.className].push(a)}if(b.byType[a.toString()])redux.fn.contains(a,b.byType[a.toString()])||b.byType[a.toString()].push(a);else{b.byType[a.toString()]=[];b.byType[a.toString()].push(a)}},setDefaultByID:function(a,b){redux.data.defaults.byID[a]=this.mergeObjects(redux.data.defaults.byID[a],b)},setDefaultByClassName:function(a,b){redux.data.defaults.byClassName[a]=this.mergeObjects(redux.data.defaults.byClassName[a],b)},setDefaultByType:function(a,b){redux.data.defaults.byType[a]=this.mergeObjects(redux.data.defaults.byType[a],
-b)}};for(i=0;i<redux.data.events.length;i++)redux.fn.addEventBinder(redux.data.events[i]);
-for(i in redux.data.types)if(redux.data.types.hasOwnProperty(i))for(var j=0;j<redux.data.types[i].length;j++)(function(a,b){this[b]=function d(c){if(!(this instanceof arguments.callee))return new d(c);if(c&&c.id&&redux.data.defaults.byID[c.id])c=redux.fn.mergeObjects(c,redux.data.defaults.byID[c.id]);if(c&&c.className&&redux.data.defaults.byClassName[c.className])c=redux.fn.mergeObjects(c,redux.data.defaults.byClassName[c.className]);c=redux.fn.mergeObjects(c,redux.data.defaults.byType[b]);var e=
-Ti[a]["create"+b](c);redux.fn.trackElement(e);return e};this[b].setDefault=function(d){redux.fn.setDefaultByType(b,d)}})(i,redux.data.types[i][j]);var includeGlobal=redux.fn.includeGlobal,includeJSS=redux.fn.includeJSS,includeJSSGlobal=redux.fn.includeJSSGlobal;(function(){for(var a=redux.data.global.getjss(),b=0;b<a.length;b++)includeJSS(a[b]);a=redux.data.global.getfiles();for(b=0;b<a.length;b++)include(a[b])})();this.$=this.$||redux;
\ No newline at end of file
+var info=Ti.API.info,error=Ti.API.error,warn=Ti.API.warn,log=Ti.API.log,include=Ti.include,redux=function(a){return new redux.fn.init(a)};redux.JSON={};
+(function(){function a(f){return f<10?"0"+f:f}function b(f){l.lastIndex=0;return l.test(f)?'"'+f.replace(l,function(n){var g=t[n];return typeof g==="string"?g:"\\u"+("0000"+n.charCodeAt(0).toString(16)).slice(-4)})+'"':'"'+f+'"'}function d(f,n){var g,k,o,q,p=h,m,e=n[f];if(e&&typeof e==="object"&&typeof e.toJSON==="function")e=e.toJSON(f);if(typeof r==="function")e=r.call(n,f,e);switch(typeof e){case "string":return b(e);case "number":return isFinite(e)?String(e):"null";case "boolean":case "null":return String(e);
+case "object":if(!e)return"null";h+=s;m=[];if(Object.prototype.toString.apply(e)==="[object Array]"){q=e.length;for(g=0;g<q;g+=1)m[g]=d(g,e)||"null";o=m.length===0?"[]":h?"[\n"+h+m.join(",\n"+h)+"\n"+p+"]":"["+m.join(",")+"]";h=p;return o}if(r&&typeof r==="object"){q=r.length;for(g=0;g<q;g+=1){k=r[g];if(typeof k==="string")if(o=d(k,e))m.push(b(k)+(h?": ":":")+o)}}else for(k in e)if(Object.hasOwnProperty.call(e,k))if(o=d(k,e))m.push(b(k)+(h?": ":":")+o);o=m.length===0?"{}":h?"{\n"+h+m.join(",\n"+h)+
+"\n"+p+"}":"{"+m.join(",")+"}";h=p;return o}}if(typeof Date.prototype.toJSON!=="function"){Date.prototype.toJSON=function(){return isFinite(this.valueOf())?this.getUTCFullYear()+"-"+a(this.getUTCMonth()+1)+"-"+a(this.getUTCDate())+"T"+a(this.getUTCHours())+":"+a(this.getUTCMinutes())+":"+a(this.getUTCSeconds())+"Z":null};String.prototype.toJSON=Number.prototype.toJSON=Boolean.prototype.toJSON=function(){return this.valueOf()}}var c=/[\u0000\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+l=/[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,h,s,t={"\u0008":"\\b","\t":"\\t","\n":"\\n","\u000c":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\"},r;redux.JSON.stringify=function(f,n,g){var k;s=h="";if(typeof g==="number")for(k=0;k<g;k+=1)s+=" ";else if(typeof g==="string")s=g;if((r=n)&&typeof n!=="function"&&(typeof n!=="object"||typeof n.length!=="number"))throw Error("JSON.stringify");return d("",{"":f})};redux.JSON.parse=function(f,
+n){function g(o,q){var p,m,e=o[q];if(e&&typeof e==="object")for(p in e)if(Object.hasOwnProperty.call(e,p)){m=g(e,p);if(m!==undefined)e[p]=m;else delete e[p]}return n.call(o,q,e)}var k;f=String(f);c.lastIndex=0;if(c.test(f))f=f.replace(c,function(o){return"\\u"+("0000"+o.charCodeAt(0).toString(16)).slice(-4)});if(/^[\],:{}\s]*$/.test(f.replace(/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,"@").replace(/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,"]").replace(/(?:^|:|,)(?:\s*\[)+/g,""))){k=
+eval("("+f+")");return typeof n==="function"?g({"":k},""):k}throw new SyntaxError("JSON.parse");}})();
+redux.data={events:["beforeload","blur","change","click","close","dblclick","delete","doubletap","error","focus","load","move","open","return","scroll","scrollEnd","selected","singletap","swipe","touchcancel","touchend","touchmove","touchstart","twofingertap"],types:{Contacts:["Group","Person"],Facebook:["LoginButton"],Filesystem:["File","TempDirectory","TempFile"],Media:["AudioPlayer","AudioRecorder","Item","MusicPlayer","Sound","VideoPlayer"],Network:["BonjourBrowser","BonjourService","HTTPClient",
+"TCPSocket"],Platform:["UUID"],UI:["2DMatrix","3DMatrix","ActivityIndicator","AlertDialog","Animation","Button","ButtonBar","CoverFlowView","DashboardItem","DashboardView","EmailDialog","ImageView","Label","OptionDialog","Picker","PickerColumn","PickerRow","ProgressBar","ScrollView","ScrollableView","SearchBar","Slider","Switch","Tab","TabGroup","TabbedBar","TableView","TableViewRow","TableViewSection","TextArea","TextField","Toolbar","View","WebView","Window"]},maps:{byID:{},byClassName:{},byType:{}},
+defaults:{byID:{},byClassName:{},byType:{}},global:{jss:"",files:"",parsedjss:""}};for(var i in redux.data.global)redux.data.global.hasOwnProperty(i)&&function(a){redux.data.global["get"+a]=function(){if(!Ti.App["redux-"+a])return null;return redux.JSON.parse(Ti.App["redux-"+a])};redux.data.global["set"+a]=function(b){Ti.App["redux-"+a]=redux.JSON.stringify(b)}}(i);
+redux.fn=redux.prototype={init:function(a){if(!a)return this;this.selector=a;if(typeof a=="object"){this.context=[this[0]=a];this.length=1;return this}if(a.indexOf("#")===0){this.context=[this[0]=redux.data.maps.byID[a.split("#")[1]]];this.length=this.context!=null;return this}if(a.indexOf(".")===0){this.context=redux.data.maps.byClassName[a.split(".")[0]];return redux.fn.mergeObjects(this,this.context)}this.context=redux.data.maps.byType[a];return redux.fn.mergeObjects(this,this.context)},includeGlobal:function(){for(var a=
+redux.data.global.getfiles()||[],b=0;b<arguments.length;b++)if(!redux.fn.contains(arguments[b],a)){a.push(arguments[b]);include(arguments[b])}redux.data.global.setfiles(a)},parseJSS:function(a){var b=redux.data.global.getparsedjss()||{};if(b[a])return b[a];var d=("({\n}\n"+Ti.Filesystem.getFile(a).read()).replace(/\/\*[^*]*\*\//gm,"").split("}").join("});\n").replace(/\}\);\s*\}\);/gm,"}});\n").replace(/\}\);\s*,/g,"},").replace(/\n\s+/gm,"\n").split("=").join("==").split("!==").join("!=").split("[").join("[Ti.").replace(/\n\[([^\]]+)\]/gm,
+"\nif($1)\n").replace(/\n([#.,_\-\sA-Za-z0-9]+)\{/gm,'\nredux.fn.setDefault("$1",{');b[a]=d;redux.data.global.setparsedjss(b);return d},includeJSS:function(){for(var a=0;a<arguments.length;a++)eval(redux.fn.parseJSS(arguments[a]))},includeJSSGlobal:function(){for(var a=redux.data.global.getjss()||[],b=0;b<arguments.length;b++)if(!redux.fn.contains(arguments[b],a)){a.push(arguments[b]);redux.fn.includeJSS(arguments[b])}redux.data.global.setjss(a)},contains:function(a,b){if(b.indexOf)return b.indexOf(a)!==
+-1;for(var d=0,c=b.length;d<c;d++)if(b[d]===a)return true;return false},mergeObjects:function a(b,d){if(b==null)return d||{};if(d==null)return b;for(var c in d)if(d.hasOwnProperty(c))if(typeof b[c]=="undefined")b[c]=d[c];else if(typeof d[c]=="object")b[c]=a(b[c],d[c]);return b},addEventBinder:function(a){redux.fn.init.prototype[a]=function(){var b;b=arguments.length==0||!(arguments[0]instanceof Function)?"fireEvent":"addEventListener";for(var d=0;d<this.context.length;d++)this.context[d][b](a,arguments[0]);
+return this}},trackElement:function(a){var b=redux.data.maps;if(a.id)b.byID[a.id]=a;if(a.className)if(b.byClassName[a.className])redux.fn.contains(a,b.byClassName[a.className])||b.byClassName[a.className].push(a);else{b.byClassName[a.className]=[];b.byClassName[a.className].push(a)}if(b.byType[a.toString()])redux.fn.contains(a,b.byType[a.toString()])||b.byType[a.toString()].push(a);else{b.byType[a.toString()]=[];b.byType[a.toString()].push(a)}},setDefault:function(a,b){for(var d=a.split(","),c=0;c<
+d.length;c++){var l=d[c].split(" ").join(""),h;switch(l.charAt(0)){case "#":h=redux.data.defaults.byID;l=l.substring(1);break;case ".":h=redux.data.defaults.byClassName;l=l.substring(1);break;default:h=redux.data.defaults.byType}h[l]=this.mergeObjects(h[l]||{},b)}return this}};for(i=0;i<redux.data.events.length;i++)redux.fn.addEventBinder(redux.data.events[i]);
+for(i in redux.data.types)if(redux.data.types.hasOwnProperty(i))for(var j=0;j<redux.data.types[i].length;j++)(function(a,b){this[b]=function d(c){if(!(this instanceof arguments.callee))return new d(c);if(c&&c.id&&redux.data.defaults.byID[c.id])c=redux.fn.mergeObjects(c,redux.data.defaults.byID[c.id]);if(c&&c.className&&redux.data.defaults.byClassName[c.className])c=redux.fn.mergeObjects(c,redux.data.defaults.byClassName[c.className]);c=redux.fn.mergeObjects(c,redux.data.defaults.byType[b]);var l=
+Ti[a]["create"+b](c);redux.fn.trackElement(l);return l};this[b].setDefault=function(d){redux.fn.setDefault(b,d)}})(i,redux.data.types[i][j]);var includeGlobal=redux.fn.includeGlobal,includeJSS=redux.fn.includeJSS,includeJSSGlobal=redux.fn.includeJSSGlobal;(function(){for(var a=redux.data.global.getjss()||[],b=0;b<a.length;b++)includeJSS(a[b]);a=redux.data.global.getfiles()||[];for(b=0;b<a.length;b++)include(a[b])})();this.$=this.$||redux;
\ No newline at end of file
diff --git a/test/CHANGELOG.txt b/test/CHANGELOG.txt
new file mode 100644
index 0000000..de1e091
--- /dev/null
+++ b/test/CHANGELOG.txt
@@ -0,0 +1 @@
+Place your change log text here.  This file will be incorporated with your app at package time.
\ No newline at end of file
diff --git a/test/LICENSE b/test/LICENSE
new file mode 100644
index 0000000..0ec8940
--- /dev/null
+++ b/test/LICENSE
@@ -0,0 +1,219 @@
+Copyright 2009 Appcelerator, Inc.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   (or the full text of the license is below)
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!)  The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
\ No newline at end of file
diff --git a/test/LICENSE.txt b/test/LICENSE.txt
new file mode 100644
index 0000000..4124b1d
--- /dev/null
+++ b/test/LICENSE.txt
@@ -0,0 +1 @@
+Place your license text here.  This file will be incorporated with your app at package time.
\ No newline at end of file
diff --git a/test/README b/test/README
new file mode 100644
index 0000000..cb993a6
--- /dev/null
+++ b/test/README
@@ -0,0 +1,18 @@
+Welcome to your Appcelerator Titanium Mobile Project
+
+This is a blank project.  Start by editing your application's app.js to 
+make your first mobile project using Titanium.
+
+
+
+----------------------------------
+Stuff our legal folk make us say:
+
+Appcelerator, Appcelerator Titanium and associated marks and logos are 
+trademarks of Appcelerator, Inc. 
+
+Titanium is Copyright (c) 2009-2010 by Appcelerator, Inc. All Rights Reserved.
+
+Titanium is licensed under the Apache Public License (Version 2). Please
+see the LICENSE file for the full license.
+
diff --git a/test/Resources/KS_nav_ui.png b/test/Resources/KS_nav_ui.png
new file mode 100644
index 0000000..28976c8
Binary files /dev/null and b/test/Resources/KS_nav_ui.png differ
diff --git a/test/Resources/KS_nav_views.png b/test/Resources/KS_nav_views.png
new file mode 100644
index 0000000..885abd9
Binary files /dev/null and b/test/Resources/KS_nav_views.png differ
diff --git a/test/Resources/android/appicon.png b/test/Resources/android/appicon.png
new file mode 100644
index 0000000..3300a00
Binary files /dev/null and b/test/Resources/android/appicon.png differ
diff --git a/test/Resources/android/default.png b/test/Resources/android/default.png
new file mode 100644
index 0000000..718fb3c
Binary files /dev/null and b/test/Resources/android/default.png differ
diff --git a/test/Resources/app.js b/test/Resources/app.js
new file mode 100644
index 0000000..9fbd1bf
--- /dev/null
+++ b/test/Resources/app.js
@@ -0,0 +1,36 @@
+Ti.include('redux.js');
+
+/* Include our JSS */
+includeJSSGlobal('jss/common.jss');
+includeJSSGlobal('jss/localize.jss');
+
+/* Tell the compiler which packages we are going to use */
+Ti.UI.createTabGroup;
+Ti.UI.createWindow;
+Ti.UI.createTab;
+Ti.UI.createLabel;
+
+// this sets the background color of the master UIView (when there are no windows/tab groups on it)
+Titanium.UI.setBackgroundColor('#000');
+
+// create tab group
+var tabGroup = new TabGroup();
+
+tabGroup.addTab(new Tab({
+    id: 'Tab1',
+    window: new Window({
+        id: 'Window1',
+        url: 'tabs/tab1.js'
+    })
+}));
+
+tabGroup.addTab(new Tab({
+    id: 'Tab2',
+    window: new Window({
+        id: 'Window2',
+        url: 'tabs/tab2.js'
+    })
+}));
+
+// open tab group
+tabGroup.open();
\ No newline at end of file
diff --git a/test/Resources/default_app_logo.png b/test/Resources/default_app_logo.png
new file mode 100644
index 0000000..f24bb81
Binary files /dev/null and b/test/Resources/default_app_logo.png differ
diff --git a/test/Resources/iphone/Default.png b/test/Resources/iphone/Default.png
new file mode 100644
index 0000000..718fb3c
Binary files /dev/null and b/test/Resources/iphone/Default.png differ
diff --git a/test/Resources/iphone/appicon.png b/test/Resources/iphone/appicon.png
new file mode 100644
index 0000000..ac74d27
Binary files /dev/null and b/test/Resources/iphone/appicon.png differ
diff --git a/test/Resources/jss/common.jss b/test/Resources/jss/common.jss
new file mode 100644
index 0000000..9f16af7
--- /dev/null
+++ b/test/Resources/jss/common.jss
@@ -0,0 +1,21 @@
+Window, Label {
+  backgroundColor: '#222'
+}
+
+#Tab1 {
+  icon: 'KS_nav_views.png'
+}
+#Tab2 {
+  icon: 'KS_nav_ui.png'
+}
+
+Label {
+  color: '#999',
+  font: { fontSize: 20, fontFamily: 'Helvetica Neue'},
+  textAlign: 'center',
+  width: 'auto',
+  left: 0,
+  right: 0,
+  top: 0,
+  bottom: 0
+}
\ No newline at end of file
diff --git a/test/Resources/jss/localize.jss b/test/Resources/jss/localize.jss
new file mode 100644
index 0000000..64bf260
--- /dev/null
+++ b/test/Resources/jss/localize.jss
@@ -0,0 +1,15 @@
+/* English */
+[Platform.locale="en"] #Window1 { title: 'Tab One' }
+[Platform.locale="en"] #Window2 { title: 'Tab Two' }
+[Platform.locale="en"] #Tab1 { title: 'Tab One' }
+[Platform.locale="en"] #Tab2 { title: 'Tab Two' }
+[Platform.locale="en"] #Label1 { text: 'I am Window One' }
+[Platform.locale="en"] #Label2 { text: 'I am Window Two' }
+
+/* Spanish */
+[Platform.locale="es"] #Window1 { title: 'Solapa Uno' }
+[Platform.locale="es"] #Window2 { title: 'Solapa Dos' }
+[Platform.locale="es"] #Tab1 { title: 'Solapa Uno' }
+[Platform.locale="es"] #Tab2 { title: 'Solapa Dos' }
+[Platform.locale="es"] #Label1 { text: 'Soy la Ventana Uno' }
+[Platform.locale="es"] #Label2 { text: 'Soy la Ventana Dos' }
\ No newline at end of file
diff --git a/test/Resources/redux.js b/test/Resources/redux.js
new file mode 120000
index 0000000..32d7f54
--- /dev/null
+++ b/test/Resources/redux.js
@@ -0,0 +1 @@
+../../redux.js
\ No newline at end of file
diff --git a/test/Resources/tabs/tab1.js b/test/Resources/tabs/tab1.js
new file mode 100644
index 0000000..29d36bf
--- /dev/null
+++ b/test/Resources/tabs/tab1.js
@@ -0,0 +1,9 @@
+Ti.include('../redux.js');
+
+var window = Ti.UI.currentWindow;
+
+info(window.left);
+
+var label = new Label({ id: 'Label1' });
+
+window.add(label);
\ No newline at end of file
diff --git a/test/Resources/tabs/tab2.js b/test/Resources/tabs/tab2.js
new file mode 100644
index 0000000..c2acd78
--- /dev/null
+++ b/test/Resources/tabs/tab2.js
@@ -0,0 +1,7 @@
+Ti.include('../redux.js');
+
+var window = Ti.UI.currentWindow;
+
+var label = new Label({ id: 'Label2' });
+
+window.add(label);
\ No newline at end of file
diff --git a/test/build/android/.classpath b/test/build/android/.classpath
new file mode 100644
index 0000000..60be2f0
--- /dev/null
+++ b/test/build/android/.classpath
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="lib/titanium.jar"/>
+	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="src" path="gen"/>
+</classpath>
diff --git a/test/build/android/.gitignore b/test/build/android/.gitignore
new file mode 100644
index 0000000..8a790b2
--- /dev/null
+++ b/test/build/android/.gitignore
@@ -0,0 +1,5 @@
+src
+lib
+bin
+res
+AndroidManifest.xml
diff --git a/test/build/android/.project b/test/build/android/.project
new file mode 100644
index 0000000..1c1a6ad
--- /dev/null
+++ b/test/build/android/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Redux Test</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/test/build/iphone/.gitignore b/test/build/iphone/.gitignore
new file mode 100644
index 0000000..756346d
--- /dev/null
+++ b/test/build/iphone/.gitignore
@@ -0,0 +1,5 @@
+Classes
+tmp
+build
+headers
+lib
diff --git a/test/manifest b/test/manifest
new file mode 100644
index 0000000..7a2b47c
--- /dev/null
+++ b/test/manifest
@@ -0,0 +1,8 @@
+#appname: Redux Test
+#publisher: dawson
+#url: http://tothsolutions.com/
+#image: appicon.png
+#appid: com.tothsolutions.redux.test
+#desc: undefined
+#type: mobile
+#guid: 2ce77904-6b50-461e-bd0a-cca95c3e50a9
diff --git a/test/tiapp.xml b/test/tiapp.xml
new file mode 100644
index 0000000..d284c6f
--- /dev/null
+++ b/test/tiapp.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ti:app xmlns:ti="http://ti.appcelerator.org">
+<id>com.tothsolutions.redux.test</id>
+<name>Redux Test</name>
+<version>1.0</version>
+<publisher>Dawson Toth</publisher>
+<url>http://tothsolutions.com/</url>
+<description>Tests and demonstrates the basic functionality of Redux</description>
+<copyright>Open Source, have at it</copyright>
+<icon>default_app_logo.png</icon>
+    <persistent-wifi>false</persistent-wifi>
+    <prerendered-icon>false</prerendered-icon>
+    <statusbar-style>default</statusbar-style>
+    <statusbar-hidden>false</statusbar-hidden>
+    <fullscreen>false</fullscreen>
+    <navbar-hidden>false</navbar-hidden>
+    <analytics>true</analytics>
+<guid>2ce77904-6b50-461e-bd0a-cca95c3e50a9</guid>
+</ti:app>