diff --git a/bower.json b/bower.json
index 9d60a3a..5cbaa63 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "tc-grid",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "homepage": "https://github.com/ThirdCornerLLC/tc-grid",
   "authors": [
     "Zach Barnes <Zacharias3690@gmail.com>",
diff --git a/dist/tc-grid.js b/dist/tc-grid.js
index b72b3b1..a7ad05e 100644
--- a/dist/tc-grid.js
+++ b/dist/tc-grid.js
@@ -321,7 +321,7 @@
                 }
 
                 function initSort() {
-                    if (!vm.options || !vm.options.sorting.sort) {
+                    if (!vm.options || !vm.options.sorting || !vm.options.sorting.sort) {
                         return;
                     }angular.forEach(vm.options.sorting.sort, function (sortItem) {
                         var col = sortItem.split(" ")[0];
diff --git a/dist/tc-grid.min.js b/dist/tc-grid.min.js
index dbf700d..24bf181 100644
--- a/dist/tc-grid.min.js
+++ b/dist/tc-grid.min.js
@@ -1 +1 @@
-"use strict";!function(){function t(t,n,i,e){return{restrict:"E",scope:!0,template:function(t,n){var e=t.find("tc-column"),o="";n.defaultHeaders=[],angular.forEach(e,function(i,e){var a=i.getAttribute("tc-class");i.setAttribute("data-identifier",Math.random()),i.setAttribute("tc-col-index",e+1),i.className+=" "+(a||"tc-style_td"),n.defaultHeaders.push({element:t,options:{tcName:i.getAttribute("tc-name"),tcField:i.getAttribute("tc-field"),identifier:i.getAttribute("data-identifier")}}),o+=i.outerHTML});var a=i.get("tcGrid.html");return a=a.replace(/%GRIDCLASS%/g,n.tcGridClass||"tc-grid"),a=a.replace(/%ROWCLASS%/g,n.tcRowClass?"":"tc-style_tr"),a=a.replace(/%ROWEXPRESSION%/g,n.tcRowClass||""),a=a.replace(/%ROWCLICK%/g,n.tcRowClick?'ng-click="'+n.tcRowClick+'"':""),a=a.replace(/%ROWLINK%/g,n.tcRowLink?' ng-href="'+n.tcRowLink+'"':""),a=a.replace(/%FILTER%/g,n.tcGridFilter?" | filter: "+n.tcGridFilter:""),a=a.replace(/%CHILDREN%/g,o)},controller:["$scope","$element","$attrs",function(i,o,a){function r(){k.options=t(a.tcOptions)(i.$parent),k.data=t(a.tcData)(i.$parent),c(),m(),v(),k.options&&(k.options.onLoad&&"function"==typeof k.options.onLoad?k.options.onLoad():k.options.sorting.onSortChange?O():k.options.paging.onPageChange&&_())}function s(){k.options.paging.currentPage=1,k.options.sorting.sort=[],R(),_(),O()}function c(){for(var t;null!=(t=a.defaultHeaders.shift());)p(t.element,t.options),t.element=null}function p(t,n){if(!l(n)){var i,e,o;n.tcField=n.tcField||"",n.tcName=n.tcName||n.tcField;var r=k.headerTemplates.length;n.tcField?(i=" ng-click=\"tcGrid.sort('"+n.tcField+"')\"",e=' id="'+a.tcOptions+"_"+n.tcField.replace(/\./g,"")+'"'):(i="",e=""),o=" ng-class=\"{'tc-hide-col': !tcGrid.columns['"+r+"'].visible}\"";var s='<div class="tc-display_th tc-style_th" tc-col-index="'+(r+1)+'"'+e+i+o+">"+n.tcName+'<span class="tc-display_sort tc-style_sort"></span></div>',c=angular.element(s);k.headerTemplates.push(c),k.columnTemplates.push(t.clone()),t=null,c=null,N(n),g()}}function l(t){for(var n=0;n<k.columns.length;n++)if(k.columns[n].identifier===t.identifier)return!0;return!1}function g(t){if(!t)for(var t=[],n=0;n<k.columns.length;n++)t.push(n+1);if(k.columns.length){var i=f();u(i,t),i=null}}function u(t,e){var o=angular.element(t.thead),a=angular.element(o.find("div")[0]);a.html("");for(var r in e){var s=d(k.headerTemplates,e[r]);a.append(s.clone()),s=null}n(o)(i),a=null,o=null,h()}function d(t,n){for(var i in t){var e=t[i].attr("tc-col-index"),o=t[i].attr("tc-name"),a=t[i].attr("tc-field");if(e==n||o==n||a==n)return t[i]}}function f(){var t,n,i,e=o.children().children().children()[0],a=Array.prototype.slice.call(e.children);for(var r in a)i=a[r],i.className&&i.className.indexOf("tc-display_thead")>-1?t=i:i.className&&i.className.indexOf("tc-display_tbody")>-1&&(n=i,n.parent=i.parentNode);return e.tbody=n,e.thead=t,n=null,t=null,e}function m(){k.options&&(k.options.reset=s,k.options.prev=P,k.options.next=S,k.options.first=G,k.options.last=b,k.options.sort=I,k.options.paging?C():k.options.paging={},k.options.sorting?h():k.options.sorting={})}function v(){function t(){return F?void(k.options&&k.options.paging&&y()):void(F=!0)}a.tcOptions&&i.$parent.$watch(a.tcOptions,function(n,i){if(k.options=n,n==i&&n.columnDisplay)g(k.options.columnDisplay);else if(n!=i||n.columnDisplay)n.columnDisplay!=i.columnDisplay&&g(k.options.columnDisplay);else{for(var e=[],o=0;o<k.columns.length;o++)e.push(o+1);g(e)}t()},!0),i.$parent.$watchCollection(a.tcData,function(t){k.data=t})}function C(){(!k.options.paging.pageSize||k.options.paging.pageSize<1)&&(k.options.paging.pageSizeOptions?k.options.paging.pageSize=k.options.paging.pageSizeOptions[0]:k.options.paging.pageSize=20),(!k.options.paging.totalItemCount||k.options.paging.totalItemCount<0)&&(k.options.paging.totalItemCount=0),(!k.options.paging.currentPage||k.options.paging.currentPage<1)&&(k.options.paging.currentPage=1),y(),a.tcHideFooter||(k.showFooter=!0)}function h(){k.options&&k.options.sorting.sort&&angular.forEach(k.options.sorting.sort,function(t){var n=t.split(" ")[0],i=t.split(" ")[1]||"asc",e=$(n);e&&(e.addClass(i.toLowerCase()),e=null)})}function y(){k.pageCount=k.options.paging.totalItemCount>0?Math.ceil(k.options.paging.totalItemCount/k.options.paging.pageSize):0,k.pageCount<1&&(k.pageCount=1),k.options.paging.pageCount=k.pageCount}function G(){k.options.paging.currentPage=1,_()}function P(){k.options.paging.currentPage-=1,k.options.paging.currentPage<1&&(k.options.paging.currentPage=1),_()}function S(){k.options.paging.currentPage+=1,k.options.paging.currentPage>k.pageCount&&(k.options.paging.currentPage=k.pageCount),_()}function b(){k.options.paging.currentPage=k.pageCount,_()}function _(){k.options.paging.onPageChange&&k.options.paging.onPageChange(k.options.paging.currentPage,k.options.paging.pageSize,k.options.sorting.sort)}function O(){k.options.sorting.onSortChange&&(k.options.paging?(k.options.paging.currentPage=1,k.options.sorting.onSortChange(k.options.paging.currentPage,k.options.paging.pageSize,k.options.sorting.sort)):k.options.sorting.onSortChange(null,null,k.options.sorting.sort))}function I(t){if(0!==Object.getOwnPropertyNames(k.columns).length){var n=$(t);if(n){var i="asc";n.hasClass("asc")&&(i="desc"),R(),n.addClass(i),k.options.sorting.sort=[t+" "+i],O(),n=null}}}function R(){angular.forEach(Object.keys(k.columns),function(t){if(k.columns[t].field){var n=$(k.columns[t].field);n&&(n.removeClass("desc"),n.removeClass("asc"),n=null)}})}function $(t){if(t){var n=a.tcOptions+"_"+t.replace(/\./g,""),i=document.getElementById(n);if(i){var e=i.childNodes;for(var o in e)if(e[o].className&&e[o].className.indexOf("tc-display_sort")>-1)return angular.element(e[o])}return null}}function N(t){k.columns.push({field:t.tcField,identifier:t.identifier,visible:!0})}function w(){y(),k.options.paging.currentPage>k.pageCount?k.options.paging.currentPage=k.pageCount:k.options.paging.currentPage<0&&(k.options.paging.currentPage=0),_()}var L,z,F=!1,k=this;k.pageCount=1,k.showFooter=!1,k.columns=[],k.columnTemplates=[],k.headerTemplates=[],k.rowTemplate=a.rowTemplate,a.rowTemplate=null,k.addColumn=N,k.prev=P,k.next=S,k.first=G,k.last=b,k.sort=I,k.updatePageSize=w,k.orderColumns=g,k.registerColumn=p,r(),i.$on("$destroy",function(){L&&e.cancel(L),z&&e.cancel(z)})}],controllerAs:"tcGrid"}}function n(){return{restrict:"E",require:"^?tcGrid",replace:!0,transclude:!0,template:function(t){var n=function(n,i){return t.apply(this,arguments)};return n.toString=function(){return t.toString()},n}(function(t,n){var i="<div class='tc-display_td' ng-transclude";return n.tcIgnoreClick&&(i+=' ng-click="$event.preventDefault();$event.stopPropagation();"'),i+="></div>"}),compile:function(t,n){return n.tcIgnoreClick&&t.attr("ng-click","test();vm.test()"),{post:function(t,n,i,e){e&&e.registerColumn(n,i)}}},controller:["$scope","$element","$attrs",function(t,n,i){t.test=function(){console.log("test")}}]}}angular.module("tc-grid",[]).directive("tcGrid",t).directive("tcColumn",n),t.$inject=["$parse","$compile","$templateCache","$timeout"]}(),angular.module("tc-grid").run(["$templateCache",function(t){t.put("tcGrid.html",'<div class="tcGrid__scope">\r\n    <div class="%GRIDCLASS%">\r\n        <div class="tc-display_table tc-style_table">\r\n            <div class="tc-display_thead tc-style_thead">\r\n                <div class="tc-display_tr tc-style_tr"></div>\r\n            </div>\r\n            <div class="tc-display_tbody tc-style_tbody">\r\n                <a class="tc-display_tr %ROWCLASS%" ng-class="%ROWEXPRESSION%" id="tc-row-container" ng-repeat="row in tcGrid.data %FILTER%" %ROWCLICK% %ROWLINK%>\r\n                    %CHILDREN%\r\n                </a>\r\n            </div>\r\n\r\n        </div>\r\n\r\n        <div class="tc-display_pager tc-style_pager" ng-show="tcGrid.showFooter && tcGrid.pageCount > 1">\r\n            <div class="tc-display_item-total">\r\n                {{(tcGrid.options.paging.currentPage - 1) * tcGrid.options.paging.pageSize + 1}}\r\n                -\r\n                {{tcGrid.options.paging.currentPage === tcGrid.pageCount ? tcGrid.options.paging.totalItemCount : tcGrid.options.paging.currentPage * tcGrid.options.paging.pageSize}}\r\n                of\r\n                {{tcGrid.options.paging.totalItemCount}}\r\n            </div>\r\n            <div class="tc-display_page-nav">\r\n                <span class="tc-style_page-display">{{tcGrid.options.paging.currentPage}} / {{tcGrid.pageCount}}</span>\r\n                <select class="tc-select" ng-if="tcGrid.options.paging.pageSizeOptions.length" ng-options="pageSize for pageSize in tcGrid.options.paging.pageSizeOptions" ng-model="tcGrid.options.paging.pageSize" ng-change="tcGrid.updatePageSize()"></select>\r\n                <button class="tc-button" ng-click="tcGrid.first()" ng-disabled="tcGrid.options.paging.currentPage === 1"><strong>|</strong>&#9668;</button>\r\n                <button class="tc-button" ng-click="tcGrid.prev()" ng-disabled="tcGrid.options.paging.currentPage === 1">&#9668;</button>\r\n                <button class="tc-button" ng-click="tcGrid.next()" ng-disabled="tcGrid.options.paging.currentPage === tcGrid.pageCount">&#9658;</button>\r\n                <button class="tc-button" ng-click="tcGrid.last()" ng-disabled="tcGrid.options.paging.currentPage === tcGrid.pageCount">&#9658;<strong>|</strong></button>\r\n            </div>\r\n            <div class="clearfix"></div>\r\n        </div>\r\n    </div>\r\n</div>\r\n\r\n\r\n')}]);
\ No newline at end of file
+"use strict";!function(){function t(t,n,i,o){return{restrict:"E",scope:!0,template:function(t,n){var o=t.find("tc-column"),e="";n.defaultHeaders=[],angular.forEach(o,function(i,o){var a=i.getAttribute("tc-class");i.setAttribute("data-identifier",Math.random()),i.setAttribute("tc-col-index",o+1),i.className+=" "+(a||"tc-style_td"),n.defaultHeaders.push({element:t,options:{tcName:i.getAttribute("tc-name"),tcField:i.getAttribute("tc-field"),identifier:i.getAttribute("data-identifier")}}),e+=i.outerHTML});var a=i.get("tcGrid.html");return a=a.replace(/%GRIDCLASS%/g,n.tcGridClass||"tc-grid"),a=a.replace(/%ROWCLASS%/g,n.tcRowClass?"":"tc-style_tr"),a=a.replace(/%ROWEXPRESSION%/g,n.tcRowClass||""),a=a.replace(/%ROWCLICK%/g,n.tcRowClick?'ng-click="'+n.tcRowClick+'"':""),a=a.replace(/%ROWLINK%/g,n.tcRowLink?' ng-href="'+n.tcRowLink+'"':""),a=a.replace(/%FILTER%/g,n.tcGridFilter?" | filter: "+n.tcGridFilter:""),a=a.replace(/%CHILDREN%/g,e)},controller:["$scope","$element","$attrs",function(i,e,a){function r(){k.options=t(a.tcOptions)(i.$parent),k.data=t(a.tcData)(i.$parent),c(),m(),v(),k.options&&(k.options.onLoad&&"function"==typeof k.options.onLoad?k.options.onLoad():k.options.sorting.onSortChange?O():k.options.paging.onPageChange&&_())}function s(){k.options.paging.currentPage=1,k.options.sorting.sort=[],R(),_(),O()}function c(){for(var t;null!=(t=a.defaultHeaders.shift());)p(t.element,t.options),t.element=null}function p(t,n){if(!l(n)){var i,o,e;n.tcField=n.tcField||"",n.tcName=n.tcName||n.tcField;var r=k.headerTemplates.length;n.tcField?(i=" ng-click=\"tcGrid.sort('"+n.tcField+"')\"",o=' id="'+a.tcOptions+"_"+n.tcField.replace(/\./g,"")+'"'):(i="",o=""),e=" ng-class=\"{'tc-hide-col': !tcGrid.columns['"+r+"'].visible}\"";var s='<div class="tc-display_th tc-style_th" tc-col-index="'+(r+1)+'"'+o+i+e+">"+n.tcName+'<span class="tc-display_sort tc-style_sort"></span></div>',c=angular.element(s);k.headerTemplates.push(c),k.columnTemplates.push(t.clone()),t=null,c=null,N(n),g()}}function l(t){for(var n=0;n<k.columns.length;n++)if(k.columns[n].identifier===t.identifier)return!0;return!1}function g(t){if(!t)for(var t=[],n=0;n<k.columns.length;n++)t.push(n+1);if(k.columns.length){var i=f();u(i,t),i=null}}function u(t,o){var e=angular.element(t.thead),a=angular.element(e.find("div")[0]);a.html("");for(var r in o){var s=d(k.headerTemplates,o[r]);a.append(s.clone()),s=null}n(e)(i),a=null,e=null,h()}function d(t,n){for(var i in t){var o=t[i].attr("tc-col-index"),e=t[i].attr("tc-name"),a=t[i].attr("tc-field");if(o==n||e==n||a==n)return t[i]}}function f(){var t,n,i,o=e.children().children().children()[0],a=Array.prototype.slice.call(o.children);for(var r in a)i=a[r],i.className&&i.className.indexOf("tc-display_thead")>-1?t=i:i.className&&i.className.indexOf("tc-display_tbody")>-1&&(n=i,n.parent=i.parentNode);return o.tbody=n,o.thead=t,n=null,t=null,o}function m(){k.options&&(k.options.reset=s,k.options.prev=P,k.options.next=S,k.options.first=G,k.options.last=b,k.options.sort=I,k.options.paging?C():k.options.paging={},k.options.sorting?h():k.options.sorting={})}function v(){function t(){return F?void(k.options&&k.options.paging&&y()):void(F=!0)}a.tcOptions&&i.$parent.$watch(a.tcOptions,function(n,i){if(k.options=n,n==i&&n.columnDisplay)g(k.options.columnDisplay);else if(n!=i||n.columnDisplay)n.columnDisplay!=i.columnDisplay&&g(k.options.columnDisplay);else{for(var o=[],e=0;e<k.columns.length;e++)o.push(e+1);g(o)}t()},!0),i.$parent.$watchCollection(a.tcData,function(t){k.data=t})}function C(){(!k.options.paging.pageSize||k.options.paging.pageSize<1)&&(k.options.paging.pageSizeOptions?k.options.paging.pageSize=k.options.paging.pageSizeOptions[0]:k.options.paging.pageSize=20),(!k.options.paging.totalItemCount||k.options.paging.totalItemCount<0)&&(k.options.paging.totalItemCount=0),(!k.options.paging.currentPage||k.options.paging.currentPage<1)&&(k.options.paging.currentPage=1),y(),a.tcHideFooter||(k.showFooter=!0)}function h(){k.options&&k.options.sorting&&k.options.sorting.sort&&angular.forEach(k.options.sorting.sort,function(t){var n=t.split(" ")[0],i=t.split(" ")[1]||"asc",o=$(n);o&&(o.addClass(i.toLowerCase()),o=null)})}function y(){k.pageCount=k.options.paging.totalItemCount>0?Math.ceil(k.options.paging.totalItemCount/k.options.paging.pageSize):0,k.pageCount<1&&(k.pageCount=1),k.options.paging.pageCount=k.pageCount}function G(){k.options.paging.currentPage=1,_()}function P(){k.options.paging.currentPage-=1,k.options.paging.currentPage<1&&(k.options.paging.currentPage=1),_()}function S(){k.options.paging.currentPage+=1,k.options.paging.currentPage>k.pageCount&&(k.options.paging.currentPage=k.pageCount),_()}function b(){k.options.paging.currentPage=k.pageCount,_()}function _(){k.options.paging.onPageChange&&k.options.paging.onPageChange(k.options.paging.currentPage,k.options.paging.pageSize,k.options.sorting.sort)}function O(){k.options.sorting.onSortChange&&(k.options.paging?(k.options.paging.currentPage=1,k.options.sorting.onSortChange(k.options.paging.currentPage,k.options.paging.pageSize,k.options.sorting.sort)):k.options.sorting.onSortChange(null,null,k.options.sorting.sort))}function I(t){if(0!==Object.getOwnPropertyNames(k.columns).length){var n=$(t);if(n){var i="asc";n.hasClass("asc")&&(i="desc"),R(),n.addClass(i),k.options.sorting.sort=[t+" "+i],O(),n=null}}}function R(){angular.forEach(Object.keys(k.columns),function(t){if(k.columns[t].field){var n=$(k.columns[t].field);n&&(n.removeClass("desc"),n.removeClass("asc"),n=null)}})}function $(t){if(t){var n=a.tcOptions+"_"+t.replace(/\./g,""),i=document.getElementById(n);if(i){var o=i.childNodes;for(var e in o)if(o[e].className&&o[e].className.indexOf("tc-display_sort")>-1)return angular.element(o[e])}return null}}function N(t){k.columns.push({field:t.tcField,identifier:t.identifier,visible:!0})}function w(){y(),k.options.paging.currentPage>k.pageCount?k.options.paging.currentPage=k.pageCount:k.options.paging.currentPage<0&&(k.options.paging.currentPage=0),_()}var L,z,F=!1,k=this;k.pageCount=1,k.showFooter=!1,k.columns=[],k.columnTemplates=[],k.headerTemplates=[],k.rowTemplate=a.rowTemplate,a.rowTemplate=null,k.addColumn=N,k.prev=P,k.next=S,k.first=G,k.last=b,k.sort=I,k.updatePageSize=w,k.orderColumns=g,k.registerColumn=p,r(),i.$on("$destroy",function(){L&&o.cancel(L),z&&o.cancel(z)})}],controllerAs:"tcGrid"}}function n(){return{restrict:"E",require:"^?tcGrid",replace:!0,transclude:!0,template:function(t){var n=function(n,i){return t.apply(this,arguments)};return n.toString=function(){return t.toString()},n}(function(t,n){var i="<div class='tc-display_td' ng-transclude";return n.tcIgnoreClick&&(i+=' ng-click="$event.preventDefault();$event.stopPropagation();"'),i+="></div>"}),compile:function(t,n){return n.tcIgnoreClick&&t.attr("ng-click","test();vm.test()"),{post:function(t,n,i,o){o&&o.registerColumn(n,i)}}},controller:["$scope","$element","$attrs",function(t,n,i){t.test=function(){console.log("test")}}]}}angular.module("tc-grid",[]).directive("tcGrid",t).directive("tcColumn",n),t.$inject=["$parse","$compile","$templateCache","$timeout"]}(),angular.module("tc-grid").run(["$templateCache",function(t){t.put("tcGrid.html",'<div class="tcGrid__scope">\r\n    <div class="%GRIDCLASS%">\r\n        <div class="tc-display_table tc-style_table">\r\n            <div class="tc-display_thead tc-style_thead">\r\n                <div class="tc-display_tr tc-style_tr"></div>\r\n            </div>\r\n            <div class="tc-display_tbody tc-style_tbody">\r\n                <a class="tc-display_tr %ROWCLASS%" ng-class="%ROWEXPRESSION%" id="tc-row-container" ng-repeat="row in tcGrid.data %FILTER%" %ROWCLICK% %ROWLINK%>\r\n                    %CHILDREN%\r\n                </a>\r\n            </div>\r\n\r\n        </div>\r\n\r\n        <div class="tc-display_pager tc-style_pager" ng-show="tcGrid.showFooter && tcGrid.pageCount > 1">\r\n            <div class="tc-display_item-total">\r\n                {{(tcGrid.options.paging.currentPage - 1) * tcGrid.options.paging.pageSize + 1}}\r\n                -\r\n                {{tcGrid.options.paging.currentPage === tcGrid.pageCount ? tcGrid.options.paging.totalItemCount : tcGrid.options.paging.currentPage * tcGrid.options.paging.pageSize}}\r\n                of\r\n                {{tcGrid.options.paging.totalItemCount}}\r\n            </div>\r\n            <div class="tc-display_page-nav">\r\n                <span class="tc-style_page-display">{{tcGrid.options.paging.currentPage}} / {{tcGrid.pageCount}}</span>\r\n                <select class="tc-select" ng-if="tcGrid.options.paging.pageSizeOptions.length" ng-options="pageSize for pageSize in tcGrid.options.paging.pageSizeOptions" ng-model="tcGrid.options.paging.pageSize" ng-change="tcGrid.updatePageSize()"></select>\r\n                <button class="tc-button" ng-click="tcGrid.first()" ng-disabled="tcGrid.options.paging.currentPage === 1"><strong>|</strong>&#9668;</button>\r\n                <button class="tc-button" ng-click="tcGrid.prev()" ng-disabled="tcGrid.options.paging.currentPage === 1">&#9668;</button>\r\n                <button class="tc-button" ng-click="tcGrid.next()" ng-disabled="tcGrid.options.paging.currentPage === tcGrid.pageCount">&#9658;</button>\r\n                <button class="tc-button" ng-click="tcGrid.last()" ng-disabled="tcGrid.options.paging.currentPage === tcGrid.pageCount">&#9658;<strong>|</strong></button>\r\n            </div>\r\n            <div class="clearfix"></div>\r\n        </div>\r\n    </div>\r\n</div>\r\n\r\n\r\n')}]);
\ No newline at end of file