diff --git a/package.json b/package.json
index 22acedd..14422f5 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "css-loader": "0.23.x",
     "mkdirp": "0.5.1",
     "ncp": "2.0.0",
-    "prop-types": "15.5.x",
+    "prop-types": "15.6.0",
     "rimraf": "2.5.x",
     "style-loader": "0.13.x",
     "webpack": "1.12.x",
@@ -65,9 +65,9 @@
     "d3": "4.9.1",
     "file-loader": "0.11.1",
     "lodash": "4.17.4",
-    "react": "15.6.x",
-    "react-dom": "15.6.x",
-    "react-dom-factories": "1.0.0",
+    "react": "16.0.0",
+    "react-dom": "16.0.0",
+    "react-dom-factories": "1.0.2",
     "react-redux": "5.0.x",
     "react-router-dom": "4.2.x",
     "redux": "3.6.x",
diff --git a/src/App.jsx b/src/App.jsx
index 56913a5..bbc057b 100644
--- a/src/App.jsx
+++ b/src/App.jsx
@@ -5,6 +5,7 @@ import NavItem from "./NavItem";
 
 import DynamicComponentsExample from "./dynamicComponentExample/DynamicComponentsExample";
 import RichGridExample from "./richGridExample/RichGridExample";
+import RichGridDeclarativeExample from "./richGridDeclarativeExample/RichGridDeclarativeExample";
 import RichComponentsExample from "./richComponentExample/RichComponentsExample";
 import EditorComponentsExample from "./editorComponentExample/EditorComponentsExample";
 import PinnedRowComponentExample from "./pinnedRowExample/PinnedRowComponentExample";
@@ -20,6 +21,7 @@ const SideBar = () => (
         <div style={{float: "left", width: 335, marginRight: 25}}>
             <ul className="nav nav-pills nav-stacked">
                 <NavItem to='/rich-grid'>Rich Grid Example</NavItem>
+                <NavItem to='/rich-grid-declarative'>Rich Grid with Declarative Markup</NavItem>
                 <NavItem to='/dynamic'>Dynamic React Component Example</NavItem>
                 <NavItem to='/rich-dynamic'>Dynamic React Components - Richer Example</NavItem>
                 <NavItem to='/editor'>Cell Editor Component Example</NavItem>
@@ -44,6 +46,7 @@ class App extends Component {
                     <Switch>
                         <Redirect from="/" exact to="/rich-grid"/>
                         <Route exact path='/rich-grid' component={RichGridExample}/>
+                        <Route exact path='/rich-grid-declarative' component={RichGridDeclarativeExample}/>
                         <Route exact path='/dynamic' component={DynamicComponentsExample}/>
                         <Route exact path='/rich-dynamic' component={RichComponentsExample}/>
                         <Route exact path='/editor' component={EditorComponentsExample}/>
@@ -63,97 +66,3 @@ class App extends Component {
 }
 
 export default App
-
-/*
-class App extends Component {
-    constructor(props) {
-        super(props);
-
-        let searchParams = new URLSearchParams(window.location.search);
-        let fromDocs = searchParams.has("fromDocs");
-        let example = searchParams.has("example") ? searchParams.get("example") : 'rich-grid';
-
-        this.state = {
-            example,
-            fromDocs
-        };
-
-        this.setExample = this.setExample.bind(this);
-    }
-
-    setExample(example) {
-        this.setState({
-            example
-        })
-    }
-
-    render() {
-        let header = null;
-        if (!this.state.fromDocs) {
-            header = (
-                <ul className="nav nav-pills">
-                    <li role="presentation" className={this.state.example === 'rich-grid' ? 'active' : null} onClick={() => this.setExample("rich-grid")}><a href="#">Rich Grid Example</a></li>
-                    <li role="presentation" className={this.state.example === 'dynamic' ? 'active' : null} onClick={() => this.setExample("dynamic")}><a href="#">Dynamic React Component Example</a></li>
-                    <li role="presentation" className={this.state.example === 'rich-dynamic' ? 'active' : null} onClick={() => this.setExample("rich-dynamic")}><a href="#">Dynamic React Components - Richer Example</a></li>
-                    <li role="presentation" className={this.state.example === 'editor' ? 'active' : null} onClick={() => this.setExample("editor")}><a href="#">Cell Editor Component Example</a></li>
-                    <li role="presentation" className={this.state.example === 'pinned-row' ? 'active' : null} onClick={() => this.setExample("pinned-row")}><a href="#">Pinned Row Renderer Example</a></li>
-                    <li role="presentation" className={this.state.example === 'full-width' ? 'active' : null} onClick={() => this.setExample("full-width")}><a href="#">Full Width Renderer Example</a></li>
-                    <li role="presentation" className={this.state.example === 'group-row' ? 'active' : null} onClick={() => this.setExample("group-row")}><a href="#">Grouped Row Inner Renderer Example</a></li>
-                    <li role="presentation" className={this.state.example === 'filter' ? 'active' : null} onClick={() => this.setExample("filter")}><a href="#">Filters Component Example</a></li>
-                    <li role="presentation" className={this.state.example === 'floating-filter' ? 'active' : null} onClick={() => this.setExample("floating-filter")}><a href="#">Floating Filters</a></li>
-                    <li role="presentation" className={this.state.example === 'master-detail' ? 'active' : null} onClick={() => this.setExample("master-detail")}><a href="#">Master Detail Example</a></li>
-                    <li role="presentation" className={this.state.example === 'simple-redux' ? 'active' : null} onClick={() => this.setExample("simple-redux")}><a href="#">Simple Redux Example</a></li>
-                    <li role="presentation" className={this.state.example === 'simple-redux-dynamic' ? 'active' : null} onClick={() => this.setExample("simple-redux-dynamic")}><a href="#">Simple Redux Dynamic Component Example</a></li>
-                </ul>)
-        }
-
-        let example = null;
-        switch (this.state.example) {
-            case 'dynamic':
-                example = <DynamicComponentsExample/>;
-                break;
-            case 'rich-dynamic':
-                example = <RichComponentsExample/>;
-                break;
-            case 'editor':
-                example = <EditorComponentsExample/>;
-                break;
-            case 'pinned-row':
-                example = <PinnedRowComponentExample/>;
-                break;
-            case 'full-width':
-                example = <FullWidthComponentExample/>;
-                break;
-            case 'group-row':
-                example = <GroupedRowInnerRendererComponentExample/>;
-                break;
-            case 'filter':
-                example = <FilterComponentExample/>;
-                break;
-            case 'master-detail':
-                example = <MasterDetailExample/>;
-                break;
-            case 'simple-redux':
-                example = <SimpleReduxExample/>;
-                break;
-            case 'floating-filter':
-                example = <FloatingFilterGridExample/>;
-                break;
-            case 'simple-redux-dynamic':
-                example = <SimpleReduxDynamicExample/>;
-                break;
-            default:
-                example = <RichGridExample/>;
-        }
-
-        return (
-            <div>
-                {header}
-                {example}
-            </div>
-        )
-    }
-}
-
-export default App
-*/
diff --git a/src/index.js b/src/index.js
index 36350b3..fe54af5 100644
--- a/src/index.js
+++ b/src/index.js
@@ -4,8 +4,8 @@ import React from "react";
 import {render} from "react-dom";
 import {BrowserRouter} from "react-router-dom";
 
-import "ag-grid-root/dist/styles/ag-grid.css";
-import "ag-grid-root/dist/styles/theme-fresh.css";
+import "ag-grid/dist/styles/ag-grid.css";
+import "ag-grid/dist/styles/theme-fresh.css";
 import "../node_modules/bootstrap/dist/css/bootstrap.css";
 
 import App from "./App";
diff --git a/src/richGridDeclarativeExample/DateComponent.jsx b/src/richGridDeclarativeExample/DateComponent.jsx
new file mode 100644
index 0000000..ba5145e
--- /dev/null
+++ b/src/richGridDeclarativeExample/DateComponent.jsx
@@ -0,0 +1,171 @@
+import React from "react";
+import * as PropTypes from "prop-types";
+
+// Date Component to be used in the date filter.
+// This is a very simple example of how a React component can be plugged as a DateComponentFramework
+// as you can see, the only requirement is that the React component implements the required methods
+// getDate and setDate and that it calls back into props.onDateChanged every time that the date changes.
+export default class DateComponent extends React.Component {
+
+    constructor(props) {
+        super(props);
+        //The state of this component is represented of:
+        //  The current date it holds, null by default, null if the date typed by the user is not valid or fields are blank
+        //  The current values that the user types in the input boxes, by default ''
+
+        //The textBoxes state is necessary since it can be set from ag-Grid. This can be seen in this example through
+        // the usage of the button DOB equals to 01/01/2000 in the example page.
+        this.state = {
+            date: null,
+            textBoxes: {
+                dd: '',
+                mm: '',
+                yyyy: ''
+            }
+        }
+    }
+
+    render() {
+        //Inlining styles to make simpler the component
+        let filterStyle = {
+            margin: '2px'
+        };
+        let ddStyle = {
+            width: '30px'
+        };
+        let mmStyle = {
+            width: '30px'
+        };
+        let yyyyStyle = {
+            width: '40px'
+        };
+        let resetStyle = {
+            padding: '2px',
+            backgroundColor: 'red',
+            borderRadius: '3px',
+            fontSize: '10px',
+            marginRight: '5px',
+            color: 'white'
+        };
+
+        return (
+            <div style={filterStyle}>
+                <span style={resetStyle} onClick={this.resetDate.bind(this)}>x</span>
+                <input onInput={this.onDateChanged.bind(this)} ref="dd" placeholder="dd" style={ddStyle}
+                       value={this.state.textBoxes.dd} maxLength="2"/>/
+                <input onInput={this.onDateChanged.bind(this)} ref="mm" placeholder="mm" style={mmStyle}
+                       value={this.state.textBoxes.mm} maxLength="2"/>/
+                <input onInput={this.onDateChanged.bind(this)} ref="yyyy" placeholder="yyyy" style={yyyyStyle}
+                       value={this.state.textBoxes.yyyy} maxLength="4"/>
+            </div>
+        );
+    }
+
+    //*********************************************************************************
+    //          METHODS REQUIRED BY AG-GRID
+    //*********************************************************************************
+
+    getDate() {
+        //ag-grid will call us here when in need to check what the current date value is hold by this
+        //component.
+        return this.state.date;
+    }
+
+    setDate(date) {
+        //ag-grid will call us here when it needs this component to update the date that it holds.
+        this.setState({
+            date,
+            textBoxes: {
+                dd: date ? date.getDate() : '',
+                mm: date ? date.getMonth() + 1 : '',
+                yyyy: date ? date.getFullYear() : ''
+            }
+        })
+    }
+
+    //*********************************************************************************
+    //          LINKS THE INTERNAL STATE AND AG-GRID
+    //*********************************************************************************
+
+    updateAndNotifyAgGrid(date, textBoxes) {
+        this.setState({
+                date: date,
+                textBoxes: textBoxes
+            },
+            //Callback after the state is set. This is where we tell ag-grid that the date has changed so
+            //it will proceed with the filtering and we can then expect ag-Grid to call us back to getDate
+            this.props.onDateChanged
+        );
+    }
+
+
+    //*********************************************************************************
+    //          LINKING THE UI, THE STATE AND AG-GRID
+    //*********************************************************************************
+
+    resetDate() {
+        let date = null;
+        let textBoxes = {
+            dd: '',
+            mm: '',
+            yyyy: '',
+        };
+
+        this.updateAndNotifyAgGrid(date, textBoxes)
+    }
+
+    onDateChanged() {
+        let date = this.parseDate(this.refs.dd.value, this.refs.mm.value, this.refs.yyyy.value);
+        let textBoxes = {
+            dd: this.refs.dd.value,
+            mm: this.refs.mm.value,
+            yyyy: this.refs.yyyy.value,
+        };
+
+        this.updateAndNotifyAgGrid(date, textBoxes)
+    }
+
+    //*********************************************************************************
+    //          INTERNAL LOGIC
+    //*********************************************************************************
+
+    parseDate(dd, mm, yyyy) {
+        //If any of the three input date fields are empty, stop and return null
+        if (dd.trim() === '' || mm.trim() === '' || yyyy.trim() === '') {
+            return null;
+        }
+
+        let day = Number(dd);
+        let month = Number(mm);
+        let year = Number(yyyy);
+
+        let date = new Date(year, month - 1, day);
+
+        //If the date is not valid
+        if (isNaN(date.getTime())) {
+            return null;
+        }
+
+        //Given that new Date takes any garbage in, it is possible for the user to specify a new Date
+        //like this (-1, 35, 1) and it will return a valid javascript date. In this example, it will
+        //return Sat Dec 01    1 00:00:00 GMT+0000 (GMT) - Go figure...
+        //To ensure that we are not letting non sensical dates to go through we check that the resultant
+        //javascript date parts (month, year and day) match the given date fields provided as parameters.
+        //If the javascript date parts don't match the provided fields, we assume that the input is non
+        //sensical... ie: Day=-1 or month=14, if this is the case, we return null
+        //This also protects us from non sensical dates like dd=31, mm=2 of any year
+        if (date.getDate() != day || date.getMonth() + 1 != month || date.getFullYear() != year) {
+            return null;
+        }
+
+        return date;
+    }
+}
+
+// the grid will always pass in one props called 'params',
+// which is the grid passing you the params for the cellRenderer.
+// this piece is optional. the grid will always pass the 'params'
+// props, so little need for adding this validation meta-data.
+DateComponent.propTypes = {
+    params: PropTypes.object
+};
\ No newline at end of file
diff --git a/src/richGridDeclarativeExample/HeaderGroupComponent.jsx b/src/richGridDeclarativeExample/HeaderGroupComponent.jsx
new file mode 100644
index 0000000..30fc1da
--- /dev/null
+++ b/src/richGridDeclarativeExample/HeaderGroupComponent.jsx
@@ -0,0 +1,46 @@
+import React from 'react';
+import * as PropTypes from 'prop-types';
+
+// Header component to be used as default for all the columns.
+export default class HeaderGroupComponent extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.props.columnGroup.getOriginalColumnGroup().addEventListener('expandedChanged', this.onExpandChanged.bind(this));
+        this.state = {
+            expanded: null
+        };
+    }
+
+    componentDidMount() {
+        this.onExpandChanged();
+    }
+
+    render() {
+        let arrowClassName = "customExpandButton " + (this.state.expanded ? " expanded" : " collapsed");
+
+        return <div>
+            <div className="customHeaderLabel"> {this.props.displayName}</div>
+            <div onClick={this.expandOrCollapse.bind(this)} className={arrowClassName}><i
+                className="fa fa-arrow-right"/></div>
+        </div>
+    }
+
+    expandOrCollapse() {
+        this.props.setExpanded(!this.state.expanded);
+    };
+
+    onExpandChanged() {
+        this.setState({
+            expanded: this.props.columnGroup.getOriginalColumnGroup().isExpanded()
+        })
+    }
+}
+
+// the grid will always pass in one props called 'params',
+// which is the grid passing you the params for the cellRenderer.
+// this piece is optional. the grid will always pass the 'params'
+// props, so little need for adding this validation meta-data.
+HeaderGroupComponent.propTypes = {
+    params: PropTypes.object
+};
\ No newline at end of file
diff --git a/src/richGridDeclarativeExample/NameCellEditor.jsx b/src/richGridDeclarativeExample/NameCellEditor.jsx
new file mode 100644
index 0000000..b7c2a65
--- /dev/null
+++ b/src/richGridDeclarativeExample/NameCellEditor.jsx
@@ -0,0 +1,117 @@
+import React from 'react';
+import * as PropTypes from 'prop-types';
+
+const KEY_BACKSPACE = 8;
+const KEY_DELETE = 46;
+const KEY_F2 = 113;
+
+// cell renderer for the proficiency column. this is a very basic cell editor,
+export default class NameCellEditor extends React.Component {
+
+    constructor(props) {
+        super(props);
+        // the entire ag-Grid properties are passed as one single object inside the params
+        this.state = this.createInitialState(props);
+    }
+
+    // work out how to present the data based on what the user hit. you don't need to do any of
+    // this for your ag-Grid cellEditor to work, however it makes sense to do this so the user
+    // experience is similar to Excel
+    createInitialState(props) {
+
+        let startValue;
+        const putCursorAtEndOnFocus = false;
+        const highlightAllOnFocus = false;
+
+        if (props.keyPress === KEY_BACKSPACE || props.keyPress === KEY_DELETE) {
+            // if backspace or delete pressed, we clear the cell
+            startValue = '';
+        } else if (props.charPress) {
+            // if a letter was pressed, we start with the letter
+            startValue = props.charPress;
+        } else {
+            // otherwise we start with the current value
+            startValue = props.value;
+            if (props.keyPress === KEY_F2) {
+                this.putCursorAtEndOnFocus = true;
+            } else {
+                this.highlightAllOnFocus = true;
+            }
+        }
+
+        return {
+            value: startValue,
+            putCursorAtEndOnFocus: putCursorAtEndOnFocus,
+            highlightAllOnFocus: highlightAllOnFocus
+        }
+    }
+
+    render() {
+        return (
+            <input ref="textField" value={this.state.value} onChange={this.onChangeListener.bind(this)}/>
+        );
+    }
+
+    onChangeListener(event) {
+        // if doing React, you will probably be using a library for managing immutable
+        // objects better. to keep this example simple, we don't use one.
+        const newState = {
+            value: event.target.value,
+            putCursorAtEndOnFocus: this.state.putCursorAtEndOnFocus,
+            highlightAllOnFocus: this.state.highlightAllOnFocus
+        };
+        this.setState(newState);
+    }
+
+    // called by ag-Grid, to get the final value
+    getValue() {
+        return this.state.value;
+    }
+
+    // cannot use componentDidMount because although the component might be ready from React's point of
+    // view, it may not yet be in the browser (put in by ag-Grid) so focus will not work
+    afterGuiAttached() {
+        // get ref from React component
+        const eInput = this.refs.textField;
+        eInput.focus();
+        if (this.highlightAllOnFocus) {
+            eInput.select();
+        } else {
+            // when we started editing, we want the carot at the end, not the start.
+            // this comes into play in two scenarios: a) when user hits F2 and b)
+            // when user hits a printable character, then on IE (and only IE) the carot
+            // was placed after the first character, thus 'apply' would end up as 'pplea'
+            const length = eInput.value ? eInput.value.length : 0;
+            if (length > 0) {
+                eInput.setSelectionRange(length, length);
+            }
+        }
+    }
+
+    // if we want the editor to appear in a popup, then return true.
+    isPopup() {
+        return false;
+    }
+
+    // return true here if you don't want to allow editing on the cell.
+    isCancelBeforeStart() {
+        return false;
+    }
+
+    // just to demonstrate, if you type in 'cancel' then the edit will not take effect
+    isCancelAfterEnd() {
+        if (this.state.value && this.state.value.toUpperCase() === 'CANCEL') {
+            return true;
+        } else {
+            return false;
+        }
+    }
+}
+
+// the grid will always pass in one props called 'params',
+// which is the grid passing you the params for the cellRenderer.
+// this piece is optional. the grid will always pass the 'params'
+// props, so little need for adding this validation meta-data.
+NameCellEditor.propTypes = {
+    params: PropTypes.object
+};
\ No newline at end of file
diff --git a/src/richGridDeclarativeExample/ProficiencyCellRenderer.jsx b/src/richGridDeclarativeExample/ProficiencyCellRenderer.jsx
new file mode 100644
index 0000000..d2760de
--- /dev/null
+++ b/src/richGridDeclarativeExample/ProficiencyCellRenderer.jsx
@@ -0,0 +1,24 @@
+import React from 'react';
+
+// cell renderer for the proficiency column. this is a very basic cell renderer,
+// it is arguable that we should not of used React and just returned a string of
+// html as a normal ag-Grid cellRenderer.
+export default class ProficiencyCellRenderer extends React.Component {
+
+    render() {
+        let backgroundColor;
+        if (this.props.value < 20) {
+            backgroundColor = 'red';
+        } else if (this.props.value < 60) {
+            backgroundColor = '#ff9900';
+        } else {
+            backgroundColor = '#00A000';
+        }
+
+        return (
+            <div className="div-percent-bar" style={{width: this.props.value + '%', backgroundColor: backgroundColor}}>
+                <div className="div-percent-value">{this.props.value}%</div>
+            </div>
+        );
+    }
+}
diff --git a/src/richGridDeclarativeExample/ProficiencyFilter.jsx b/src/richGridDeclarativeExample/ProficiencyFilter.jsx
new file mode 100644
index 0000000..b2d2900
--- /dev/null
+++ b/src/richGridDeclarativeExample/ProficiencyFilter.jsx
@@ -0,0 +1,90 @@
+import React from 'react';
+
+const PROFICIENCY_NAMES = ['No Filter', 'Above 40%', 'Above 60%', 'Above 80%'];
+
+// the proficiency filter component. this demonstrates how to integrate
+// a React filter component with ag-Grid.
+export default class ProficiencyFilter extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            selected: PROFICIENCY_NAMES[0]
+        };
+    }
+
+    // called by agGrid
+    doesFilterPass(params) {
+        const value = this.props.valueGetter(params);
+        const valueAsNumber = parseFloat(value);
+
+        switch (this.state.selected) {
+            case PROFICIENCY_NAMES[1] :
+                return valueAsNumber >= 40;
+            case PROFICIENCY_NAMES[2] :
+                return valueAsNumber >= 60;
+            case PROFICIENCY_NAMES[3] :
+                return valueAsNumber >= 80;
+            default :
+                return true;
+        }
+    };
+
+    // called by agGrid
+    isFilterActive() {
+        return this.state.selected !== PROFICIENCY_NAMES[0];
+    };
+
+    onButtonPressed(name) {
+        const newState = {selected: name};
+        // set the state, and once it is done, then call filterChangedCallback
+        this.setState(newState, this.props.filterChangedCallback);
+    }
+
+
+    getModel() {
+        return ''
+    }
+
+    setModel(model) {
+    }
+
+    render() {
+        const rows = [];
+        PROFICIENCY_NAMES.forEach((name) => {
+            const selected = this.state.selected === name;
+            rows.push(
+                <div key={name}>
+                    <label style={{paddingLeft: 4}}>
+                        <input type="radio" checked={selected} name={Math.random()}
+                               onChange={this.onButtonPressed.bind(this, name)}/>
+                        {name}
+                    </label>
+                </div>
+            );
+        });
+
+        return (
+            <div>
+                <div style={{
+                    textAlign: 'center',
+                    background: 'lightgray',
+                    width: '100%',
+                    display: 'block',
+                    borderBottom: '1px solid grey'
+                }}>
+                    <b>Custom Proficiency Filter</b>
+                </div>
+                {rows}
+            </div>
+        );
+    }
+
+    // these are other method that agGrid calls that we
+    // could of implemented, but they are optional and
+    // we have no use for them in this particular filter.
+    //getApi() {}
+    //afterGuiAttached(params) {}
+    //onNewRowsLoaded() {}
+    //onAnyFilterChanged() {}
+}
diff --git a/src/richGridDeclarativeExample/RefData.js b/src/richGridDeclarativeExample/RefData.js
new file mode 100644
index 0000000..d5a2941
--- /dev/null
+++ b/src/richGridDeclarativeExample/RefData.js
@@ -0,0 +1,129 @@
+export default class RefData {
+}
+
+RefData.FIRST_NAMES = [
+    "Sophie", "Isabelle", "Emily", "Olivia", "Lily", "Chloe", "Isabella",
+    "Amelia", "Jessica", "Sophia", "Ava", "Charlotte", "Mia", "Lucy", "Grace", "Ruby",
+    "Ella", "Evie", "Freya", "Isla", "Poppy", "Daisy", "Layla"
+];
+
+RefData.LAST_NAMES = [
+    "Beckham", "Black", "Braxton", "Brennan", "Brock", "Bryson", "Cadwell",
+    "Cage", "Carson", "Chandler", "Cohen", "Cole", "Corbin", "Dallas", "Dalton", "Dane",
+    "Donovan", "Easton", "Fisher", "Fletcher", "Grady", "Greyson", "Griffin", "Gunner",
+    "Hayden", "Hudson", "Hunter", "Jacoby", "Jagger", "Jaxon", "Jett", "Kade", "Kane",
+    "Keating", "Keegan", "Kingston", "Kobe"
+];
+
+RefData.COUNTRY_CODES = {
+    Ireland: "ie",
+    Spain: "es",
+    "United Kingdom": "gb",
+    France: "fr",
+    Germany: "de",
+    Sweden: "se",
+    Italy: "it",
+    Greece: "gr",
+    Iceland: "is",
+    Portugal: "pt",
+    Malta: "mt",
+    Norway: "no",
+    Brazil: "br",
+    Argentina: "ar",
+    Colombia: "co",
+    Peru: "pe",
+    Venezuela: "ve",
+    Uruguay: "uy"
+};
+
+RefData.COUNTRIES = [
+    {country: "Ireland", continent: "Europe", language: "English"},
+    {country: "Spain", continent: "Europe", language: "Spanish"},
+    {country: "United Kingdom", continent: "Europe", language: "English"},
+    {country: "France", continent: "Europe", language: "French"},
+    {country: "Germany", continent: "Europe", language: "(other)"},
+    {country: "Sweden", continent: "Europe", language: "(other)"},
+    {country: "Norway", continent: "Europe", language: "(other)"},
+    {country: "Italy", continent: "Europe", language: "(other)"},
+    {country: "Greece", continent: "Europe", language: "(other)"},
+    {country: "Iceland", continent: "Europe", language: "(other)"},
+    {country: "Portugal", continent: "Europe", language: "Portuguese"},
+    {country: "Malta", continent: "Europe", language: "(other)"},
+    {country: "Brazil", continent: "South America", language: "Portuguese"},
+    {country: "Argentina", continent: "South America", language: "Spanish"},
+    {country: "Colombia", continent: "South America", language: "Spanish"},
+    {country: "Peru", continent: "South America", language: "Spanish"},
+    {country: "Venezuela", continent: "South America", language: "Spanish"},
+    {country: "Uruguay", continent: "South America", language: "Spanish"}
+];
+
+RefData.DOB = [
+    new Date(2000, 0, 1),
+    new Date(2001, 1, 2),
+    new Date(2002, 2, 3),
+    new Date(2003, 3, 4),
+    new Date(2004, 4, 5),
+    new Date(2005, 5, 6),
+    new Date(2006, 6, 7),
+    new Date(2007, 7, 8),
+    new Date(2008, 8, 9),
+    new Date(2009, 9, 10),
+    new Date(2010, 10, 11),
+    new Date(2011, 11, 12)
+];
+
+RefData.ADDRESSES = [
+    '1197 Thunder Wagon Common, Cataract, RI, 02987-1016, US, (401) 747-0763',
+    '3685 Rocky Glade, Showtucket, NU, X1E-9I0, CA, (867) 371-4215',
+    '3235 High Forest, Glen Campbell, MS, 39035-6845, US, (601) 638-8186',
+    '2234 Sleepy Pony Mall , Drain, DC, 20078-4243, US, (202) 948-3634',
+    '2722 Hazy Turnabout, Burnt Cabins, NY, 14120-5642, US, (917) 604-6597',
+    '6686 Lazy Ledge, Two Rock, CA, 92639-3020, US, (619) 901-9911',
+    '2000 Dewy Limits, Wacahoota, NF, A4L-2V9, CA, (709) 065-3959',
+    '7710 Noble Pond Avenue, Bolivia, RI, 02931-1842, US, (401) 865-2160',
+    '3452 Sunny Vale, Pyro, ON, M8V-4Z0, CA, (519) 072-8609',
+    '4402 Dusty Cove, Many Farms, UT, 84853-8223, US, (435) 518-0673',
+    '5198 Silent Parade, Round Bottom, MD, 21542-9798, US, (301) 060-7245',
+    '8550 Shady Moor, Kitty Fork, CO, 80941-6207, US, (303) 502-3767',
+    '2131 Old Dell, Merry Midnight, AK, 99906-8842, US, (907) 369-2206',
+    '7390 Harvest Crest, Mosquito Crossing, RI, 02957-6116, US, (401) 463-6348',
+    '874 Little Point, Hot Coffee, BC, V3U-2P6, CA, (250) 706-9207',
+    '8834 Stony Pioneer Heights, Newlove, OR, 97419-8670, US, (541) 408-2213',
+    '9829 Grand Beach, Flint, UT, 84965-9900, US, (435) 700-5161',
+    '3799 Cozy Blossom Ramp, Ptarmigan, MS, 38715-0313, US, (769) 740-1526',
+    '3254 Silver Island Loop, Maunaloa, DE, 19869-3169, US, (302) 667-7671',
+    '1081 Middle Wood, Taylors Gut Landing, OR, 97266-2873, US, (541) 357-6310',
+    '1137 Umber Trail, Shacktown, NW, X3U-5Y8, CA, (867) 702-6883',
+    '9914 Hidden Bank, Wyoming, MO, 64635-9665, US, (636) 280-4192',
+    '7080 Misty Nectar Townline, Coward, AB, T9U-3N4, CA, (403) 623-2838',
+    '1184 Wishing Grounds, Vibank, NW, X7D-0V9, CA, (867) 531-2730',
+    '126 Easy Pointe, Grandview Beach, KY, 40928-9539, US, (502) 548-0956',
+    '6683 Colonial Street, Swan River, BC, V1A-9I8, CA, (778) 014-4257',
+    '960 Gentle Oak Lane, Shakopee, ND, 58618-6277, US, (701) 327-1219',
+    '6918 Cotton Pine Corner, Kenaston, IA, 52165-3975, US, (515) 906-7427',
+    '2368 Burning Woods, Ernfold, NY, 11879-9186, US, (646) 819-0355',
+    '5646 Quiet Shadow Chase, Tiger Tail, IA, 52283-5537, US, (712) 375-9225',
+    '5466 Foggy Mountain Dale, Sweet Home, MT, 59738-0251, US, (406) 881-1706',
+    '5313 Clear Willow Route, Amazon, BC, V0S-2S6, CA, (604) 340-7596',
+    '7000 Pleasant Autoroute, Spaceport City, UT, 84749-2448, US, (435) 154-3360',
+    '8359 Quaking Anchor Road, Gross, BC, V9O-0H5, CA, (250) 985-3859',
+    '5143 Amber Deer Hollow, New Deal, ND, 58446-0853, US, (701) 927-0322',
+    '6230 Jagged Bear Key, Young, AR, 72337-3811, US, (501) 805-7239',
+    '7207 Heather Vista, Devon, WY, 82520-1771, US, (307) 358-7092',
+    '9416 Red Rise Place, Spraytown, OK, 73809-4766, US, (580) 867-1973',
+    '3770 Golden Horse Diversion, Yelland, IL, 60471-1487, US, (224) 717-9349',
+    '4819 Honey Treasure Park, Alaska, NB, E1U-3I0, CA, (506) 656-9138',
+    '6187 Round Front, Land O Lakes, AK, 99873-6403, US, (907) 853-9063',
+    '9218 Crystal Highway, Pickelville, MT, 59847-9299, US, (406) 076-0024',
+    '6737 Bright Quay, Lazy Mountain, KY, 42390-4772, US, (606) 256-7288',
+    '237 Merry Campus, Twentysix, SC, 29330-4909, US, (864) 945-0157',
+    '446 Fallen Gate Rise, Petrolia, SC, 29959-9527, US, (864) 826-0553',
+    '2347 Indian Boulevard, Frisbee, VA, 23797-6458, US, (703) 656-8445',
+    '365 Emerald Grove Line, Level, NC, 28381-1514, US, (919) 976-7958',
+    '1207 Iron Extension, Klickitat, SC, 29197-8571, US, (803) 535-7888',
+    '6770 Cinder Glen, Caronport, OH, 45053-5002, US, (440) 369-4018',
+    '7619 Tawny Carrefour, Senlac, NV, 89529-9876, US, (775) 901-6433'];
+
+RefData.IT_SKILLS = ['android', 'css', 'html5', 'mac', 'windows'];
+
+RefData.IT_SKILLS_NAMES = ['Android', 'CSS', 'HTML 5', 'Mac', 'Windows'];
diff --git a/src/richGridDeclarativeExample/RichGridDeclarativeExample.css b/src/richGridDeclarativeExample/RichGridDeclarativeExample.css
new file mode 100644
index 0000000..e3bdaf9
--- /dev/null
+++ b/src/richGridDeclarativeExample/RichGridDeclarativeExample.css
@@ -0,0 +1,27 @@
+.ag-cell {
+    padding-top: 2px !important;
+    padding-bottom: 2px !important;
+}
+
+label {
+    font-weight: normal !important;
+}
+
+.div-percent-bar {
+    display: inline-block;
+    height: 20px;
+    position: relative;
+}
+
+.div-percent-value {
+    position: absolute;
+    padding-left: 4px;
+    font-weight: bold;
+    font-size: 13px;
+}
+
+.div-outer-div {
+    display: inline-block;
+    height: 100%;
+    width: 100%;
+}
diff --git a/src/richGridDeclarativeExample/RichGridDeclarativeExample.jsx b/src/richGridDeclarativeExample/RichGridDeclarativeExample.jsx
new file mode 100644
index 0000000..15dd7b8
--- /dev/null
+++ b/src/richGridDeclarativeExample/RichGridDeclarativeExample.jsx
@@ -0,0 +1,338 @@
+import React, {Component} from "react";
+import {AgGridColumn, AgGridReact} from "ag-grid-react";
+import RowDataFactory from "./RowDataFactory";
+import DateComponent from "./DateComponent.jsx";
+import SkillsCellRenderer from './SkillsCellRenderer.jsx';
+import NameCellEditor from './NameCellEditor.jsx';
+import ProficiencyCellRenderer from './ProficiencyCellRenderer.jsx';
+import RefData from './RefData';
+import SkillsFilter from './SkillsFilter.jsx';
+import ProficiencyFilter from './ProficiencyFilter.jsx';
+import HeaderGroupComponent from './HeaderGroupComponent.jsx';
+import SortableHeaderComponent from './SortableHeaderComponent.jsx';
+
+import "./RichGridDeclarativeExample.css";
+
+// take this line out if you do not want to use ag-Grid-Enterprise
+import "ag-grid-enterprise";
+
+export default class RichGridDeclarativeExample extends Component {
+
+    constructor() {
+        super();
+
+        this.state = {
+            quickFilterText: null,
+            showToolPanel: false,
+            rowData: new RowDataFactory().createRowData(),
+            icons: {
+                columnRemoveFromGroup: '<i class="fa fa-remove"/>',
+                filter: '<i class="fa fa-filter"/>',
+                sortAscending: '<i class="fa fa-long-arrow-down"/>',
+                sortDescending: '<i class="fa fa-long-arrow-up"/>',
+                groupExpanded: '<i class="fa fa-minus-square-o"/>',
+                groupContracted: '<i class="fa fa-plus-square-o"/>'
+            }
+        };
+    }
+
+    /* Grid Events we're listening to */
+    onGridReady = (params) => {
+        this.api = params.api;
+        this.columnApi = params.columnApi;
+    };
+
+    onCellClicked = (event) => {
+        console.log('onCellClicked: ' + event.data.name + ', col ' + event.colIndex);
+    };
+
+    onRowSelected = (event) => {
+        console.log('onRowSelected: ' + event.node.data.name);
+    };
+
+    /* Demo related methods */
+    onToggleToolPanel = (event) => {
+        this.setState({showToolPanel: event.target.checked});
+    };
+
+    deselectAll() {
+        this.api.deselectAll();
+    }
+
+    onQuickFilterText = (event) => {
+        this.setState({quickFilterText: event.target.value});
+    };
+
+    onRefreshData = () => {
+        this.setState({
+            rowData: new RowDataFactory().createRowData()
+        });
+    };
+
+    invokeSkillsFilterMethod = () => {
+        let skillsFilter = this.api.getFilterInstance('skills');
+        let componentInstance = skillsFilter.getFrameworkComponentInstance();
+        componentInstance.helloFromSkillsFilter();
+    };
+
+    dobFilter = () => {
+        let dateFilterComponent = this.api.getFilterInstance('dob');
+        dateFilterComponent.setFilterType('equals');
+        dateFilterComponent.setDateFrom('2000-01-01');
+
+        // as the date filter is a React component, and its using setState internally, we need
+        // to allow time for the state to be set (as setState is an async operation)
+        // simply wait for the next tick
+        setTimeout(() => {
+            this.api.onFilterChanged();
+        }, 0)
+    };
+
+    static countryCellRenderer(params) {
+        if (params.value) {
+            return `<img border='0' width='15' height='10' style='margin-bottom: 2px' src='http://flags.fmcdn.net/data/flags/mini/${RefData.COUNTRY_CODES[params.value]}.png'> ${params.value}`;
+        } else {
+            return null;
+        }
+    }
+
+    static dateCellRenderer(params) {
+        return RichGridDeclarativeExample.pad(params.value.getDate(), 2) + '/' +
+            RichGridDeclarativeExample.pad(params.value.getMonth() + 1, 2) + '/' +
+            params.value.getFullYear();
+    }
+
+    static pad(num, totalStringSize) {
+        let asString = num + "";
+        while (asString.length < totalStringSize) asString = "0" + asString;
+        return asString;
+    }
+
+    render() {
+        return (
+            <div style={{width: '900px'}}>
+                <h1>Rich Grid with Declarative Markup Example</h1>
+                <div style={{display: "inline-block", width: "100%"}}>
+                    <div style={{float: "left"}}>
+                        <b>Employees Skills and Contact Details</b><span id="rowCount"/>
+                    </div>
+                </div>
+                <div style={{marginTop: 10}}>
+                    <div>
+                        <span>
+                            Grid API:
+                            <button onClick={() => { this.api.selectAll() }} className="btn btn-primary">Select All</button>
+                            <button onClick={() => { this.api.deselectAll() }} className="btn btn-primary">Clear Selection</button>
+                        </span>
+                        <span style={{float: "right"}}>
+                            Column API:
+                            <button onClick={() => { this.columnApi.setColumnVisible('country', false) }} className="btn btn-primary">Hide Country Column</button>
+                            <button onClick={() => { this.columnApi.setColumnVisible('country', true) }} className="btn btn-primary">Show Country Column</button>
+                        </span>
+                    </div>
+                    <div style={{display: "inline-block", width: "100%", marginTop: 10, marginBottom: 10}}>
+                        <div style={{float: "left"}}>
+                            <label>
+                                <input type="checkbox" onChange={this.onToggleToolPanel} style={{marginRight: 5}}/>
+                                Show Tool Panel
+                            </label>
+                        </div>
+                        <div style={{float: "left", marginLeft: 20}}>
+                            <button onClick={this.onRefreshData} className="btn btn-primary">Refresh Data</button>
+                        </div>
+                        <div style={{float: "left", marginLeft: 20}}>
+                            <input type="text" onChange={this.onQuickFilterText} placeholder="Type text to filter..."/>
+                        </div>
+                        <div style={{float: "right"}}>
+                            Filter API:
+                            <button onClick={this.invokeSkillsFilterMethod}
+                                    className="btn btn-primary">Invoke Skills Filter Method
+                            </button>
+                            <button onClick={this.dobFilter} className="btn btn-primary">DOB equals to 01/01/2000ß</button>
+                        </div>
+                    </div>
+                    <div style={{height: 400, width: 900}} className="ag-fresh">
+                        <AgGridReact
+                            // listening for events
+                            onGridReady={this.onGridReady}
+                            onRowSelected={this.onRowSelected}
+                            onCellClicked={this.onCellClicked}
+
+                            // binding to simple properties
+                            showToolPanel={this.state.showToolPanel}
+                            quickFilterText={this.state.quickFilterText}
+
+                            // binding to an object property
+                            icons={this.state.icons}
+
+                            // binding to array properties
+                            rowData={this.state.rowData}
+
+                            // no binding, just providing hard coded strings for the properties
+                            // boolean properties will default to true if provided (ie enableColResize => enableColResize="true")
+                            suppressRowClickSelection
+                            rowSelection="multiple"
+                            enableColResize
+                            enableSorting
+                            enableFilter
+                            floatingFilter
+                            groupHeaders
+                            rowHeight="22"
+
+                            // setting grid wide date component
+                            dateComponentFramework={DateComponent}
+
+                            // setting default column properties
+                            defaultColDef={{
+                                headerComponentFramework: SortableHeaderComponent,
+                                headerComponentParams: {
+                                    menuIcon: 'fa-bars'
+                                }
+                            }}
+                        >
+                            <AgGridColumn headerName="#" width={30} checkboxSelection suppressSorting suppressMenu suppressFilter pinned></AgGridColumn>
+                            <AgGridColumn headerName="Employee" headerGroupComponentFramework={HeaderGroupComponent}>
+                                <AgGridColumn field="name" width={150} enableRowGroup enablePivot pinned editable cellEditorFramework={NameCellEditor}></AgGridColumn>
+                                <AgGridColumn field="country" width={150} enableRowGroup enablePivot pinned editable cellRenderer={RichGridDeclarativeExample.countryCellRenderer} filterParams={{cellRenderer: RichGridDeclarativeExample.countryCellRenderer, cellHeight:20}}></AgGridColumn>
+                                <AgGridColumn field="dob" width={145} headerName="DOB" filter="date" pinned columnGroupShow="open" cellRenderer={RichGridDeclarativeExample.dateCellRenderer}></AgGridColumn>
+                            </AgGridColumn>
+                            <AgGridColumn headerName="IT Skills">
+                                <AgGridColumn field="skills" width={120} enableRowGroup enablePivot suppressSorting cellRendererFramework={SkillsCellRenderer} filterFramework={SkillsFilter}></AgGridColumn>
+                                <AgGridColumn field="proficiency" width={135} enableValue cellRendererFramework={ProficiencyCellRenderer} filterFramework={ProficiencyFilter}></AgGridColumn>
+                            </AgGridColumn>
+                            <AgGridColumn headerName="Contact">
+                                <AgGridColumn field="mobile" width={150} filter="text"></AgGridColumn>
+                                <AgGridColumn field="landline" width={150} filter="text"></AgGridColumn>
+                                <AgGridColumn field="address" width={500} filter="text"></AgGridColumn>
+                            </AgGridColumn>
+                        </AgGridReact>
+                    </div>
+                    <div>
+                        <div className="row">
+                            <div className="col-sm-12"><h1>Rich Grid with Declarative Markup Example</h1></div>
+                        </div>
+                        <div className="row">
+                            <div className="col-sm-12">
+                                <h5>This example demonstrates many features of ag-Grid, with Grid and Column Definition defined declaratively (i.e. with markup).</h5>
+                                <p><span style={{fontWeight: 500}}>Select All/Clear Selection</span>: Select or Deselect
+                                    All
+                                    Rows</p>
+                                <p><span style={{fontWeight: 500}}>Hide/Show Country Column</span>: Select or Deselect
+                                    All
+                                    Rows
+                                    (expand the Employee column to show the Country column first)</p>
+                                <p><span style={{fontWeight: 500}}>Toggle The Tool Panel</span>: Let your users Pivot,
+                                    Group
+                                    and
+                                    Aggregate using the Tool Panel</p>
+                                <p><span style={{fontWeight: 500}}>Refresh Data</span>: Dynamically Update Grid Data</p>
+                                <p><span style={{fontWeight: 500}}>Quick Filter</span>: Perform Quick Grid Wide
+                                    Filtering
+                                    with
+                                    the Quick Filter</p>
+                                <p><span style={{fontWeight: 500}}>DOB Filter</span>: Set the DOB filter to 01/01/2000
+                                    using
+                                    the
+                                    Filter API (expand the Employee column to show the DOB column)</p>
+                                <p><span style={{fontWeight: 500}}>Custom Headers</span>: Sort, Filter and Render
+                                    Headers
+                                    using
+                                    Header Components</p>
+                            </div>
+                        </div>
+                        <div className="row">
+                            <div className="col-sm-4">
+                                <div className="card">
+                                    <div className="card-body">
+                                        <h4 className="card-title">Grid & Column API</h4>
+                                        <p className="card-text">Utilise Grid Features Programmatically Using the APIs
+                                            Available</p>
+                                        <a target="_blank" href="https://www.ag-grid.com/javascript-grid-api/"
+                                           className="btn btn-primary">Grid API</a>
+                                        <a target="_blank" href="https://www.ag-grid.com//javascript-grid-column-api/"
+                                           className="btn btn-primary">Column API</a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div className="col-sm-4">
+                                <div className="card">
+                                    <div className="card-body">
+                                        <h4 className="card-title">Header Components</h4>
+                                        <p className="card-text">Customer the Header with React Components</p>
+                                        <a target="_blank"
+                                           href="https://www.ag-grid.com//javascript-grid-header-rendering/#headerComponent"
+                                           className="btn btn-primary">Header Component</a>
+                                        <a target="_blank"
+                                           href="https://www.ag-grid.com//javascript-grid-header-rendering/#headerGroupComponent"
+                                           className="btn btn-primary">Header Group Component</a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div className="col-sm-4">
+                                <div className="card">
+                                    <div className="card-body">
+                                        <h4 className="card-title">Filters</h4>
+                                        <p className="card-text">Filter with Quick Filters, Floating Filters, Built In
+                                            Filters
+                                            or Using the
+                                            Filter API</p>
+                                        <a target="_blank" href="https://www.ag-grid.com//javascript-grid-filter-quick/"
+                                           className="btn btn-primary">Quick
+                                            Filter</a>
+                                        <a target="_blank"
+                                           href="https://www.ag-grid.com//javascript-grid-floating-filter-component/"
+                                           className="btn btn-primary">Floating Filters</a>
+                                        <a target="_blank" href="https://www.ag-grid.com//javascript-grid-filtering/"
+                                           className="btn btn-primary">Built in
+                                            Filters</a>
+                                        <a target="_blank"
+                                           href="https://www.ag-grid.com//javascript-grid-filtering/#accessing-filter-component-instances"
+                                           className="btn btn-primary">Filter API</a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div className="row">
+                            <div className="col-sm-4">
+                                <div className="card">
+                                    <div className="card-body">
+                                        <h4 className="card-title">Tool Panel</h4>
+                                        <p className="card-text">Let your users Pivot, Group and Aggregate using the
+                                            Tool
+                                            Panel</p>
+                                        <a target="_blank" href="https://www.ag-grid.com//javascript-grid-tool-panel/"
+                                           className="btn btn-primary">Tool Panel</a>
+                                    </div>
+                                </div>
+                            </div>
+                            <div className="col-sm-8">
+                                <div className="card">
+                                    <div className="card-body">
+                                        <h4 className="card-title">The Rest</h4>
+                                        <p className="card-text">Pinned Columns, Checkbox Selection, Customer Renderers,
+                                            Data
+                                            Updates</p>
+                                        <a target="_blank"
+                                           href="https://www.ag-grid.com/best-react-data-grid/?framework=react"
+                                           className="btn btn-primary">React with ag-Grid</a>
+                                        <a target="_blank" href="https://www.ag-grid.com//javascript-grid-pinning/"
+                                           className="btn btn-primary">Pinned Column</a>
+                                        <a target="_blank"
+                                           href="https://www.ag-grid.com//javascript-grid-selection/#checkboxSelection"
+                                           className="btn btn-primary">Checkbox Selection</a>
+                                        <a target="_blank"
+                                           href="https://www.ag-grid.com//javascript-grid-cell-rendering/"
+                                           className="btn btn-primary">Cell
+                                            Renderers</a>
+                                        <a target="_blank" href="https://www.ag-grid.com/javascript-grid-data-update/"
+                                           className="btn btn-primary">Updating Data</a>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        );
+    }
+}
diff --git a/src/richGridDeclarativeExample/RowDataFactory.js b/src/richGridDeclarativeExample/RowDataFactory.js
new file mode 100644
index 0000000..27ff58e
--- /dev/null
+++ b/src/richGridDeclarativeExample/RowDataFactory.js
@@ -0,0 +1,45 @@
+import RefData from './RefData';
+
+export default class RowDataFactory {
+
+    createRowData() {
+        const rowData = [];
+
+        for (let i = 0; i < 200; i++) {
+            const countryData = RefData.COUNTRIES[i % RefData.COUNTRIES.length];
+            rowData.push({
+                name: RefData.FIRST_NAMES[i % RefData.FIRST_NAMES.length] + ' ' + RefData.LAST_NAMES[i % RefData.LAST_NAMES.length],
+                skills: {
+                    android: Math.random() < 0.4,
+                    html5: Math.random() < 0.4,
+                    mac: Math.random() < 0.4,
+                    windows: Math.random() < 0.4,
+                    css: Math.random() < 0.4
+                },
+                dob: RefData.DOB[i % RefData.DOB.length],
+                address: RefData.ADDRESSES[i % RefData.ADDRESSES.length],
+                years: Math.round(Math.random() * 100),
+                proficiency: Math.round(Math.random() * 100),
+                country: countryData.country,
+                continent: countryData.continent,
+                language: countryData.language,
+                mobile: this.createRandomPhoneNumber(),
+                landline: this.createRandomPhoneNumber()
+            });
+        }
+
+        return rowData;
+    }
+
+    createRandomPhoneNumber() {
+        let result = '+';
+        for (let i = 0; i < 12; i++) {
+            result += Math.round(Math.random() * 10);
+            if (i === 2 || i === 5 || i === 8) {
+                result += ' ';
+            }
+        }
+        return result;
+    }
+
+}
\ No newline at end of file
diff --git a/src/richGridDeclarativeExample/SkillsCellRenderer.jsx b/src/richGridDeclarativeExample/SkillsCellRenderer.jsx
new file mode 100644
index 0000000..7c22d51
--- /dev/null
+++ b/src/richGridDeclarativeExample/SkillsCellRenderer.jsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import * as PropTypes from 'prop-types';
+import RefData from './RefData';
+
+export default class SkillsCellRenderer extends React.Component {
+
+    render() {
+        const skills = [];
+        const rowData = this.props.data;
+        RefData.IT_SKILLS.forEach((skill) => {
+            if (rowData && rowData.skills && rowData.skills[skill]) {
+                skills.push(<img key={skill} src={'images/skills/' + skill + '.png'} width={16} title={skill}/>);
+            }
+        });
+
+        return <span>{skills}</span>;
+    }
+
+}
+
+// the grid will always pass in one props called 'params',
+// which is the grid passing you the params for the cellRenderer.
+// this piece is optional. the grid will always pass the 'params'
+// props, so little need for adding this validation meta-data.
+SkillsCellRenderer.propTypes = {
+    params: PropTypes.object
+};
\ No newline at end of file
diff --git a/src/richGridDeclarativeExample/SkillsFilter.jsx b/src/richGridDeclarativeExample/SkillsFilter.jsx
new file mode 100644
index 0000000..cb44c89
--- /dev/null
+++ b/src/richGridDeclarativeExample/SkillsFilter.jsx
@@ -0,0 +1,126 @@
+import React from 'react';
+import RefData from './RefData';
+
+// the skills filter component. this can be laid out much better in a 'React'
+// way. there are design patterns you can apply to layout out your React classes.
+// however, i'm not worried, as the intention here is to show you ag-Grid
+// working with React, and that's all. i'm not looking for any awards for my
+// React design skills.
+export default class SkillsFilter extends React.Component {
+
+    constructor(props) {
+        super(props);
+        this.state = {
+            android: false,
+            css: false,
+            html5: false,
+            mac: false,
+            windows: false
+        };
+    }
+
+    getModel() {
+        return {
+            android: this.state.android,
+            css: this.state.css,
+            html5: this.state.html5,
+            mac: this.state.mac,
+            windows: this.state.windows
+        }
+    }
+
+    setModel(model) {
+        this.setState({
+            android: model ? model.android : null,
+            css: model ? model.css : null,
+            html5: model ? model.html5 : null,
+            mac: model ? model.mac : null,
+            windows: model ? model.windows : null
+        });
+    }
+
+    // called by agGrid
+    doesFilterPass(params) {
+
+        const rowSkills = params.data.skills;
+        let passed = true;
+
+        RefData.IT_SKILLS.forEach((skill) => {
+            if (this.state[skill]) {
+                if (!rowSkills[skill]) {
+                    passed = false;
+                }
+            }
+        });
+
+        return passed;
+    };
+
+    getModel() {
+        return ''
+    }
+
+    // called by agGrid
+    isFilterActive() {
+        const somethingSelected = this.state.android || this.state.css ||
+            this.state.html5 || this.state.mac || this.state.windows;
+        return somethingSelected;
+    };
+
+    onSkillChanged(skill, event) {
+        const newValue = event.target.checked;
+        const newModel = {};
+        newModel[skill] = newValue;
+        // set the state, and once it is done, then call filterChangedCallback
+        this.setState(newModel, this.props.filterChangedCallback);
+    }
+
+    helloFromSkillsFilter() {
+        alert("Hello From The Skills Filter!");
+    }
+
+    render() {
+
+        const skillsTemplates = [];
+        RefData.IT_SKILLS.forEach((skill, index) => {
+
+            const skillName = RefData.IT_SKILLS_NAMES[index];
+            const template = (
+                <label key={skill}
+                       style={{border: '1px solid lightgrey', margin: 4, padding: 4, display: 'inline-block'}}>
+                    <span>
+                        <div style={{textAlign: 'center'}}>{skillName}</div>
+                        <div>
+                            <input type="checkbox" onClick={this.onSkillChanged.bind(this, skill)}/>
+                            <img src={'images/skills/' + skill + '.png'} width={30}/>
+                        </div>
+                    </span>
+                </label>
+            );
+
+            skillsTemplates.push(template);
+        });
+
+        return (
+            <div style={{width: 380}}>
+                <div style={{
+                    textAlign: 'center',
+                    background: 'lightgray',
+                    width: '100%',
+                    display: 'block',
+                    borderBottom: '1px solid grey'
+                }}>
+                    <b>Custom Skills Filter</b>
+                </div>
+                {skillsTemplates}
+            </div>
+        );
+    }
+
+    // these are other method that agGrid calls that we
+    // could of implemented, but they are optional and
+    // we have no use for them in this particular filter.
+    //afterGuiAttached(params) {}
+    //onNewRowsLoaded() {}
+    //onAnyFilterChanged() {}
+}
diff --git a/src/richGridDeclarativeExample/SortableHeaderComponent.jsx b/src/richGridDeclarativeExample/SortableHeaderComponent.jsx
new file mode 100644
index 0000000..fe88a5a
--- /dev/null
+++ b/src/richGridDeclarativeExample/SortableHeaderComponent.jsx
@@ -0,0 +1,89 @@
+import React from "react";
+import * as PropTypes from "prop-types";
+
+// Header component to be used as default for all the columns.
+export default class SortableHeaderComponent extends React.Component {
+
+    constructor(props) {
+        super(props);
+
+        // this.sortChanged = this.onSortChanged.bind(this);
+        this.props.column.addEventListener('sortChanged', this.onSortChanged);
+
+        //The state of this component contains the current sort state of this column
+        //The possible values are: 'asc', 'desc' and ''
+        this.state = {
+            sorted: ''
+        }
+    }
+
+    componentWillUnmount() {
+        this.props.column.removeEventListener('sortChanged', this.onSortChanged);
+    }
+
+    render() {
+        let sortElements = [];
+        if (this.props.enableSorting) {
+            let downArrowClass = "customSortDownLabel " + (this.state.sorted === 'desc' ? " active" : "");
+            let upArrowClass = "customSortUpLabel " + (this.state.sorted === 'asc' ? " active" : "");
+            let removeArrowClass = "customSortRemoveLabel " + (this.state.sorted === '' ? " active" : "");
+
+            sortElements.push(<div key={`up${this.props.displayName}`} className={downArrowClass}
+                                   onClick={this.onSortRequested.bind(this, 'desc')}><i
+                className="fa fa-long-arrow-down"/></div>);
+            sortElements.push(<div key={`down${this.props.displayName}`} className={upArrowClass}
+                                   onClick={this.onSortRequested.bind(this, 'asc')}><i
+                className="fa fa-long-arrow-up"/></div>);
+            sortElements.push(<div key={`minus${this.props.displayName}`} className={removeArrowClass}
+                                   onClick={this.onSortRequested.bind(this, '')}><i
+                className="fa fa-times"/></div>)
+        }
+
+
+        let menuButton = null;
+        if (this.props.enableMenu) {
+            menuButton =
+                <div ref="menuButton" className="customHeaderMenuButton" onClick={this.onMenuClick.bind(this)}><i
+                    className={"fa " + this.props.menuIcon}/></div>
+        }
+
+        return <div>
+            {menuButton}
+            <div className="customHeaderLabel">{this.props.displayName}</div>
+            {sortElements}
+        </div>
+    }
+
+    onSortRequested(order, event) {
+        this.props.setSort(order, event.shiftKey);
+    };
+
+    onSortChanged = () => {
+        if (this.props.column.isSortAscending()) {
+            this.setState({
+                sorted: 'asc'
+            })
+        } else if (this.props.column.isSortDescending()) {
+            this.setState({
+                sorted: 'desc'
+            })
+        } else {
+            this.setState({
+                sorted: ''
+            })
+        }
+    };
+
+    onMenuClick() {
+        this.props.showColumnMenu(this.refs.menuButton);
+    };
+
+}
+
+// the grid will always pass in one props called 'params',
+// which is the grid passing you the params for the cellRenderer.
+// this piece is optional. the grid will always pass the 'params'
+// props, so little need for adding this validation meta-data.
+SortableHeaderComponent.propTypes = {
+    params: PropTypes.object
+};
\ No newline at end of file
diff --git a/src/richGridExample/ColDefFactory.jsx b/src/richGridExample/ColDefFactory.jsx
index 5d60678..15e0ea5 100644
--- a/src/richGridExample/ColDefFactory.jsx
+++ b/src/richGridExample/ColDefFactory.jsx
@@ -7,7 +7,6 @@ import ProficiencyFilter from './ProficiencyFilter.jsx';
 import HeaderGroupComponent from './HeaderGroupComponent.jsx';
 
 export default class ColDefFactory {
-
     createColDefs() {
         return [
             {
@@ -51,7 +50,7 @@ export default class ColDefFactory {
                     {
                         headerName: "DOB",
                         field: "dob",
-                        width: 110,
+                        width: 145,
                         enableRowGroup: true,
                         enablePivot: true,
                         filter: 'date',
diff --git a/src/richGridExample/DateComponent.jsx b/src/richGridExample/DateComponent.jsx
index 5ae4328..ba5145e 100644
--- a/src/richGridExample/DateComponent.jsx
+++ b/src/richGridExample/DateComponent.jsx
@@ -37,7 +37,7 @@ export default class DateComponent extends React.Component {
             width: '30px'
         };
         let yyyyStyle = {
-            width: '60px'
+            width: '40px'
         };
         let resetStyle = {
             padding: '2px',
diff --git a/src/richGridExample/RichGridExample.jsx b/src/richGridExample/RichGridExample.jsx
index d11a214..3586571 100644
--- a/src/richGridExample/RichGridExample.jsx
+++ b/src/richGridExample/RichGridExample.jsx
@@ -54,56 +54,50 @@ export default class RichGridExample extends Component {
             rowBuffer: 10, // no need to set this, the default is fine for almost all scenarios,
             floatingFilter: true
         };
-
-        this.onGridReady = this.onGridReady.bind(this);
-        this.onRowSelected = this.onRowSelected.bind(this);
-        this.onCellClicked = this.onCellClicked.bind(this);
     }
 
-    onToggleToolPanel(event) {
-        this.setState({showToolPanel: event.target.checked});
-    }
 
-    onGridReady(params) {
+    /* Grid Events we're listening to */
+    onGridReady = (params) => {
         this.api = params.api;
         this.columnApi = params.columnApi;
-    }
+    };
+
+    onCellClicked = (event) => {
+        console.log('onCellClicked: ' + event.data.name + ', col ' + event.colIndex);
+    };
+
+    onRowSelected = (event) => {
+        console.log('onRowSelected: ' + event.node.data.name);
+    };
+
+    /* Demo related methods */
+    onToggleToolPanel = (event) => {
+        this.setState({showToolPanel: event.target.checked});
+    };
 
     deselectAll() {
         this.api.deselectAll();
     }
 
-    setCountryVisible(visible) {
-        this.columnApi.setColumnVisible('country', visible);
-    }
-
-    onQuickFilterText(event) {
+    onQuickFilterText = (event) => {
         this.setState({quickFilterText: event.target.value});
-    }
+    };
 
-    onCellClicked(event) {
-        console.log('onCellClicked: ' + event.data.name + ', col ' + event.colIndex);
-    }
-
-    onRowSelected(event) {
-        console.log('onRowSelected: ' + event.node.data.name);
-    }
-
-    onRefreshData() {
-        let newRowData = new RowDataFactory().createRowData();
+    onRefreshData = () => {
         this.setState({
-            rowData: newRowData
+            rowData: new RowDataFactory().createRowData()
         });
-    }
+    };
 
-    invokeSkillsFilterMethod() {
+    invokeSkillsFilterMethod = () => {
         let skillsFilter = this.api.getFilterInstance('skills');
         let componentInstance = skillsFilter.getFrameworkComponentInstance();
         componentInstance.helloFromSkillsFilter();
-    }
+    };
 
-    dobFilter() {
-        let dateFilterComponent = this.gridOptions.api.getFilterInstance('dob');
+    dobFilter = () => {
+        let dateFilterComponent = this.api.getFilterInstance('dob');
         dateFilterComponent.setFilterType('equals');
         dateFilterComponent.setDateFrom('2000-01-01');
 
@@ -111,14 +105,14 @@ export default class RichGridExample extends Component {
         // to allow time for the state to be set (as setState is an async operation)
         // simply wait for the next tick
         setTimeout(() => {
-            this.gridOptions.api.onFilterChanged();
+            this.api.onFilterChanged();
         }, 0)
-    }
+    };
 
     render() {
         return (
             <div style={{width: '900px'}}>
-                <h1>Rich Grid Example</h1>
+                <h1>Rich Grid with Declarative Markup Example</h1>
                 <div style={{display: "inline-block", width: "100%"}}>
                     <div style={{float: "left"}}>
                         <b>Employees Skills and Contact Details</b><span id="rowCount"/>
@@ -128,42 +122,34 @@ export default class RichGridExample extends Component {
                     <div>
                         <span>
                             Grid API:
-                            <button onClick={() => {
-                                this.refs.myGrid.api.selectAll()
-                            }} className="btn btn-primary">Select All</button>
-                            <button onClick={this.deselectAll.bind(this)}
-                                    className="btn btn-primary">Clear Selection</button>
+                            <button onClick={() => { this.api.selectAll() }} className="btn btn-primary">Select All</button>
+                            <button onClick={() => { this.api.deselectAll() }} className="btn btn-primary">Clear Selection</button>
                         </span>
                         <span style={{float: "right"}}>
                             Column API:
-                            <button onClick={this.setCountryVisible.bind(this, false)} className="btn btn-primary">Hide Country Column</button>
-                            <button onClick={this.setCountryVisible.bind(this, true)} className="btn btn-primary">Show Country Column</button>
+                            <button onClick={() => { this.columnApi.setColumnVisible('country', false) }} className="btn btn-primary">Hide Country Column</button>
+                            <button onClick={() => { this.columnApi.setColumnVisible('country', true) }} className="btn btn-primary">Show Country Column</button>
                         </span>
                     </div>
                     <div style={{display: "inline-block", width: "100%", marginTop: 10, marginBottom: 10}}>
                         <div style={{float: "left"}}>
                             <label>
-                                <input type="checkbox" onChange={this.onToggleToolPanel.bind(this)}
-                                       style={{marginRight: 5}}/>
+                                <input type="checkbox" onChange={this.onToggleToolPanel} style={{marginRight: 5}}/>
                                 Show Tool Panel
                             </label>
                         </div>
                         <div style={{float: "left", marginLeft: 20}}>
-                            <button onClick={this.onRefreshData.bind(this)} className="btn btn-primary">Refresh Data
-                            </button>
+                            <button onClick={this.onRefreshData} className="btn btn-primary">Refresh Data</button>
                         </div>
                         <div style={{float: "left", marginLeft: 20}}>
-                            <input type="text" onChange={this.onQuickFilterText.bind(this)}
-                                   placeholder="Type text to filter..."/>
+                            <input type="text" onChange={this.onQuickFilterText} placeholder="Type text to filter..."/>
                         </div>
                         <div style={{float: "right"}}>
                             Filter API:
-                            <button onClick={this.invokeSkillsFilterMethod.bind(this, false)}
+                            <button onClick={this.invokeSkillsFilterMethod}
                                     className="btn btn-primary">Invoke Skills Filter Method
                             </button>
-                            <button onClick={this.dobFilter.bind(this)} className="btn btn-primary">DOB equals to
-                                01/01/2000
-                            </button>
+                            <button onClick={this.dobFilter} className="btn btn-primary">DOB equals to 01/01/2000ß</button>
                         </div>
                     </div>
                     <div style={{height: 400, width: 900}} className="ag-fresh">
@@ -190,14 +176,14 @@ export default class RichGridExample extends Component {
                             rowData={this.state.rowData}
 
                             // no binding, just providing hard coded strings for the properties
-                            suppressRowClickSelection="true"
+                            // boolean properties will default to true if provided (ie enableColResize => enableColResize="true")
+                            suppressRowClickSelection
                             rowSelection="multiple"
-                            enableColResize="true"
-                            enableSorting="true"
-                            enableFilter="true"
-                            groupHeaders="true"
-                            rowHeight="22"
-                        />
+                            enableColResize
+                            enableSorting
+                            enableFilter
+                            groupHeaders
+                            rowHeight="22"/>
                     </div>
                     <div>
                         <div className="row">
diff --git a/webpack.config.examples.js b/webpack.config.examples.js
index 4abeee4..292dc41 100644
--- a/webpack.config.examples.js
+++ b/webpack.config.examples.js
@@ -30,7 +30,9 @@ module.exports = {
     },
     resolve: {
         alias: {
-            "ag-grid-root" : __dirname + "/node_modules/ag-grid"
+            "ag-grid": path.resolve('./node_modules/ag-grid'),
+            "ag-grid-enterprise": path.resolve('./node_modules/ag-grid-enterprise'),
+            react: path.resolve('./node_modules/react')
         },
         extensions: ['', '.js', '.jsx']
     },