diff --git a/__gulpfile.js b/__gulpfile.js
deleted file mode 100644
index 0065cde..0000000
--- a/__gulpfile.js
+++ /dev/null
@@ -1,164 +0,0 @@
-var gulp = require('gulp'),
-   runSequence = require('run-sequence').use(gulp) 
-   del = require('del'),
-   fs = require('fs'),
-   jest = require('jest-cli'),
-   g = require('gulp-load-plugins')({
-      scope: ['dependencies', 'devDependencies', 'peerDependencies'],
-      rename : {
-        'gulp-pure-cjs' : 'pure',
-        'gulp-uglifyjs' : 'uglify'
-      }});
-
-var config = {
-  build : {
-    js : './cjs',
-    umd : './umd',
-    fileName : 'rtable.js',
-    minFileName : 'rtable.min.js'
-  },
-  
-  jsxSource : './jsx/**/**.js',
-  umdSource : './cjs/**/**.js',
-  distSource  : './umd/**/**.js',
-  testSource : './tests/**/**.spec.js',
-
-  dist : './dist',
-  exports: 'RTable',
-  sourceMap : true,
-  port : 1234,
-    dependencies: [
-      {name: 'react', exports: 'React'},
-      {name: 'pubsub-js', exports : 'PubSub'}
-    ]
-};
-
-
-// Umd options
-var options = {
-  input:  config.build.js +'/' +config.build.fileName,
-  output: config.build.fileName,
-  exports: config.exports,
-  map: false,
-  comments : true,
-  external : {
-  	react : {amd : 'react', global : 'React'},
-  	'pubsub-js' : {amd : 'pubsub-js', global : 'PubSub'}
-  }
-};
-
-gulp.task('clean', ['react-clean', 'umd-clean', 'dist-clean']);
-
-gulp.task('build', function(){
-  runSequence('react', 'umd', 'dist');
-});
-
-gulp.task('watch', function () {
-	var reactWatch = register(config.jsxSource, ['react']);
-	var umdWatch = register(config.umdSource, ['umd', 'dist']);
-});
-
-gulp.task('default', ['build','watch']);
-
-gulp.task('dist-clean', function(){
-  del(config.dist);
-});
-
-gulp.task('dist', function(){
-  return gulp.src(config.build.umd +"/"+config.build.fileName)
-    .pipe(g.uglify(config.build.minFileName, 
-    {
-      outSourceMap : config.sourceMap
-    }))
-    .pipe(gulp.dest(config.dist));
-});
-
-/** React **/
-gulp.task('react', function(){
-  return gulp.src(config.jsxSource)
-    .pipe(g.plumber({errorHandler: g.notify.onError("Error: <%= error.message %> ")}))
-    .pipe(g.react())
-    .pipe(gulp.dest(config.build.js))
-    .on('error', g.notify.onError("Error: <%= error.message %>"));
-});
-
-gulp.task('react-clean', function(){
-	del(config.build.js);
-});
-
-/** Test **/
-
-gulp.task('jest', function () {
-    return gulp.src(__dirname).pipe(
-      g.jest({
-        //scriptPreprocessor: "./tests/support/preprocessor.js",
-        unmockedModulePathPatterns: [
-            "react"
-        ],
-        testDirectoryName: "tests",
-        testPathIgnorePatterns: [
-            "node_modules",
-            "tests/support"
-        ],
-        moduleFileExtensions: [
-            "js",
-            "json",
-            "react"
-        ]
-    }));
-});
-
-gulp.task('watch-test',function(){
-  var watch = register([config.testSource, config.jsxSource],['jest']);
-});
-
-/** UMD **/
-gulp.task('umd-clean', function(){
-	del(config.build.umd);;
-});
-
-gulp.task('umd', function  () {
-	//needs umd folder to exist
-	if (!fs.existsSync(config.build.umd)){
-	    fs.mkdirSync(config.build.umd);
-	}
-
-	return gulp.src(config.build.js +'/' +config.build.fileName)
-		.pipe(g.plumber({errorHandler: g.notify.onError("Error: <%= error.message %> ")}))
-		.pipe(g.pure(options))
-		.pipe(gulp.dest(config.build.umd))
-    .pipe(gulp.dest(config.dist))
-		.on('error', g.notify.onError("Error: <%= error.message %>"));;
-});
-
-//linter
-
-gulp.task('lint', ['react'], function(){
-  return gulp.src(config.umdSource)
-    .pipe(g.jshint())
-    .pipe(g.jshint.reporter(g.stylish));
-});
-
-//functions
-
-function register(path, tasks){
-	var watch  = gulp.watch(path,{}, tasks, function(event) {
-	  console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
-	});
-	
-	watch.on('ready', function(watcher){ 
-		console.log('ready to watch path: ' + path);
-	});
-
-	watch.on('change', function(event) {
-	  console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
-	});
-
-	watch.on('error', function(error){
-    console.log("Error: <%= error.message %> ");
-		g.notify.onError("Error: <%= error.message %> ");
-	});
-
-	return watch;
-}
-
diff --git a/cjs/PropRenderMixin.js b/cjs/PropRenderMixin.js
new file mode 100644
index 0000000..2d2f428
--- /dev/null
+++ b/cjs/PropRenderMixin.js
@@ -0,0 +1,41 @@
+/*
+
+Provides comparation of old and new properties for shouldComponentUpdate method by using JSON.strinify comparation. 
+This provides deep comparation for properties with arrays and objects. 
+
+NOTE ANY METHODs will be ignored
+NOTE  ORDER MATTERS {a :'1', b : '2'} will be FALSE to {b : '2', a : '1'}
+
+Author : Dmytro Lebedynskyi
+
+Why ?
+
+If your React component's render function is "pure" (in other words, it renders the same result given the same props and state),
+ you can use this mixin for a performance boost in some cases.
+
+ */
+var PropRenderMixin = {
+ 	componentWillMount: function() {
+	    this.shouldUpdate = true;
+	    this.oldProps = null;
+  	},
+	componentWillReceiveProps : function(newProps){
+        var shouldUpdate = true,
+            newPropsStr = null;
+
+        if (this.props.optimization){
+            newPropsStr = JSON.stringify(newProps);
+            shouldUpdate =  this.oldProps !== newPropsStr;
+        }
+        this.shouldUpdate = shouldUpdate;
+
+		this.oldProps = newPropsStr;
+    },
+    shouldComponentUpdate : function(newProps, newState){
+        return this.shouldUpdate;
+    }
+};
+
+module.exports  =  PropRenderMixin;
+ 
+
diff --git a/cjs/RTable.js b/cjs/RTable.js
new file mode 100644
index 0000000..4f58c9c
--- /dev/null
+++ b/cjs/RTable.js
@@ -0,0 +1,154 @@
+/**
+ * @jsx React.DOM
+ */
+var React =  require('react'),
+    pubsub = require('pubsub-js'),
+    RTableHeaderCell = require('./RTableHeaderCell'),
+    RTableFilterCell = require('./RTableFilterCell'),
+    RTableSelectCell = require('./RTableSelectCell'),
+    RTableCell = require('./RTableCell');
+
+var RTable = {
+    displayName : 'RTable',
+    getDefaultProps : function  () {
+        return {  
+        	data : [],
+        	definitions : [],
+            dataProp : '.',
+            columnFieldValueProp : 'field',
+            columnNameProp : 'name', 
+            enableFilters : true,
+            enableSelection : true,
+            classes : 'rtable',
+            optimization : true, 
+            fixedHeader : false
+        };
+    },
+    tableScroll : function(e){
+        this.refs.rHeader.getDOMNode().style.width = this.refs.rTable.getDOMNode().clientWidth + this.refs.rTable.getDOMNode().scrollLeft + 'px';
+        this.refs.rBody.getDOMNode().style.width = this.refs.rTable.getDOMNode().clientWidth + this.refs.rTable.getDOMNode().scrollLeft + 'px';
+    },
+    componentDidMount : function() {
+        pubsub.publish('RTable.Mounted', null);
+
+        if (this.props.fixedHeader){
+            this.refs.rTable.getDOMNode()
+            .addEventListener('scroll', this.tableScroll);
+        }
+    },
+    componentWillUpdate : function(){
+        pubsub.publish('RTable.BeforeUpdated', null);
+    },
+    componentDidUpdate : function  () {
+        pubsub.publish('RTable.Updated', null);
+    },
+    componentWillUnmount : function(){
+        pubsub.publish('RTable.Unmounted', null);
+        //clean up.
+        pubsub.unsubscribe('RTable.Mounted');
+        pubsub.unsubscribe('RTable.Updated');
+        pubsub.unsubscribe('RTable.BeforeUpdated');
+        pubsub.unsubscribe('RTable.Unmounted');
+
+        this.refs.rTable.getDOMNode()
+        .removeEventListener('scroll', this.tableScroll);
+    },
+    propTypes : {
+    	 //Definitions for columns
+        definitions : React.PropTypes.oneOfType([
+        	React.PropTypes.arrayOf(React.PropTypes.string), 
+        	React.PropTypes.arrayOf(React.PropTypes.object)]),
+        //Data objects
+        data : React.PropTypes.arrayOf(React.PropTypes.object),
+        //Nested property name of each item in data array where to look for column values. Otherwise root object will be used.  
+        dataProp : React.PropTypes.string,
+        //Property that will be looked for in each column object to use as property name to look for in data item.
+        columnFieldValueProp : React.PropTypes.string,
+        //Property that will be looked for in each column object to use as column title.
+        columnNameProp : React.PropTypes.string, 
+        //should show filters 
+        enableFilters : React.PropTypes.bool,
+        //should show row selection checkboxes
+        enableSelection : React.PropTypes.bool,
+        //css class names to be added
+        classes : React.PropTypes.string,
+        //optimization flag. Default is true. Uses memory
+        optimization : React.PropTypes.bool, 
+        //should table apply fixed header and only body content scrolling 
+        fixedHeader : React.PropTypes.bool
+    },
+    render : function(){
+            var theadRows = [],
+                headers = [], 
+                filters = [],
+                colGroups = [],
+                rows = [],
+                classNames = 'rtable ';
+
+            classNames += this.props.fixedHeader ? ' rtable-fixed-header ' : '';
+            classNames += this.props.classes;
+            
+            if (this.props.data.length){
+                this.renderSelectionColumn(colGroups, headers, filters);
+
+                for (var i = 0; i < this.props.definitions.length; i++) {
+                    //col groups
+                    colGroups.push(React.createElement("col", {key: 'col_'+i, className: 'rtable-col rtable-col-'+i}));
+                    //headers
+                    headers.push(React.createElement(RTableHeaderCell, {key: 'header_cell_'+i, 
+                                        definition: this.props.definitions[i], 
+                                        columnNameProp: this.props.columnNameProp}));
+                    //filters
+                    filters.push(React.createElement(RTableFilterCell, {key: 'filter_cell' + i, 
+                                    definition: this.props.definitions[i]}));
+                    //rows
+                    this.renderColumn(rows, i);
+                }
+                
+                theadRows.push(React.createElement("tr", {key: "rTableHeaderRow"}, headers));
+                
+                if (this.props.enableFilters){
+                    theadRows.push(React.createElement("tr", {key: "rtableFilterRow"}, filters));
+                }
+            }
+
+            return (React.createElement("table", {className: classNames, ref: "rTable"}, 
+
+                          React.createElement("colgroup", null, colGroups), 
+                          React.createElement("thead", {ref: "rHeader"}, theadRows), 
+                          React.createElement("tbody", {ref: "rBody"}, rows)
+
+            	     ));
+    },
+    getInitialRow : function(rowIndex, data){
+        var arr = [];
+        if (this.props.enableSelection){
+            arr.push(React.createElement(RTableSelectCell, {key: 'row_'+rowIndex+'_select', data: data}));
+        }
+        return arr;
+    },
+    renderColumn : function(rows, columnIndex){
+        for (var j = 0; j < this.props.data.length; j++) {
+                        var row = rows[j] = rows[j] || (React.createElement("tr", {key: 'row_'+j}));
+                        var cells =  row.props.children = row.props.children || this.getInitialRow(j, this.props.data[j]);
+                        cells.push(React.createElement(RTableCell, {key: 'row_'+j+'_cell_'+columnIndex, 
+                                        data: this.props.data[j], 
+                                        definition: this.props.definitions[columnIndex], 
+                                        columnFieldValueProp: this.props.columnFieldValueProp, 
+                                        dataProp: this.props.dataProp, 
+                                        optimization: this.props.optimization}));
+                    }
+    },
+    renderSelectionColumn : function(cols, headers,  filters){
+        if (this.props.enableSelection){ 
+            cols.push(React.createElement("col", {key: "col_selection", className: "rtable-col rtable-selection"}));
+            headers.push(React.createElement("th", {key: "header_cell_selection", className: "rtable-selection rtable-column-header"}));
+            filters.push(React.createElement("th", {key: "filter_cell_selection", className: "rtable-selection rtable-column-filter"}));
+        }
+    }
+};
+
+module.exports = {
+    class : RTable,
+    Component : React.createClass(RTable)
+};
diff --git a/cjs/RTableCell.js b/cjs/RTableCell.js
new file mode 100644
index 0000000..9804549
--- /dev/null
+++ b/cjs/RTableCell.js
@@ -0,0 +1,57 @@
+/**
+ * @jsx React.DOM
+ */
+var React =  require('react'),
+  utils = require('./utils'),
+    PropRenderMixin = require('./PropRenderMixin');
+
+var RTableCell = React.createClass({
+  mixins: [PropRenderMixin],
+	displayName : 'RTableCell',
+  getDefaultProps : function(){
+    return {  
+          data : {},
+          definition : {},
+          columnFieldValueProp : 'field',
+          dataProp : '.',
+          optimization : true
+        };
+  },
+	propTypes : {
+        //Nested property name of each item in data array where to look for column values. Otherwise root object will be used.  
+        dataProp : React.PropTypes.string,
+        //Property that will be looked for in each column object to use as property name to look for in data item.
+        columnFieldValueProp : React.PropTypes.string,
+        //Definition for column
+        definition : React.PropTypes.oneOfType([
+        	React.PropTypes.string, 
+        	React.PropTypes.object]),
+        //Data object. will use dataProp to look for display values. Value will be taken based on columnFieldValueProp value of definition object
+        data : React.PropTypes.object,
+        //optimisation flag. Default is true. Uses memory
+        optimization : React.PropTypes.bool
+    },
+    render : function(){ 
+    		var def = null,
+    			dataObj = null;
+
+    		if (typeof this.props.definition  === 'object') {
+    			if (!this.props.columnFieldValueProp ||
+    				!this.props.definition.hasOwnProperty(this.props.columnFieldValueProp)){ 
+    				utils.warn('definition property was not found on definition object', this.props.definition, this.props.columnFieldValueProp);
+    			}
+    			def = this.props.definition[this.props.columnFieldValueProp];
+    		} else  { def = this.props.definition; }
+
+           	if ('.' !== this.props.dataProp){
+           		if (!this.props.data.hasOwnProperty(this.props.dataProp)){
+           			utils.warn('could not find data propety on object', this.props.data, this.props.dataProp);
+           		}
+           		dataObj = this.props.data[this.props.dataProp];
+           	} else {dataObj = this.props.data;}
+
+           	return (React.createElement("td", {className: "rtable-column-body"}, dataObj[def]));
+          }
+    });
+
+module.exports = RTableCell;
diff --git a/cjs/RTableFilterCell.js b/cjs/RTableFilterCell.js
new file mode 100644
index 0000000..11adde5
--- /dev/null
+++ b/cjs/RTableFilterCell.js
@@ -0,0 +1,40 @@
+/**
+ * @jsx React.DOM
+ */
+var React =  require('react'),
+    pubsub = require('pubsub-js');
+
+var RTableFilterCell = React.createClass({
+    displayName : 'RTableFilterCell',
+    getInitialState : function(){
+        return { filter : null};
+    },
+    getDefaultProps : function  () {
+        return {  
+            definition : {}
+        };
+    },
+    propTypes : {
+        //definitions for table filter row
+        definition : React.PropTypes.oneOfType([
+            React.PropTypes.string, 
+            React.PropTypes.object])
+    },
+    handleChange : function (e){
+        pubsub.publish('RTable.FilterChange', 
+        {
+            definition : this.props.definition,
+            value : e.target.value
+        });
+        
+        this.setState({definition : e.target.value});
+    },
+    componentWillUnmount : function(){
+        pubsub.unsubscribe('RTable.FilterChange');
+    },
+    render : function(){
+            return (React.createElement("th", {className: "rtable-column-filter"}, React.createElement("input", {type: "text", value: this.state.filter, onChange: this.handleChange})));
+          }
+    });
+
+module.exports = RTableFilterCell;
diff --git a/cjs/RTableHeaderCell.js b/cjs/RTableHeaderCell.js
new file mode 100644
index 0000000..3ec0944
--- /dev/null
+++ b/cjs/RTableHeaderCell.js
@@ -0,0 +1,35 @@
+/**
+ * @jsx React.DOM
+ */
+var React =  require('react'),
+    utils = require('./utils');
+    
+var RTableHeaderCell = React.createClass({
+    displayName : 'RTableHeaderCell',
+    getDefaultProps : function  () {
+        return {  
+            definition : {},
+            columnNameProp : 'name'
+        };
+    },
+    propTypes : {
+        //definitions for table header row
+        definition : React.PropTypes.oneOfType([React.PropTypes.string, React.PropTypes.object]),
+        //Property that will be looked for in each column object to use as column title.
+        columnNameProp : React.PropTypes.string
+    },
+    render : function(){
+            var header = null;
+            if (typeof this.props.definition  === 'object') {
+                if (!this.props.columnNameProp ||
+                    !this.props.definition.hasOwnProperty(this.props.columnNameProp)){ 
+                    utils.warn('Header Name property was not found on definition object', this.props.definition, this.props.columnNameProp);   
+                }
+                header = this.props.definition[this.props.columnNameProp];
+            } else  { header = this.props.definition; }
+            
+            return (React.createElement("th", {className: "rtable-column-header"}, header));
+          }
+    });
+
+module.exports = RTableHeaderCell;
diff --git a/cjs/RTableSelectCell.js b/cjs/RTableSelectCell.js
new file mode 100644
index 0000000..646c895
--- /dev/null
+++ b/cjs/RTableSelectCell.js
@@ -0,0 +1,37 @@
+/**
+ * @jsx React.DOM
+ */
+var React = require('react'),
+    pubsub = require('pubsub-js');
+
+var RTableSelectCell = React.createClass({
+	displayName : 'RTableSelectCell',
+  getInitialState : function(){
+        return { isChecked : false};
+    },
+  getDefaultProps : function  () {
+        return {  
+            data : {}
+        };
+    },
+	propTypes : {
+        //Data object. will use dataProp to look for display values. Value will be taken based on columnFieldValueProp value of definition object
+        data : React.PropTypes.object
+    },
+  onChange : function(e){
+    var checked = !this.state.isChecked;
+    pubsub.publish('RTable.RowChecked', 
+        {
+            data : this.props.data,
+            value : checked
+        });
+    this.setState({isChecked: checked});
+  },
+  render : function(){ 
+    		return (React.createElement("td", {className: "rtable-selection rtable-column-body"}, React.createElement("input", {type: "checkbox", checked: this.state.isChecked, onChange: this.onChange})));
+    },
+  componentWillUnmount : function(){
+      pubsub.unsubscribe('RTable.RowSelected');
+    }});
+
+module.exports = RTableSelectCell;
diff --git a/cjs/utils.js b/cjs/utils.js
new file mode 100644
index 0000000..78a5132
--- /dev/null
+++ b/cjs/utils.js
@@ -0,0 +1,18 @@
+var utils = {}; 
+utils.stringify = function(oldObj){
+	return JSON.stringify(oldObj);
+};
+
+utils.cloneProps = function(oldObj){
+    return JSON.parse(JSON.stringify(oldObj));
+};
+
+utils.equalProps = function(oldObj, newObj){
+    return JSON.stringify(oldObj) === JSON.stringify(newObj);
+};
+
+utils.warn = function(){
+	if (console){console.warn(arguments);}
+};
+
+module.exports = utils;
\ No newline at end of file
diff --git a/css/styles.min.css b/css/styles.min.css
new file mode 100644
index 0000000..ad1ccae
--- /dev/null
+++ b/css/styles.min.css
@@ -0,0 +1 @@
+.rtable .rtable-selection{min-width:25px;max-width:25px;width:25px}.rtable-fixed-header{width:100%;overflow-x:scroll;display:block}.rtable-fixed-header tbody,.rtable-fixed-header thead{display:block}.rtable-fixed-header tbody{overflow-y:scroll;overflow-x:hidden;height:500px}.rtable-fixed-header td,.rtable-fixed-header th{height:25px;min-width:150px;width:150px}.rtable-fixed-header .rtable-column-filter input{width:95%}
\ No newline at end of file
diff --git a/dist/rtable.js b/dist/rtable.js
index bb45b91..2f54e07 100644
--- a/dist/rtable.js
+++ b/dist/rtable.js
@@ -29,368 +29,7 @@
         return module.exports;
     }
     _require.cache = [];
-    _require.modules = [
-        function (module, exports) {
-            /*
-
-Provides comparation of old and new properties for shouldComponentUpdate method by using JSON.strinify comparation. 
-This provides deep comparation for properties with arrays and objects. 
-
-NOTE ANY METHODs will be ignored
-NOTE  ORDER MATTERS {a :'1', b : '2'} will be FALSE to {b : '2', a : '1'}
-
-Author : Dmytro Lebedynskyi
-
-Why ?
-
-If your React component's render function is "pure" (in other words, it renders the same result given the same props and state),
- you can use this mixin for a performance boost in some cases.
-
- */
-            var PropRenderMixin = {
-                    componentWillMount: function () {
-                        this.shouldUpdate = true;
-                        this.oldProps = null;
-                    },
-                    componentWillReceiveProps: function (newProps) {
-                        var shouldUpdate = true, newPropsStr = null;
-                        if (this.props.optimization) {
-                            newPropsStr = JSON.stringify(newProps);
-                            shouldUpdate = this.oldProps !== newPropsStr;
-                        }
-                        this.shouldUpdate = shouldUpdate;
-                        this.oldProps = newPropsStr;
-                    },
-                    shouldComponentUpdate: function (newProps, newState) {
-                        return this.shouldUpdate;
-                    }
-                };
-            module.exports = PropRenderMixin;
-        },
-        function (module, exports) {
-            /**
- * @jsx React.DOM
- */
-            var React = _require(8), utils = _require(6), PropRenderMixin = _require(0);
-            var RTableCell = React.createClass({
-                    mixins: [PropRenderMixin],
-                    displayName: 'RTableCell',
-                    getDefaultProps: function () {
-                        return {
-                            data: {},
-                            definition: {},
-                            columnFieldValueProp: 'field',
-                            dataProp: '.',
-                            optimization: true
-                        };
-                    },
-                    propTypes: {
-                        //Nested property name of each item in data array where to look for column values. Otherwise root object will be used.  
-                        dataProp: React.PropTypes.string,
-                        //Property that will be looked for in each column object to use as property name to look for in data item.
-                        columnFieldValueProp: React.PropTypes.string,
-                        //Definition for column
-                        definition: React.PropTypes.oneOfType([
-                            React.PropTypes.string,
-                            React.PropTypes.object
-                        ]),
-                        //Data object. will use dataProp to look for display values. Value will be taken based on columnFieldValueProp value of definition object
-                        data: React.PropTypes.object,
-                        //optimisation flag. Default is true. Uses memory
-                        optimization: React.PropTypes.bool
-                    },
-                    render: function () {
-                        var def = null, dataObj = null;
-                        if (typeof this.props.definition === 'object') {
-                            if (!this.props.columnFieldValueProp || !this.props.definition.hasOwnProperty(this.props.columnFieldValueProp)) {
-                                utils.warn('definition property was not found on definition object', this.props.definition, this.props.columnFieldValueProp);
-                            }
-                            def = this.props.definition[this.props.columnFieldValueProp];
-                        } else {
-                            def = this.props.definition;
-                        }
-                        if ('.' !== this.props.dataProp) {
-                            if (!this.props.data.hasOwnProperty(this.props.dataProp)) {
-                                utils.warn('could not find data propety on object', this.props.data, this.props.dataProp);
-                            }
-                            dataObj = this.props.data[this.props.dataProp];
-                        } else {
-                            dataObj = this.props.data;
-                        }
-                        return React.createElement('td', { className: 'rtable-column-body' }, dataObj[def]);
-                    }
-                });
-            module.exports = RTableCell;
-        },
-        function (module, exports) {
-            /**
- * @jsx React.DOM
- */
-            var React = _require(8), pubsub = _require(7);
-            var RTableFilterCell = React.createClass({
-                    displayName: 'RTableFilterCell',
-                    getInitialState: function () {
-                        return { filter: null };
-                    },
-                    getDefaultProps: function () {
-                        return { definition: {} };
-                    },
-                    propTypes: {
-                        //definitions for table filter row
-                        definition: React.PropTypes.oneOfType([
-                            React.PropTypes.string,
-                            React.PropTypes.object
-                        ])
-                    },
-                    handleChange: function (e) {
-                        pubsub.publish('RTable.FilterChange', {
-                            definition: this.props.definition,
-                            value: e.target.value
-                        });
-                        this.setState({ definition: e.target.value });
-                    },
-                    componentWillUnmount: function () {
-                        pubsub.unsubscribe('RTable.FilterChange');
-                    },
-                    render: function () {
-                        return React.createElement('th', { className: 'rtable-column-filter' }, React.createElement('input', {
-                            type: 'text',
-                            value: this.state.filter,
-                            onChange: this.handleChange
-                        }));
-                    }
-                });
-            module.exports = RTableFilterCell;
-        },
-        function (module, exports) {
-            /**
- * @jsx React.DOM
- */
-            var React = _require(8), utils = _require(6);
-            var RTableHeaderCell = React.createClass({
-                    displayName: 'RTableHeaderCell',
-                    getDefaultProps: function () {
-                        return {
-                            definition: {},
-                            columnNameProp: 'name'
-                        };
-                    },
-                    propTypes: {
-                        //definitions for table header row
-                        definition: React.PropTypes.oneOfType([
-                            React.PropTypes.string,
-                            React.PropTypes.object
-                        ]),
-                        //Property that will be looked for in each column object to use as column title.
-                        columnNameProp: React.PropTypes.string
-                    },
-                    render: function () {
-                        var header = null;
-                        if (typeof this.props.definition === 'object') {
-                            if (!this.props.columnNameProp || !this.props.definition.hasOwnProperty(this.props.columnNameProp)) {
-                                utils.warn('Header Name property was not found on definition object', this.props.definition, this.props.columnNameProp);
-                            }
-                            header = this.props.definition[this.props.columnNameProp];
-                        } else {
-                            header = this.props.definition;
-                        }
-                        return React.createElement('th', { className: 'rtable-column-header' }, header);
-                    }
-                });
-            module.exports = RTableHeaderCell;
-        },
-        function (module, exports) {
-            /**
- * @jsx React.DOM
- */
-            var React = _require(8), pubsub = _require(7);
-            var RTableSelectCell = React.createClass({
-                    displayName: 'RTableSelectCell',
-                    getInitialState: function () {
-                        return { isChecked: false };
-                    },
-                    getDefaultProps: function () {
-                        return { data: {} };
-                    },
-                    propTypes: {
-                        //Data object. will use dataProp to look for display values. Value will be taken based on columnFieldValueProp value of definition object
-                        data: React.PropTypes.object
-                    },
-                    onChange: function (e) {
-                        var checked = !this.state.isChecked;
-                        pubsub.publish('RTable.RowChecked', {
-                            data: this.props.data,
-                            value: checked
-                        });
-                        this.setState({ isChecked: checked });
-                    },
-                    render: function () {
-                        return React.createElement('td', { className: 'rtable-selection rtable-column-body' }, React.createElement('input', {
-                            type: 'checkbox',
-                            checked: this.state.isChecked,
-                            onChange: this.onChange
-                        }));
-                    },
-                    componentWillUnmount: function () {
-                        pubsub.unsubscribe('RTable.RowSelected');
-                    }
-                });
-            module.exports = RTableSelectCell;
-        },
-        function (module, exports) {
-            /**
- * @jsx React.DOM
- */
-            var React = _require(8), pubsub = _require(7), RTableHeaderCell = _require(3), RTableFilterCell = _require(2), RTableSelectCell = _require(4), RTableCell = _require(1);
-            var RTable = {
-                    displayName: 'RTable',
-                    getDefaultProps: function () {
-                        return {
-                            data: [],
-                            definitions: [],
-                            dataProp: '.',
-                            columnFieldValueProp: 'field',
-                            columnNameProp: 'name',
-                            enableFilters: true,
-                            enableSelection: true,
-                            classes: 'rtable',
-                            optimization: true,
-                            fixedHeader: false
-                        };
-                    },
-                    tableScroll: function (e) {
-                        this.refs.rHeader.getDOMNode().style.width = this.refs.rTable.getDOMNode().clientWidth + this.refs.rTable.getDOMNode().scrollLeft + 'px';
-                        this.refs.rBody.getDOMNode().style.width = this.refs.rTable.getDOMNode().clientWidth + this.refs.rTable.getDOMNode().scrollLeft + 'px';
-                    },
-                    componentDidMount: function () {
-                        pubsub.publish('RTable.Mounted', null);
-                        if (this.props.fixedHeader) {
-                            this.refs.rTable.getDOMNode().addEventListener('scroll', this.tableScroll);
-                        }
-                    },
-                    componentWillUpdate: function () {
-                        pubsub.publish('RTable.BeforeUpdated', null);
-                    },
-                    componentDidUpdate: function () {
-                        pubsub.publish('RTable.Updated', null);
-                    },
-                    componentWillUnmount: function () {
-                        pubsub.publish('RTable.Unmounted', null);    //clean up
-                        //clean up
-                        pubsub.unsubscribe('RTable.Mounted');
-                        pubsub.unsubscribe('RTable.Updated');
-                        pubsub.unsubscribe('RTable.BeforeUpdated');
-                        pubsub.unsubscribe('RTable.Unmounted');
-                        this.refs.rTable.getDOMNode().removeEventListener('scroll', this.tableScroll);
-                    },
-                    propTypes: {
-                        //Definitions for columns
-                        definitions: React.PropTypes.oneOfType([
-                            React.PropTypes.arrayOf(React.PropTypes.string),
-                            React.PropTypes.arrayOf(React.PropTypes.object)
-                        ]),
-                        //Data objects
-                        data: React.PropTypes.arrayOf(React.PropTypes.object),
-                        //Nested property name of each item in data array where to look for column values. Otherwise root object will be used.  
-                        dataProp: React.PropTypes.string,
-                        //Property that will be looked for in each column object to use as property name to look for in data item.
-                        columnFieldValueProp: React.PropTypes.string,
-                        //Property that will be looked for in each column object to use as column title.
-                        columnNameProp: React.PropTypes.string,
-                        //should show filters 
-                        enableFilters: React.PropTypes.bool,
-                        //should show row selection checkboxes
-                        enableSelection: React.PropTypes.bool,
-                        //css class names to be added
-                        classes: React.PropTypes.string,
-                        //optimization flag. Default is true. Uses memory
-                        optimization: React.PropTypes.bool,
-                        //should table apply fixed header and only body content scrolling 
-                        fixedHeader: React.PropTypes.bool
-                    },
-                    render: function () {
-                        var theadRows = [], headers = [], filters = [], colGroups = [], rows = [], classNames = 'rtable ';
-                        classNames += this.props.fixedHeader ? ' rtable-fixed-header ' : '';
-                        classNames += this.props.classes;
-                        if (this.props.data.length) {
-                            this.renderSelectionColumn(colGroups, headers, filters);
-                            for (var i = 0; i < this.props.definitions.length; i++) {
-                                //col groups
-                                colGroups.push(React.createElement('col', {
-                                    key: 'col_' + i,
-                                    className: 'rtable-col rtable-col-' + i
-                                }));    //headers
-                                //headers
-                                headers.push(React.createElement(RTableHeaderCell, {
-                                    key: 'header_cell_' + i,
-                                    definition: this.props.definitions[i],
-                                    columnNameProp: this.props.columnNameProp
-                                }));    //filters
-                                //filters
-                                filters.push(React.createElement(RTableFilterCell, {
-                                    key: 'filter_cell' + i,
-                                    definition: this.props.definitions[i]
-                                }));    //rows
-                                //rows
-                                this.renderColumn(rows, i);
-                            }
-                            theadRows.push(React.createElement('tr', { key: 'rTableHeaderRow' }, headers));
-                            if (this.props.enableFilters) {
-                                theadRows.push(React.createElement('tr', { key: 'rtableFilterRow' }, filters));
-                            }
-                        }
-                        return React.createElement('table', {
-                            className: classNames,
-                            ref: 'rTable'
-                        }, React.createElement('colgroup', null, colGroups), React.createElement('thead', { ref: 'rHeader' }, theadRows), React.createElement('tbody', { ref: 'rBody' }, rows));
-                    },
-                    getInitialRow: function (rowIndex, data) {
-                        var arr = [];
-                        if (this.props.enableSelection) {
-                            arr.push(React.createElement(RTableSelectCell, {
-                                key: 'row_' + rowIndex + '_select',
-                                data: data
-                            }));
-                        }
-                        return arr;
-                    },
-                    renderColumn: function (rows, columnIndex) {
-                        for (var j = 0; j < this.props.data.length; j++) {
-                            var row = rows[j] = rows[j] || React.createElement('tr', { key: 'row_' + j });
-                            var cells = row.props.children = row.props.children || this.getInitialRow(j, this.props.data[j]);
-                            cells.push(React.createElement(RTableCell, {
-                                key: 'row_' + j + '_cell_' + columnIndex,
-                                data: this.props.data[j],
-                                definition: this.props.definitions[columnIndex],
-                                columnFieldValueProp: this.props.columnFieldValueProp,
-                                dataProp: this.props.dataProp,
-                                optimization: this.props.optimization
-                            }));
-                        }
-                    },
-                    renderSelectionColumn: function (cols, headers, filters) {
-                        if (this.props.enableSelection) {
-                            cols.push(React.createElement('col', {
-                                key: 'col_selection',
-                                className: 'rtable-col rtable-selection'
-                            }));
-                            headers.push(React.createElement('th', {
-                                key: 'header_cell_selection',
-                                className: 'rtable-selection rtable-column-header'
-                            }));
-                            filters.push(React.createElement('th', {
-                                key: 'filter_cell_selection',
-                                className: 'rtable-selection rtable-column-filter'
-                            }));
-                        }
-                    }
-                };
-            module.exports = {
-                class: RTable,
-                Component: React.createClass(RTable)
-            };
-        },
-        function (module, exports) {
+    _require.modules = [function (module, exports) {
             var utils = {};
             utils.stringify = function (oldObj) {
                 return JSON.stringify(oldObj);
@@ -407,13 +46,6 @@ If your React component's render function is "pure" (in other words, it renders
                 }
             };
             module.exports = utils;
-        },
-        function (module, exports) {
-            module.exports = __external_PubSub;
-        },
-        function (module, exports) {
-            module.exports = __external_React;
-        }
-    ];
-    return _require(5);
+        }];
+    return _require(0);
 }));
\ No newline at end of file
diff --git a/dist/rtable.min.js b/dist/rtable.min.js
index 4d8bd18..20d64eb 100644
--- a/dist/rtable.min.js
+++ b/dist/rtable.min.js
@@ -1,2 +1,2 @@
-!function(a){"function"==typeof define&&define.amd?define(["react","pubsub-js"],a):"object"==typeof exports?module.exports=a(require("react"),require("pubsub-js")):this.RTable=a(React,PubSub)}(function(a,b){function c(a){var b=c.cache[a];if(!b){var d={};b=c.cache[a]={id:a,exports:d},c.modules[a].call(d,b,d)}return b.exports}return c.cache=[],c.modules=[function(a){var b={componentWillMount:function(){this.shouldUpdate=!0,this.oldProps=null},componentWillReceiveProps:function(a){var b=!0,c=null;this.props.optimization&&(c=JSON.stringify(a),b=this.oldProps!==c),this.shouldUpdate=b,this.oldProps=c},shouldComponentUpdate:function(){return this.shouldUpdate}};a.exports=b},function(a){var b=c(8),d=c(6),e=c(0),f=b.createClass({mixins:[e],displayName:"RTableCell",getDefaultProps:function(){return{data:{},definition:{},columnFieldValueProp:"field",dataProp:".",optimization:!0}},propTypes:{dataProp:b.PropTypes.string,columnFieldValueProp:b.PropTypes.string,definition:b.PropTypes.oneOfType([b.PropTypes.string,b.PropTypes.object]),data:b.PropTypes.object,optimization:b.PropTypes.bool},render:function(){var a=null,c=null;return"object"==typeof this.props.definition?(this.props.columnFieldValueProp&&this.props.definition.hasOwnProperty(this.props.columnFieldValueProp)||d.warn("definition property was not found on definition object",this.props.definition,this.props.columnFieldValueProp),a=this.props.definition[this.props.columnFieldValueProp]):a=this.props.definition,"."!==this.props.dataProp?(this.props.data.hasOwnProperty(this.props.dataProp)||d.warn("could not find data propety on object",this.props.data,this.props.dataProp),c=this.props.data[this.props.dataProp]):c=this.props.data,b.createElement("td",{className:"rtable-column-body"},c[a])}});a.exports=f},function(a){var b=c(8),d=c(7),e=b.createClass({displayName:"RTableFilterCell",getInitialState:function(){return{filter:null}},getDefaultProps:function(){return{definition:{}}},propTypes:{definition:b.PropTypes.oneOfType([b.PropTypes.string,b.PropTypes.object])},handleChange:function(a){d.publish("RTable.FilterChange",{definition:this.props.definition,value:a.target.value}),this.setState({definition:a.target.value})},componentWillUnmount:function(){d.unsubscribe("RTable.FilterChange")},render:function(){return b.createElement("th",{className:"rtable-column-filter"},b.createElement("input",{type:"text",value:this.state.filter,onChange:this.handleChange}))}});a.exports=e},function(a){var b=c(8),d=c(6),e=b.createClass({displayName:"RTableHeaderCell",getDefaultProps:function(){return{definition:{},columnNameProp:"name"}},propTypes:{definition:b.PropTypes.oneOfType([b.PropTypes.string,b.PropTypes.object]),columnNameProp:b.PropTypes.string},render:function(){var a=null;return"object"==typeof this.props.definition?(this.props.columnNameProp&&this.props.definition.hasOwnProperty(this.props.columnNameProp)||d.warn("Header Name property was not found on definition object",this.props.definition,this.props.columnNameProp),a=this.props.definition[this.props.columnNameProp]):a=this.props.definition,b.createElement("th",{className:"rtable-column-header"},a)}});a.exports=e},function(a){var b=c(8),d=c(7),e=b.createClass({displayName:"RTableSelectCell",getInitialState:function(){return{isChecked:!1}},getDefaultProps:function(){return{data:{}}},propTypes:{data:b.PropTypes.object},onChange:function(){var a=!this.state.isChecked;d.publish("RTable.RowChecked",{data:this.props.data,value:a}),this.setState({isChecked:a})},render:function(){return b.createElement("td",{className:"rtable-selection rtable-column-body"},b.createElement("input",{type:"checkbox",checked:this.state.isChecked,onChange:this.onChange}))},componentWillUnmount:function(){d.unsubscribe("RTable.RowSelected")}});a.exports=e},function(a){var b=c(8),d=c(7),e=c(3),f=c(2),g=c(4),h=c(1),i={displayName:"RTable",getDefaultProps:function(){return{data:[],definitions:[],dataProp:".",columnFieldValueProp:"field",columnNameProp:"name",enableFilters:!0,enableSelection:!0,classes:"rtable",optimization:!0,fixedHeader:!1}},tableScroll:function(){this.refs.rHeader.getDOMNode().style.width=this.refs.rTable.getDOMNode().clientWidth+this.refs.rTable.getDOMNode().scrollLeft+"px",this.refs.rBody.getDOMNode().style.width=this.refs.rTable.getDOMNode().clientWidth+this.refs.rTable.getDOMNode().scrollLeft+"px"},componentDidMount:function(){d.publish("RTable.Mounted",null),this.props.fixedHeader&&this.refs.rTable.getDOMNode().addEventListener("scroll",this.tableScroll)},componentWillUpdate:function(){d.publish("RTable.BeforeUpdated",null)},componentDidUpdate:function(){d.publish("RTable.Updated",null)},componentWillUnmount:function(){d.publish("RTable.Unmounted",null),d.unsubscribe("RTable.Mounted"),d.unsubscribe("RTable.Updated"),d.unsubscribe("RTable.BeforeUpdated"),d.unsubscribe("RTable.Unmounted"),this.refs.rTable.getDOMNode().removeEventListener("scroll",this.tableScroll)},propTypes:{definitions:b.PropTypes.oneOfType([b.PropTypes.arrayOf(b.PropTypes.string),b.PropTypes.arrayOf(b.PropTypes.object)]),data:b.PropTypes.arrayOf(b.PropTypes.object),dataProp:b.PropTypes.string,columnFieldValueProp:b.PropTypes.string,columnNameProp:b.PropTypes.string,enableFilters:b.PropTypes.bool,enableSelection:b.PropTypes.bool,classes:b.PropTypes.string,optimization:b.PropTypes.bool,fixedHeader:b.PropTypes.bool},render:function(){var a=[],c=[],d=[],g=[],h=[],i="rtable ";if(i+=this.props.fixedHeader?" rtable-fixed-header ":"",i+=this.props.classes,this.props.data.length){this.renderSelectionColumn(g,c,d);for(var j=0;j<this.props.definitions.length;j++)g.push(b.createElement("col",{key:"col_"+j,className:"rtable-col rtable-col-"+j})),c.push(b.createElement(e,{key:"header_cell_"+j,definition:this.props.definitions[j],columnNameProp:this.props.columnNameProp})),d.push(b.createElement(f,{key:"filter_cell"+j,definition:this.props.definitions[j]})),this.renderColumn(h,j);a.push(b.createElement("tr",{key:"rTableHeaderRow"},c)),this.props.enableFilters&&a.push(b.createElement("tr",{key:"rtableFilterRow"},d))}return b.createElement("table",{className:i,ref:"rTable"},b.createElement("colgroup",null,g),b.createElement("thead",{ref:"rHeader"},a),b.createElement("tbody",{ref:"rBody"},h))},getInitialRow:function(a,c){var d=[];return this.props.enableSelection&&d.push(b.createElement(g,{key:"row_"+a+"_select",data:c})),d},renderColumn:function(a,c){for(var d=0;d<this.props.data.length;d++){var e=a[d]=a[d]||b.createElement("tr",{key:"row_"+d}),f=e.props.children=e.props.children||this.getInitialRow(d,this.props.data[d]);f.push(b.createElement(h,{key:"row_"+d+"_cell_"+c,data:this.props.data[d],definition:this.props.definitions[c],columnFieldValueProp:this.props.columnFieldValueProp,dataProp:this.props.dataProp,optimization:this.props.optimization}))}},renderSelectionColumn:function(a,c,d){this.props.enableSelection&&(a.push(b.createElement("col",{key:"col_selection",className:"rtable-col rtable-selection"})),c.push(b.createElement("th",{key:"header_cell_selection",className:"rtable-selection rtable-column-header"})),d.push(b.createElement("th",{key:"filter_cell_selection",className:"rtable-selection rtable-column-filter"})))}};a.exports={"class":i,Component:b.createClass(i)}},function(a){var b={};b.stringify=function(a){return JSON.stringify(a)},b.cloneProps=function(a){return JSON.parse(JSON.stringify(a))},b.equalProps=function(a,b){return JSON.stringify(a)===JSON.stringify(b)},b.warn=function(){console&&console.warn(arguments)},a.exports=b},function(a){a.exports=b},function(b){b.exports=a}],c(5)});
+!function(a){"function"==typeof define&&define.amd?define(["react","pubsub-js"],a):"object"==typeof exports?module.exports=a(require("react"),require("pubsub-js")):this.RTable=a(React,PubSub)}(function(){function a(b){var c=a.cache[b];if(!c){var d={};c=a.cache[b]={id:b,exports:d},a.modules[b].call(d,c,d)}return c.exports}return a.cache=[],a.modules=[function(a){var b={};b.stringify=function(a){return JSON.stringify(a)},b.cloneProps=function(a){return JSON.parse(JSON.stringify(a))},b.equalProps=function(a,b){return JSON.stringify(a)===JSON.stringify(b)},b.warn=function(){console&&console.warn(arguments)},a.exports=b}],a(0)});
 //# sourceMappingURL=rtable.min.js.map
\ No newline at end of file
diff --git a/dist/rtable.min.js.map b/dist/rtable.min.js.map
index 0fb2f76..eebe9a7 100644
--- a/dist/rtable.min.js.map
+++ b/dist/rtable.min.js.map
@@ -1 +1 @@
-{"version":3,"file":"rtable.min.js","sources":["umd\\rtable.js"],"names":["factory","define","amd","exports","module","require","this","RTable","React","PubSub","__external_React","__external_PubSub","_require","id","cache","modules","call","PropRenderMixin","componentWillMount","shouldUpdate","oldProps","componentWillReceiveProps","newProps","newPropsStr","props","optimization","JSON","stringify","shouldComponentUpdate","utils","RTableCell","createClass","mixins","displayName","getDefaultProps","data","definition","columnFieldValueProp","dataProp","propTypes","PropTypes","string","oneOfType","object","bool","render","def","dataObj","hasOwnProperty","warn","createElement","className","pubsub","RTableFilterCell","getInitialState","filter","handleChange","e","publish","value","target","setState","componentWillUnmount","unsubscribe","type","state","onChange","RTableHeaderCell","columnNameProp","header","RTableSelectCell","isChecked","checked","definitions","enableFilters","enableSelection","classes","fixedHeader","tableScroll","refs","rHeader","getDOMNode","style","width","rTable","clientWidth","scrollLeft","rBody","componentDidMount","addEventListener","componentWillUpdate","componentDidUpdate","removeEventListener","arrayOf","theadRows","headers","filters","colGroups","rows","classNames","length","renderSelectionColumn","i","push","key","renderColumn","ref","getInitialRow","rowIndex","arr","columnIndex","j","row","cells","children","cols","class","Component","oldObj","cloneProps","parse","equalProps","newObj","console","arguments"],"mappings":"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","sourceRoot":"C:\\Users\\dlebedynsky\\Documents\\Git\\RTable"}
\ No newline at end of file
+{"version":3,"file":"rtable.min.js","sources":["dist/rtable.js"],"names":["factory","define","amd","exports","module","require","this","RTable","React","PubSub","_require","id","cache","modules","call","utils","stringify","oldObj","JSON","cloneProps","parse","equalProps","newObj","warn","console","arguments"],"mappings":"CAAC,SAAUA,GACe,kBAAXC,SAAyBA,OAAOC,IAEvCD,QACI,QACA,aACDD,GACuB,gBAAZG,SAIdC,OAAOD,QAAUH,EAAQK,QAAQ,SAAUA,QAAQ,cAGnDC,KAAKC,OAASP,EAAQQ,MAAOC,SAEnC,WAEE,QAASC,GAASC,GACd,GAAIP,GAASM,EAASE,MAAMD,EAC5B,KAAKP,EAAQ,CACT,GAAID,KACJC,GAASM,EAASE,MAAMD,IACpBA,GAAIA,EACJR,QAASA,GAEbO,EAASG,QAAQF,GAAIG,KAAKX,EAASC,EAAQD,GAE/C,MAAOC,GAAOD,QAqBlB,MAnBAO,GAASE,SACTF,EAASG,SAAW,SAAUT,GACtB,GAAIW,KACJA,GAAMC,UAAY,SAAUC,GACxB,MAAOC,MAAKF,UAAUC,IAE1BF,EAAMI,WAAa,SAAUF,GACzB,MAAOC,MAAKE,MAAMF,KAAKF,UAAUC,KAErCF,EAAMM,WAAa,SAAUJ,EAAQK,GACjC,MAAOJ,MAAKF,UAAUC,KAAYC,KAAKF,UAAUM,IAErDP,EAAMQ,KAAO,WACLC,SACAA,QAAQD,KAAKE,YAGrBrB,EAAOD,QAAUY,IAElBL,EAAS","sourceRoot":"rtable.js"}
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 7be1db4..18f49df 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1,13 +1,25 @@
 var gulp = require('gulp'),
-	tasks = require('require-dir')('tasks'),
-	runSequence = require('run-sequence').use(gulp) 
-    del = require('del'),
-    fs = require('fs'),
-    jest = require('jest-cli');
+	tasks = require('require-dir')('tasks');
 
+/** Gulp Tasks
+connect - run server on localhost: 1234.
 
-gulp.task('clean', ['react-clean']);
+build - builds react and umd. Result is rtable.js.
+clean  - cleans all.
+dist - builds all and mins.
 
-gulp.task('default', function  () {
-		
-})
\ No newline at end of file
+watch - runs watcher changes in  jsx and cjs. 
+watch-dev - runs watchers for changes in cjs and test - runs test and linter.
+
+lint - linter on cjs files.
+test - runs jest tests.
+
+
+tasks/config.js - all configurations for tasks.
+**/
+
+gulp.task('clean', ['react-clean', 'dist-clean']);
+
+gulp.task('dist', ['dist-js', 'dist-css']);
+
+gulp.task('default',  ['build', 'watch'], function  () {});
\ No newline at end of file
diff --git a/jsx/RTable.js b/jsx/RTable.js
index fd80d90..aa655b3 100644
--- a/jsx/RTable.js
+++ b/jsx/RTable.js
@@ -44,7 +44,7 @@ var RTable = {
     },
     componentWillUnmount : function(){
         pubsub.publish('RTable.Unmounted', null);
-        //clean up
+        //clean up.
         pubsub.unsubscribe('RTable.Mounted');
         pubsub.unsubscribe('RTable.Updated');
         pubsub.unsubscribe('RTable.BeforeUpdated');
diff --git a/package.json b/package.json
index d8081d6..8402e8b 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,7 @@
     "gulp-plumber": "^0.6.6",
     "gulp-pure-cjs": "~0.1.4",
     "gulp-react": "^2.0.0",
-    "gulp-rename": "^1.2.0",
+    "gulp-rename": "~1.2.0",
     "gulp-uglifyjs": "^0.5.0",
     "gulp-watch": "^3.0.0",
     "jshint-stylish": "^1.0.0",
@@ -33,7 +33,8 @@
     "require-dir": "~0.1.0",
     "run-sequence": "^1.0.2",
     "stylus": "~0.49.3",
-    "stylish": "~0.5.0"
+    "stylish": "~0.5.0",
+    "gulp-cssmin": "~0.1.6"
   },
   "dependencies": {
     "bower": "^1.3.12",
diff --git a/tasks/build.js b/tasks/build.js
new file mode 100644
index 0000000..ff2af30
--- /dev/null
+++ b/tasks/build.js
@@ -0,0 +1,9 @@
+var gulp = require('gulp'),
+	runSequence = require('run-sequence').use(gulp),
+	fn;
+
+gulp.task('build', fn = function(cb){
+	runSequence('react', 'umd', cb);
+});
+
+module.exports = fn;
\ No newline at end of file
diff --git a/tasks/config.js b/tasks/config.js
index 967a086..371a9be 100644
--- a/tasks/config.js
+++ b/tasks/config.js
@@ -1,13 +1,36 @@
 module.exports = {
 	src : {
-		jsx : './jsx/**/**.js'
+		jsx : './jsx/**/**.js',
+		cjs : './cjs/**/**.js',
+		cjsInput : './cjs/rtable.js',
+		css : ['./css/**/*.css', '!./css/**/*.min.css']
 	},
 	dist : {
 		cjs : './cjs',
-		umd : './umd'
+		dist : './dist',
+		fileName : 'rtable.js',
+		exportName : 'RTable',
+		minFileName : 'rtable.min.js',
+		css : './css'
 	},
 	connect : {
 		port : 1234,
 		root : '.'
+	},
+	jest : {
+		//scriptPreprocessor : './tests/support/preprocessor.js',
+		unmockedModulePathPatterns: [
+            "react"
+        ],
+        testDirectoryName: "tests",
+        testPathIgnorePatterns: [
+            "node_modules",
+            "tests/support"
+        ],
+        moduleFileExtensions: [
+            "js",
+            "json",
+            "react"
+        ]
 	}
 };
\ No newline at end of file
diff --git a/tasks/dist-clean.js b/tasks/dist-clean.js
new file mode 100644
index 0000000..8779f9c
--- /dev/null
+++ b/tasks/dist-clean.js
@@ -0,0 +1,11 @@
+var gulp = require('gulp'), 
+	g = require ('./g'), 
+	config = require('./config'),
+	del = require('del'),
+	fn;
+
+gulp.task('dist-clean', fn =  function(){
+	del(config.dist.dist);
+});
+
+module.exports = fn;
\ No newline at end of file
diff --git a/tasks/dist.js b/tasks/dist.js
new file mode 100644
index 0000000..c108343
--- /dev/null
+++ b/tasks/dist.js
@@ -0,0 +1,24 @@
+var gulp = require('gulp'), 
+	g = require ('./g'), 
+	config = require('./config'),
+	fn = {};
+
+gulp.task('dist-js',['build'], fn.js = function(){
+  var path = config.dist.dist + '/'+config.dist.fileName;
+  return gulp.src(path)
+    .pipe(g.uglify(config.dist.minFileName, 
+    {
+      outSourceMap : true,
+      sourceRoot : config.dist.fileName
+    }))
+    .pipe(gulp.dest(config.dist.dist));
+});
+
+gulp.task('dist-css', fn.css = function(){
+	gulp.src(config.src.css)
+        .pipe(g.cssmin())
+        .pipe(g.rename({suffix: '.min'}))
+        .pipe(gulp.dest(config.dist.css));
+});
+
+module.exports = fn;
\ No newline at end of file
diff --git a/tasks/lint.js b/tasks/lint.js
new file mode 100644
index 0000000..b769e78
--- /dev/null
+++ b/tasks/lint.js
@@ -0,0 +1,13 @@
+var gulp = require('gulp'), 
+	g = require ('./g'), 
+	config = require('./config'),
+	fn;
+
+gulp.task('lint', fn = function(){
+  return gulp.src(config.src.cjs)
+    .pipe(g.jshint())
+    .pipe(g.jshint.reporter(g.stylish));
+});
+
+
+module.exports = fn;
\ No newline at end of file
diff --git a/tasks/react-clean.js b/tasks/react-clean.js
index 0ba2dc7..1d982ea 100644
--- a/tasks/react-clean.js
+++ b/tasks/react-clean.js
@@ -1,6 +1,7 @@
 var gulp = require('gulp'),
 	config = require('./config'),
-    del = require('del');
+    del = require('del'),
+    fn;
 
 
 gulp.task('react-clean', function(){
diff --git a/tasks/react.js b/tasks/react.js
index bc4fe07..e833c7e 100644
--- a/tasks/react.js
+++ b/tasks/react.js
@@ -3,7 +3,7 @@ var gulp = require('gulp'),
 	config = require('./config'),
 	fn;
 
-gulp.task('react', function(){
+gulp.task('react', fn = function(){
   return gulp.src(config.src.jsx)
     .pipe(g.plumber({errorHandler: g.notify.onError("Error: <%= error.message %> ")}))
     .pipe(g.react())
diff --git a/tasks/test.js b/tasks/test.js
new file mode 100644
index 0000000..bb96f09
--- /dev/null
+++ b/tasks/test.js
@@ -0,0 +1,11 @@
+var gulp = require('gulp'), 
+	g = require ('./g'), 
+	config = require('./config'),
+	fn;
+
+gulp.task('test', fn = function () {
+    return gulp.src('.').pipe(
+      g.jest(config.jest));
+});
+
+module.exports = fn;
\ No newline at end of file
diff --git a/tasks/umd.js b/tasks/umd.js
index 9ce054b..a82e812 100644
--- a/tasks/umd.js
+++ b/tasks/umd.js
@@ -4,16 +4,32 @@ var gulp = require('gulp'),
 	fs = require('fs'),
 	fn;
 
-gulp.task('umd', function  () {
+
+
+// Umd options
+var options = {
+  input:  config.src.cjsInput,
+  output: config.dist.fileName,
+  exports: config.dist.exportName,
+  map: false,
+  comments : true,
+  external : {
+  	react : {amd : 'react', global : 'React'},
+  	'pubsub-js' : {amd : 'pubsub-js', global : 'PubSub'}
+  }
+};
+
+gulp.task('umd', fn = function  () {
 	//needs umd folder to exist
-	if (!fs.existsSync(config.dist.umd)){
-	    fs.mkdirSync(config.dist.umd);
+	if (!fs.existsSync(config.dist.dist)){
+	    fs.mkdirSync(config.dist.dist);
 	}
 
-	return gulp.src(config.build.js +'/' +config.build.fileName)
+	return gulp.src(config.src.cjs)
 		.pipe(g.plumber({errorHandler: g.notify.onError("Error: <%= error.message %> ")}))
 		.pipe(g.pure(options))
-		.pipe(gulp.dest(config.build.umd))
-    .pipe(gulp.dest(config.dist))
+		.pipe(gulp.dest(config.dist.dist))
 		.on('error', g.notify.onError("Error: <%= error.message %>"));;
-});
\ No newline at end of file
+});
+
+module.exports = fn; 
\ No newline at end of file
diff --git a/tasks/watch.js b/tasks/watch.js
new file mode 100644
index 0000000..361852e
--- /dev/null
+++ b/tasks/watch.js
@@ -0,0 +1,38 @@
+var gulp = require('gulp'), 
+	g = require ('./g'), 
+	config = require('./config'),
+	fn = {};
+
+gulp.task('watch', fn.watch = function(){
+  register(config.src.jsx, ['react']);
+  register(config.src.cjs, ['umd']);
+});
+
+gulp.task('watch-dev', fn.watchTest = function(){
+	register(config.src.cjs, ['test',['lint']]);
+});
+
+
+function register(path, tasks){
+	var watch  = gulp.watch(path,{}, tasks, function(event) {
+	  console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
+	});
+	
+	watch.on('ready', function(watcher){ 
+		console.log('ready to watch path: ' + path);
+	});
+
+	watch.on('change', function(event) {
+	 // console.log('File ' + event.path + ' was ' + event.type + ', running tasks...');
+	});
+
+	watch.on('error', function(error){
+    console.log("Error: <%= error.message %> ");
+		g.notify.onError("Error: <%= error.message %> ");
+	});
+
+	return watch;
+}
+
+
+module.exports = fn;
\ No newline at end of file