From 67aeaf4e5fedcaca23c45f1cf0869380941588a3 Mon Sep 17 00:00:00 2001
From: Tarpit Grover <tarpitgrover@e9ine.com>
Date: Mon, 23 Feb 2015 17:48:19 +0000
Subject: [PATCH] commit

---
 common_components/directives/BindHtmlCompile.directive.js            |  21 ---------------------
 common_components/directives/Card.directive.js                       |  48 ------------------------------------------------
 common_components/directives/FieldFor.directive.js                   | 218 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 common_components/directives/Score.directive.js                      |  53 -----------------------------------------------------
 common_components/directives/TableFor.directive.js                   | 592 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 common_components/filters/utility.filter.js                          | 110 --------------------------------------------------------------------------------------------------------------
 common_components/layouts/breadcrumb/breadcrumb.controller.js        |  48 ------------------------------------------------
 common_components/layouts/breadcrumb/breadcrumb.partial.html         |   8 --------
 common_components/layouts/documentsview/documents-view.controller.js |  12 ------------
 common_components/layouts/documentsview/documents-view.partial.html  |  36 ------------------------------------
 common_components/layouts/module/module-base.layout.html             |  11 -----------
 common_components/layouts/module/module-cards.controller.js          |  37 -------------------------------------
 common_components/layouts/module/module-cards.partial.html           |  26 --------------------------
 common_components/layouts/module/module-item.controller.js           |  14 --------------
 common_components/layouts/module/module-item.layout.html             |  21 ---------------------
 common_components/layouts/module/module-table.controller.js          |  22 ----------------------
 common_components/layouts/module/module-table.partial.html           |  17 -----------------
 common_components/layouts/structure/page.controller.js               |  12 ------------
 common_components/layouts/structure/page.layout.html                 |  16 ----------------
 common_components/layouts/table-page/table-page.layout.html          |  12 ------------
 common_components/services/ConsoleLoggingProvider.service.js         |  67 -------------------------------------------------------------------
 common_components/services/Logger.service.js                         | 139 -------------------------------------------------------------------------------------------------------------------------------------------
 common_components/services/Menu.service.js                           |  45 ---------------------------------------------
 common_components/services/Model.service.js                          | 300 ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 common_components/services/Storage.service.js                        |  73 -------------------------------------------------------------------------
 common_components/tables/Table.controller.js                         | 157 -------------------------------------------------------------------------------------------------------------------------------------------------------------
 common_components/tables/basic-table.layout.html                     |  18 ------------------
 common_components/tables/sortable-table.layout.html                  |  20 --------------------
 directives/BindHtmlCompile.directive.js                              |  21 +++++++++++++++++++++
 directives/Card.directive.js                                         |  48 ++++++++++++++++++++++++++++++++++++++++++++++++
 directives/FieldFor.directive.js                                     | 218 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 directives/Score.directive.js                                        |  53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 directives/TableFor.directive.js                                     | 592 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 filters/utility.filter.js                                            | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 layouts/breadcrumb/breadcrumb.controller.js                          |  48 ++++++++++++++++++++++++++++++++++++++++++++++++
 layouts/breadcrumb/breadcrumb.partial.html                           |   8 ++++++++
 layouts/documentsview/documents-view.controller.js                   |  12 ++++++++++++
 layouts/documentsview/documents-view.partial.html                    |  36 ++++++++++++++++++++++++++++++++++++
 layouts/module/module-base.layout.html                               |  11 +++++++++++
 layouts/module/module-cards.controller.js                            |  37 +++++++++++++++++++++++++++++++++++++
 layouts/module/module-cards.partial.html                             |  26 ++++++++++++++++++++++++++
 layouts/module/module-item.controller.js                             |  14 ++++++++++++++
 layouts/module/module-item.layout.html                               |  21 +++++++++++++++++++++
 layouts/module/module-table.controller.js                            |  22 ++++++++++++++++++++++
 layouts/module/module-table.partial.html                             |  17 +++++++++++++++++
 layouts/structure/page.controller.js                                 |  12 ++++++++++++
 layouts/structure/page.layout.html                                   |  16 ++++++++++++++++
 layouts/table-page/table-page.layout.html                            |  12 ++++++++++++
 services/ConsoleLoggingProvider.service.js                           |  67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 services/Logger.service.js                                           | 139 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 services/Menu.service.js                                             |  45 +++++++++++++++++++++++++++++++++++++++++++++
 services/Model.service.js                                            | 300 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 services/Storage.service.js                                          |  73 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tables/Table.controller.js                                           | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 tables/basic-table.layout.html                                       |  18 ++++++++++++++++++
 tables/sortable-table.layout.html                                    |  20 ++++++++++++++++++++
 56 files changed, 2153 insertions(+), 2153 deletions(-)
 delete mode 100644 common_components/directives/BindHtmlCompile.directive.js
 delete mode 100644 common_components/directives/Card.directive.js
 delete mode 100644 common_components/directives/FieldFor.directive.js
 delete mode 100644 common_components/directives/Score.directive.js
 delete mode 100644 common_components/directives/TableFor.directive.js
 delete mode 100644 common_components/filters/utility.filter.js
 delete mode 100644 common_components/layouts/breadcrumb/breadcrumb.controller.js
 delete mode 100644 common_components/layouts/breadcrumb/breadcrumb.partial.html
 delete mode 100644 common_components/layouts/documentsview/documents-view.controller.js
 delete mode 100644 common_components/layouts/documentsview/documents-view.partial.html
 delete mode 100644 common_components/layouts/module/module-base.layout.html
 delete mode 100644 common_components/layouts/module/module-cards.controller.js
 delete mode 100644 common_components/layouts/module/module-cards.partial.html
 delete mode 100644 common_components/layouts/module/module-item.controller.js
 delete mode 100644 common_components/layouts/module/module-item.layout.html
 delete mode 100644 common_components/layouts/module/module-table.controller.js
 delete mode 100644 common_components/layouts/module/module-table.partial.html
 delete mode 100644 common_components/layouts/structure/page.controller.js
 delete mode 100644 common_components/layouts/structure/page.layout.html
 delete mode 100644 common_components/layouts/table-page/table-page.layout.html
 delete mode 100644 common_components/services/ConsoleLoggingProvider.service.js
 delete mode 100644 common_components/services/Logger.service.js
 delete mode 100644 common_components/services/Menu.service.js
 delete mode 100644 common_components/services/Model.service.js
 delete mode 100644 common_components/services/Storage.service.js
 delete mode 100644 common_components/tables/Table.controller.js
 delete mode 100644 common_components/tables/basic-table.layout.html
 delete mode 100644 common_components/tables/sortable-table.layout.html
 create mode 100644 directives/BindHtmlCompile.directive.js
 create mode 100644 directives/Card.directive.js
 create mode 100644 directives/FieldFor.directive.js
 create mode 100644 directives/Score.directive.js
 create mode 100644 directives/TableFor.directive.js
 create mode 100644 filters/utility.filter.js
 create mode 100644 layouts/breadcrumb/breadcrumb.controller.js
 create mode 100644 layouts/breadcrumb/breadcrumb.partial.html
 create mode 100644 layouts/documentsview/documents-view.controller.js
 create mode 100644 layouts/documentsview/documents-view.partial.html
 create mode 100644 layouts/module/module-base.layout.html
 create mode 100644 layouts/module/module-cards.controller.js
 create mode 100644 layouts/module/module-cards.partial.html
 create mode 100644 layouts/module/module-item.controller.js
 create mode 100644 layouts/module/module-item.layout.html
 create mode 100644 layouts/module/module-table.controller.js
 create mode 100644 layouts/module/module-table.partial.html
 create mode 100644 layouts/structure/page.controller.js
 create mode 100644 layouts/structure/page.layout.html
 create mode 100644 layouts/table-page/table-page.layout.html
 create mode 100644 services/ConsoleLoggingProvider.service.js
 create mode 100644 services/Logger.service.js
 create mode 100644 services/Menu.service.js
 create mode 100644 services/Model.service.js
 create mode 100644 services/Storage.service.js
 create mode 100644 tables/Table.controller.js
 create mode 100644 tables/basic-table.layout.html
 create mode 100644 tables/sortable-table.layout.html

diff --git a/common_components/directives/BindHtmlCompile.directive.js b/common_components/directives/BindHtmlCompile.directive.js
deleted file mode 100644
index 195de96..0000000
--- a/common_components/directives/BindHtmlCompile.directive.js
+++ /dev/null
@@ -1,21 +0,0 @@
-(function (angular) {
-    'use strict';
-
-    var module = angular.module('framework.directives.utils', []);
-
-    module.directive('bindHtmlCompile', ['$compile', bindHtmlCompile]);
-
-    function bindHtmlCompile($compile) {
-        return {
-            restrict: 'A',
-            link: function (scope, element, attrs) {
-                scope.$watch(function () {
-                    return scope.$eval(attrs.bindHtmlCompile);
-                }, function (value) {
-                    element.html(value);
-                    $compile(element.contents())(scope);
-                });
-            }
-        };
-    }
-}(angular));
\ No newline at end of file
diff --git a/common_components/directives/Card.directive.js b/common_components/directives/Card.directive.js
deleted file mode 100644
index 6cd9578..0000000
--- a/common_components/directives/Card.directive.js
+++ /dev/null
@@ -1,48 +0,0 @@
-(function(angular){
-	var module = angular.module('framework.directives.UI',[]);
-
-	module.directive('card', cardDirective);
-	cardDirective.$inject=['$state', '$interval', '$parse'];
-	function cardDirective($state, $interval, $parse) {
-		return {
-			restrict: 'E',
-			transclude: true,
-			replace: true,
-			scope: true,
-			template: function(element, attrs) {
-				var template='';
-				template += '<div class="card"><div class="card-container"';
-				if(attrs.allowClick!="false") {
-					template += ' ng-click="viewItem(item)"'
-				}
-				template += '><svg class="logo" style="background-image:url(\'{{::accessors.LogoUrl(item)}}\')" viewBox="0 0 100 100"><circle cx="50" cy="50" r="50" fill="transparent" stroke-width="10" stroke-linecap="round" ng-show="showScore==true" stroke-location="outside"></circle></svg>';
-				if(attrs.showTitle!="false") {
-					template += '<strong>{{ ::accessors.Title(item) }}</strong>';
-				}
-				if(attrs.showSubtitle!="false") {
-					template += '<small>{{ ::accessors.SubTitle(item) }}</small>';
-				}
-				template += '</div></div>';
-				return template;
-			},
-			link: function(scope, elem, attrs, ctrls, transcludeFn) {
-				if(attrs.item) {
-					var getter = $parse(attrs.item);
-					scope.item = getter(scope);
-				}
-				scope.viewItem = viewItem;
-				if(scope.accessors.Score) {
-					var percentScore = (2 * Math.PI*50)/100*scope.accessors.Score(scope.item);
-					var percentColor = (percentScore < 90)? 'red': (percentScore >= 90 && percentScore <180)? 'orange' :(percentScore >= 180 && percentScore <270)? 'rgb(25, 195, 45)' : 'rgb(25, 195, 45);';
-					elem.find("circle")
-						.attr("stroke", percentColor)
-						.attr("stroke-dasharray",percentScore+",10000");
-				}
-
-				function viewItem(item) {
-         		   $state.go(scope.rNavTo, { Id: item.Id });
-        		}
-			}
-		}
-	}
-})(angular);
\ No newline at end of file
diff --git a/common_components/directives/FieldFor.directive.js b/common_components/directives/FieldFor.directive.js
deleted file mode 100644
index a352549..0000000
--- a/common_components/directives/FieldFor.directive.js
+++ /dev/null
@@ -1,218 +0,0 @@
-(function (angular) {
-    var module = angular.module('framework.directives.UI');
-
-    module.directive('fieldFor', fieldForDirective);
-    module.directive('formFor', formForDirective);
-    module.filter('propSearch', propertySearchFilter);
-
-    formForDirective.$inject = ['Model'];
-    function formForDirective(Model) {
-        return {
-            restrict: 'A',
-            scope: true,
-            transclude: true,
-            template: function (element, attrs) {
-                return '<form name="formFor.form" class="transclude-target" autocomplete="off" novalidate></form>';
-            },
-            link: function (scope, element, attrs, ctrls, transcludeFn) {
-                scope.formFor = (scope.formFor || {});
-                scope.formFor.target = scope.$eval(attrs.formFor);
-                scope.formFor.schema = (attrs.schema) ? Model[attrs.schema].$schema : scope.target.$$schema;
-                scope.formFor.mode = 'EDIT';
-
-                scope.$watch(function () {
-                    return scope.target;
-                }, function (newvalue) {
-
-                });
-
-                if (attrs.mode) {
-                    scope.formFor.mode = attrs.mode;
-                    attrs.$observe('mode', function (newvalue) {
-                        scope.formFor.mode = newvalue;
-                    });
-                }
-
-                transcludeFn(scope, function (clone, scope) {
-                    element.children('.transclude-target').append(clone);
-                });
-            }
-        }
-    };
-
-    fieldForDirective.$inject = ['Model'];
-    function fieldForDirective(Model) {
-        var defaults = {
-            inputType: 'text',
-            required: false,
-            selectTheme: 'selectize',
-            selectSelectedTemplate: '{{$select.selected.Name}}',
-            selectOptionTemplate: '<div ng-bind-html="option.Name | highlight: $select.search"></div><small class="text-muted">{{option.Description}}</small>'
-        };
-        return {
-            restrict: 'A',
-            scope: true,
-            template: function (element, attrs) {
-                var formParent = element.closest('[form-for]'),
-                    subformParent = element.closest('[sub-form-for]'),
-                    schemaName = ((subformParent.length) ? subformParent : formParent).attr('schema'),
-                    ctor = Model[schemaName],
-                    schema = ctor && ctor.$schema,
-                    fieldDef = schema && schema[attrs.fieldFor],
-                    subForm = subformParent.attr('sub-form-for') || '';
-
-                if (!fieldDef) {
-                    return;
-                }
-
-                var inputConfig = angular.extend({ display: attrs.fieldFor, inputType: 'text' }, defaults, fieldDef, fieldDef.input, attrs);
-
-                //need to fetch these.
-                var labelText = attrs.display || attrs.fieldFor,
-                    fieldName = attrs.fieldFor,
-                    selectFrom = attrs.selectFrom;
-
-                var template = '' +
-                        '<div class="form-group">' +
-                        '<label class="control-label" for="' + subForm + fieldName + 'Input">' + inputConfig.display + '</label>' +
-                        '<div ng-if="formFor.mode === \'VIEW\'">' +
-                        '<p class="form-control-static" ng-bind="::formFor.target.' + ((subForm) ? (subForm + '.') : '') + (inputConfig.displayField ? inputConfig.displayField : fieldName) + (inputConfig.displayFilters ? inputConfig.displayFilters : '') + '"></p>' +
-                        '</div>' +
-                        '<div ng-if="formFor.mode === \'EDIT\'">';
-
-                if (selectFrom) {
-                    template += '' +
-                        '<ui-select ng-model="formFor.target.' + ((subForm) ? (subForm + '.') : '') + fieldName + '" name="' + subForm + fieldName + 'Input" theme="' + inputConfig.selectTheme + '" ng-disabled="' + (angular.isDefined(inputConfig.editable) && !inputConfig.editable) + '" ng-required="' + inputConfig.required + '">' +
-                            '<ui-select-match allow-clear="true" placeholder="' + (inputConfig.placeholder || 'Select..') + '">' + inputConfig.selectSelectedTemplate + '</ui-select-match>' +
-                            '<ui-select-choices repeat="option.Id as option in ' + selectFrom + ' | propSearch: { Name: $select.search }">' +
-                                inputConfig.selectOptionTemplate +
-                            '</ui-select-choices>'+
-                        '</ui-select>';
-                } else if (inputConfig.type === moment) {
-                    template += '' +
-                        '<div class="input-group">' +
-                            buildElement('input', {
-                                class: 'form-control',
-                                type: 'text',
-                                name: subForm + fieldName + 'Input',
-                                ngModel: 'formFor.target.' + ((subForm) ? (subForm + '.') : '') + fieldName,
-                                ngRequired: inputConfig.required,
-                                datepickerPopup: 'dd/MM/yyyy',
-                                isOpen: 'opened',
-                                placeholder: 'DD/MM/YYYY',
-                                ngDisabled: angular.isDefined(inputConfig.editable) && !inputConfig.editable
-                            }) +
-                            '<span class="input-group-btn">' +
-                                '<button type="button" class="btn btn-default" ng-click="openCalendar($event)"><i class="glyphicon glyphicon-calendar"></i></button>' +
-                            '</span>' +
-                        '</div>';
-                } else {
-                    if (inputConfig.append || inputConfig.prepend) {
-                        template += '<div class="input-group">';
-                    }
-                    if (inputConfig.prepend) {
-                        template += '<span class="input-group-btn">' +
-                                '<button type="button" class="btn btn-default" ng-click="' + inputConfig.prepend.click + '"><i class="' + inputConfig.prepend.icon + '"></i>' + inputConfig.prepend.text + '</button>' +
-                        '</span>'
-                    }
-                    template += buildElement('input', {
-                        class: 'form-control',
-                        type: inputConfig.inputType,
-                        name: subForm + fieldName + 'Input',
-                        ngModel: 'formFor.target.' + ((subForm) ? (subForm + '.') : '') + fieldName,
-                        ngRequired: inputConfig.required,
-                        placeholder: inputConfig.placeholder
-                    });
-                    if (inputConfig.append) {
-                        template += '<span class="input-group-btn">' +
-                                '<button type="button" class="btn btn-default" ng-click="' + inputConfig.append.click + '"><i class="' + inputConfig.append.icon + '"></i>' + inputConfig.append.text + '</button>' +
-                        '</span>'
-                    }
-                    if (inputConfig.append || inputConfig.prepend) {
-                        template += '</div>';
-                    }
-                }
-
-                template += '' +
-                    '<div ng-messages="formFor.form.' + subForm + fieldName + 'Input.$error" class="help-block">' +
-                        '<div ng-message="required">' + inputConfig.display + ' is required.</div>' +
-                        '<div ng-message="parse">' + inputConfig.display + ' is incorrectly formatted.</div>' +
-                        '<div ng-message="email">' + inputConfig.display + ' is not a valid e-mail.</div>' +
-                        '</div>' +
-                    '</div>';
-                template += '</div>';
-                return template;
-            },
-            link: function (scope, element, attrs) {
-                scope.opened = false;
-
-                scope.openCalendar = function (event) {
-                    event.preventDefault();
-                    event.stopPropagation();
-                    scope.opened = true;
-                }
-            }
-        };
-    };
-
-    function propertySearchFilter() {
-        return function (items, props) {
-            var out = [];
-
-            if (angular.isArray(items)) {
-                items.forEach(function (item) {
-                    var itemMatches = false;
-
-                    var keys = Object.keys(props);
-                    for (var i = 0; i < keys.length; i++) {
-                        var prop = keys[i];
-                        var text = props[prop].toLowerCase();
-                        if (item[prop].toString().toLowerCase().indexOf(text) !== -1) {
-                            itemMatches = true;
-                            break;
-                        }
-                    }
-
-                    if (itemMatches) {
-                        out.push(item);
-                    }
-                });
-            } else {
-                // Let the output be the input untouched
-                out = items;
-            }
-
-            return out;
-        };
-    };
-
-    function buildElement(elementType, attrs) {
-        var result = '<' + elementType + ' ';
-
-        angular.forEach(attrs, function (value, key) {
-            if (angular.isDefined(value) && value !== null)
-                result += normalise(key) + '="' + value + '"';
-        });
-
-        if (elementType === 'input') {
-            result += ' />';
-        } else {
-            result += ' ></' + elementType + '>';
-        }
-        return result;
-    }
-
-    function normalise(input) {
-        var result = '';
-        for (var i = 0; i < input.length; i++) {
-            var char = input[i];
-            if (char == char.toUpperCase()) {
-                result += '-' + char.toLowerCase();
-            } else {
-                result += char;
-            }
-        }
-        return result;
-    }
-
-}(angular));
\ No newline at end of file
diff --git a/common_components/directives/Score.directive.js b/common_components/directives/Score.directive.js
deleted file mode 100644
index 25e2bf6..0000000
--- a/common_components/directives/Score.directive.js
+++ /dev/null
@@ -1,53 +0,0 @@
-(function(angular){
-	var module = angular.module('framework.directives.UI');
-
-	module.directive('score', scoreDirective);
-
-	scoreDirective.$inject=['$state', '$interval', '$parse'];
-	
-	function scoreDirective($state, $interval, $parse) {
-		return {
-			restrict: 'E',
-			transclude: true,
-			replace: true,
-			scope: true,
-			template: function(element, attrs) {
-				var template='';
-				template += '<div class="score"';
-				if(attrs.size) {
-					var scoreSize = parseInt(attrs.size);
-					template += ' style="position:relative;width:'+ (scoreSize) +'px; height: ' + (scoreSize) + 'px; border-radius:'+ (scoreSize/2) + 'px;padding:5px;">';
-				}
-				else {
-					template += ' style="width:100px;height:100px;border-radius:50px;">';
-				}
-				if(attrs.showScore) {
-					template += '<div class="score-value" style="line-height:' + scoreSize + 'px">'+attrs.showScore+'</div>';
-				}
-				template += '<svg class="dial" viewBox="0 0 100 100">' +
-								'<circle class="score-back-circle" cx="50" cy="50" r="45" fill="transparent" stroke-linecap="round"></circle>' +
-								'<circle class="score-front-circle" cx="50" cy="50" r="45" fill="transparent" stroke-linecap="round"></circle>' +
-							'</svg>';
-				template += '</div>';
-				return template;
-			},
-			link: function(scope, elem, attrs, ctrls, transcludeFn) {
-				if(!attrs.value)
-					return;
-				
-				var strokeWidth = (attrs.strokeWidth)? attrs.strokeWidth : 5;
-				var percentScore = (2 * Math.PI*50)/100 * attrs.value;
-				var percentColor = (percentScore < 90)? 'red': (percentScore >= 90 && percentScore <180)? 'orange' :(percentScore >= 180 && percentScore <270)? 'rgb(25, 195, 45)' : 'rgb(25, 195, 45)';
-
-				elem.find("circle.score-back-circle")
-					.attr("stroke", "#eee")
-					.attr("stroke-width", strokeWidth);
-
-				elem.find("circle.score-front-circle")
-					.attr("stroke", percentColor)
-					.attr("stroke-width", strokeWidth)
-					.attr("stroke-dasharray", percentScore+",10000");
-			}
-		}
-	}
-})(angular);
\ No newline at end of file
diff --git a/common_components/directives/TableFor.directive.js b/common_components/directives/TableFor.directive.js
deleted file mode 100644
index ca224e8..0000000
--- a/common_components/directives/TableFor.directive.js
+++ /dev/null
@@ -1,592 +0,0 @@
-(function (angular) {
-	var module = angular.module('framework.directives.UI');
-
-	module.directive('tableFor', tableForDirective);
-	module.directive('tableTitlebar', tableTitlebarDirective);
-	module.directive('tableHeading', tableHeadingDirective);
-	module.directive('tableDataRows', tableDataRowsDirective);
-	module.directive('tableFooter', tableFooterDirective);
-	module.filter('publish', publishFilter);
-	module.filter('softFilter', softFilter);
-	module.filter('pageGroup', pageGroupFilter);
-
-
-
-	tableForDirective.$inject = ['$parse', 'Model', '$modal', '$q', '$filter', '$timeout'];
-	function tableForDirective($parse, Model, $modal, $q, $filter, $timeout) {
-		var defaults = {
-			wrapperClass: 'table-responsive',
-			tableClass: 'table table-bordered',
-			minWidth: '600px'
-		}
-
-		function linkFn(scope, element, attrs, ctrls, transcludeFn) {
-			var externalSearch = $parse(attrs.filtering)(scope);
-			var externalSorting = $parse(attrs.sorting)(scope);
-			var externalGrouping = $parse(attrs.grouping)(scope);
-			var externalPaging = $parse(attrs.paging)(scope);
-
-			scope.$schema = Model[attrs.schema].$schema;
-			scope.$table = {
-				actionColumn: false,
-				selectionColumn: false,
-				cardTemplate: '{{$row | json}}',
-				toggleSelectAll: toggleSelectAll,
-				toggleRowSelection: toggleRowSelection,
-				toggleGroupSelection: toggleGroupSelection,
-				allSelected: false,
-				reset: reset,
-				configureColumns: configureColumns,
-				sort: sort,
-				getSortingClass: getSortingClass
-			};
-			scope.$columns = generateColumns(scope.$schema);
-			scope.$filtering = externalSearch || {
-				$: ''
-			}
-			scope.$sorting = externalSorting || [];
-			scope.$grouping = externalGrouping || {
-				value: undefined
-			};
-			scope.$paging = externalPaging || {
-				currentPage: 1, 
-				totalItems: 0,
-				maxPerPage: 10
-			};
-			scope.$data = {}; //object as it's grouped
-			scope.$datasource = function () {
-				return arguments[4]; //returns existing data by default;
-			};
-
-			var datasource = $parse(attrs.datasource)(scope);
-			if (angular.isArray(datasource)) {
-				scope.$datasource = generateLocalDatasource(datasource);
-			} else if (angular.isFunction(datasource)) {
-				scope.$datasource = datasource;
-			} else {
-				scope.$datasource = generateModelDatasource(scope.$schema.query);
-			}
-
-			scope.$watchCollection(function () { return scope.$filtering; }, debouncedUpdateData);
-			scope.$watchCollection(function () { return scope.$sorting; }, debouncedUpdateData);
-			scope.$watchCollection(function () { return scope.$grouping; }, debouncedUpdateData);
-			scope.$watch(function () { return scope.$paging.currentPage; }, debouncedUpdateData);
-			scope.$watch(function () { return scope.$paging.maxPerPage; }, debouncedUpdateData);
-
-			var updateDebounce = null;
-
-			function debouncedUpdateData() {
-				if (updateDebounce) {
-					$timeout.cancel(updateDebounce);
-					updateDebounce = null;
-				}
-				updateDebounce = $timeout(updateData, 500);
-			}
-
-			function updateData() {
-				for (var key in scope.$data) {
-					delete scope.$data[key];
-				}
-				scope.$data.$loading = true;
-				scope.$data.$error = null;
-				scope.$datasource(scope.$filtering, scope.$sorting, scope.$grouping, scope.$paging, scope.$data).then(dataReceived, dataError, dataNotified);
-			}
-
-			function dataReceived(data) {
-				for (var key in scope.$data) {
-					delete scope.$data[key];
-				}
-				scope.$data.$loading = false;
-				angular.extend(scope.$data, data);
-			}
-
-			function dataError(error) {
-				for (var key in scope.$data) {
-					delete scope.$data[key];
-				}
-				scope.$data.$loading = false;
-				scope.$data.$error = error;
-			}
-
-			function dataNotified(dataLength) {
-				scope.$paging.totalItems = dataLength;
-			}
-
-			transcludeFn(scope, function (clone, scope) {
-				element.find('table').append(clone);
-			});
-
-			function generateLocalDatasource(initialData) {
-				var data = initialData;
-				return function (filtering, sorting, grouping, paging, existing) {
-					var deferred = $q.defer();
-
-					setTimeout(function () {
-						var filter = $filter('filter');
-						var orderBy = $filter('orderBy');
-						var groupBy = $filter('groupBy');
-						var pageGroup = $filter('pageGroup');
-
-						deferred.notify(filter(data, filtering).length);
-
-						var amendedSorting = [grouping.value];
-						[].push.apply(amendedSorting, sorting);
-
-						var result = pageGroup(groupBy(orderBy(filter(data, filtering), amendedSorting), grouping.value), paging);
-
-						deferred.resolve(result);
-					}, 0);
-
-					return deferred.promise;
-				}
-			}
-
-			function generateModelDatasource(modelQuery) {
-				var queryBase = modelQuery;
-				return function (filtering, sorting, grouping, paging, existing) {
-					var deferred = $q.defer();
-
-					query = queryBase();
-					if (grouping.value) {
-						query.orderBy(grouping.value);
-					}
-
-					angular.forEach(ordering, function (o) { query.orderBy(o); });
-
-
-					setTimeout(function () {
-						var filter = $filter('filter');
-						var groupBy = $filter('groupBy');
-						var pageGroup = $filter('pageGroup');
-
-						deferred.notify(filter(data, filtering).length);
-
-						var amendedSorting = [grouping.value];
-						[].push.apply(amendedSorting, sorting);
-
-						var result = pageGroup(groupBy(orderBy(filter(data, filtering), amendedSorting), grouping.value), paging);
-
-						deferred.resolve(result);
-					}, 0);
-
-					return deferred.promise;
-				}
-			}
-
-			function generateColumns(modelSchema) {
-				var columns = [];
-				angular.forEach(modelSchema, function (value, key) {
-					var config = angular.extend({}, value, value.table || {});
-					if (config.hidden) {
-						return;
-					}
-					if (!angular.isDefined(config.visible)) {
-						config.visible = true;
-					}
-					if (!angular.isDefined(config.binding) && config.type === moment) {
-						config.binding = key + ".toDate() | date:'dd/MM/yyyy'";
-					}
-					columns.push({ key: key, title: config.display || key, accessor: angular.isFunction(config.binding) ? config.binding : buildAccessor(config.binding || key), binding: config.binding || key, visible: config.visible, filters: config.filters });
-				});
-				return columns;
-			}
-
-			function toggleSelectAll() {
-				scope.$table.allSelected = !scope.$table.allSelected;
-				angular.forEach(scope.$data, function (group) {
-					toggleGroupSelection(group, scope.$table.allSelected);
-				});
-			}
-
-			function toggleRowSelection(group, row, force) {
-				row.$selected = angular.isDefined(force) ? force : !row.$selected;
-				var selected = group.filter(function (d) { return d.$selected; });
-				group.$selected = selected.length === group.length;
-				
-				var groups = 0;
-				var selectedGroups = 0;
-				angular.forEach(scope.$data, function (group, title) {
-					if (title[0] == '$') {
-						return;
-					}
-					groups++;
-					if (group.$selected) selectedGroups++;
-				});
-				scope.$table.allSelected = groups === selectedGroups;
-			}
-
-			function toggleGroupSelection(group, force) {
-				if (angular.isDefined(force)) {
-					group.$selected = force;
-				} else {
-					group.$selected = !group.$selected;
-				}
-				angular.forEach(group, function (row) {
-					row.$selected = group.$selected;
-				});
-
-				if (!angular.isDefined(force)) {
-					var groups = 0;
-					var selectedGroups = 0;
-					angular.forEach(scope.$data, function (group, title) {
-						if (title[0] == '$') {
-							return;
-						}
-						groups++;
-						if (group.$selected) selectedGroups++;
-					});
-					debugger;
-					scope.$table.allSelected = groups === selectedGroups;
-				}
-			}
-
-			function setAreAllSelected() {
-				scope.$table.allSelected = false;
-			}
-
-			function sort(col) {
-				//multisort
-				var currentSort = scope.$sorting[0];
-				if (col == currentSort) {
-					scope.$sorting[0] = '-' + col;
-				} else if ('-' + col == currentSort) {
-					scope.$sorting[0] = col;
-				} else {
-					scope.$sorting.length = 0;
-					scope.$sorting.push(col);
-				}
-			}
-
-			function getSortingClass(col) {
-				if (col == scope.$sorting[0]) {
-					return 'icon-Arrow-Down2 brand-primary';
-				}
-				else if ('-' + col == scope.$sorting[0]) {
-					return 'icon-Arrow-Up2 brand-primary';
-				} else {
-					return 'icon-Arrow-Down';
-				}
-			}
-
-			function reset() {
-				scope.$filtering = externalSearch || {
-					$: ''
-				}
-				scope.$sorting = [];
-
-				//TODO: Deselect ALL
-
-				scope.$columns.length = 0;
-				[].push.apply(scope.$columns, generateColumns(scope.$schema));
-			}
-
-			function buildAccessor(fieldName) {
-				console.log('return row.' + fieldName + ';');
-				window.count = window.count || 0;
-				return new Function('row', 'return row.' + fieldName + ';');
-			}
-
-			function configureColumns() {
-				$modal.open({
-					template: '' +
-							'<div class="modal-header">' +
-								'<button class="close" type="button" ng-click="$close()"><i class="icon-Close"></i></button>' +
-								'<h3 class="modal-title">Customize Columns</h3>' +
-							'</div>' +
-							'<div class="modal-body">' +
-								'<div ng-repeat="column in columns">' +
-									'<a ng-click="moveUp(column)" ng-hide="$first"><i class="icon-Arrow-UpinCircle brand-primary"></i></a>' +
-									' &nbsp; {{column.title}}' +
-									' &nbsp; <a ng-click="moveDown(column)" ng-hide="$last"><i class="icon-Arrow-DowninCircle brand-primary"></i></a>' +
-									'<div class="checkbox pull-right m0">' +
-										'<input type="checkbox" id="columncustomise{{::$index}}" ng-model="column.visible" ng-checked="column.visible" />' +
-										'<label for="columncustomise{{::$index}}"></label>' +
-									'</div><br class="clearfix">' +
-								'</div>' +
-							'</div>',
-					controller: function ($scope, columns) {
-						$scope.columns = columns;
-						$scope.moveUp = function (column) {
-							var index = $scope.columns.indexOf(column);
-							move(index, index - 1);
-						}
-						$scope.moveDown = function (column) {
-							var index = $scope.columns.indexOf(column);
-							move(index, index + 1);
-						}
-
-						function move(old_index, new_index) {
-							$scope.columns.splice(new_index, 0, $scope.columns.splice(old_index, 1)[0]);
-						}
-					},
-					size: 'sm',
-					resolve: {
-						columns: function () {
-							return scope.$columns
-						}
-					}
-				});
-			}
-		}
-
-		function compileFn(element, attrs) {
-			return linkFn;
-		}
-
-		return {
-			scope: true,
-			transclude: true,
-			template: function (element, attrs) {
-				return '<div class="' + (attrs.wrapperClass || defaults.wrapperClass) + '"><table class="' + (attrs.tableClass || defaults.tableClass) + ' module-table" style="min-width:' + (attrs.minWidth || defaults.minWidth) + '"></table></div>'
-			},
-			compile: function (element, attrs) {
-				return linkFn;
-			}
-		};
-	}
-
-	function tableTitlebarDirective() {
-		return {
-			restrict: 'E',
-			scope: true,
-			replace: true,
-			template: function (element, attrs) {
-				var template = '' +
-                '<thead><tr><th colspan="100" class="table-arrange">';
-				if (attrs.title) {
-					template += '<h3 class="table-title">' + attrs.title + '</h3>';
-				}
-				if (attrs.showCount) {
-					template += '<h3 class="table-title brand-primary">({{$visible.length}} / {{ $data.length }})</h3>';
-				}
-				if (attrs.columnsOptions) {
-					template += '<div class="columns-options">' +
-                                    '<a href="" ng-click="$table.reset()"><i class="icon-Reset"></i>Reset</a>' +
-                                    '<a href="" ng-click="$table.configureColumns()"><i class="icon-Receipt-2"></i>Arrange</a>' +
-                                '</div>';
-				}
-				template += '<div class="pull-right">' +
-                                    '<pagination class="pagination-sm"  style="margin: 0;" total-items="$paging.totalItems" ng-model="$paging.currentPage" items-per-page="$paging.maxPerPage" boundary-links="true" max-size="5"></pagination>' +
-                                '</div>';
-				if (attrs.search) {
-					template += '<input type="text" class="form-control pull-right" style="width:300px" placeholder="Search.." ng-model="$filtering.$" />';
-				}
-				template += '</th></tr></thead>'
-				return template;
-			}
-		}
-	}
-
-	function tableHeadingDirective() {
-		var defaults = {
-		}
-		return {
-			restrict: 'E',
-			scope: true,
-			replace: true,
-			template: function (element, attrs) {
-				var tmpl = '' +
-                    '<thead><tr>' +
-                        '<th ng-if="::$table.selectionColumn" style="width:40px;text-align:center;">' +
-                            '<div class="checkbox"><input type="checkbox" id="table-group-check" ng-click="$table.toggleSelectAll()" ng-checked="$table.allSelected"/><label for="table-group-check"></label></div>' +
-
-                        '</th>' +
-                        '<th ng-repeat="$column in $columns | filter: { visible: true }" class="module-table-head">' +
-                            '<div><i ng-class="$column.icon"></i> {{ ::$column.title }}' +
-                            '<span class="table-sort"><a href="" ng-click="$table.sort($column.key)"><i ng-class="$table.getSortingClass($column.key)"></i></a></span>' +
-                            '</div>' + //add filter and search menu
-                        '</th>' +
-                        '<th ng-if="::$table.actionColumn" style="text-align:center;">' +
-                            'Actions' +
-                        '</th>' +
-                    '</tr>';
-				tmpl += '</thead>';
-				return tmpl;
-			}
-		};
-	}
-
-	tableDataRowsDirective.$inject = ['$parse', 'Model'];
-	function tableDataRowsDirective($parse, Model) {
-		return {
-			restrict: 'E',
-			scope: true,
-			replace: true,
-			template: function (element, attrs) {
-				var tmp = '' +
-                    '<tbody ng-repeat="(title, group) in $data track by title">' +
-                        '<tr ng-hide="title == \'undefined\'">' +
-							'<td ng-if="::$table.selectionColumn" style="width:40px;text-align:center;">' +
-                                '<div class="checkbox"><input id="group-check-{{::title}}" type="checkbox" ng-click="$table.toggleGroupSelection(group)" ng-checked="group.$selected"/><label for="group-check-{{::title}}"></label></div>' +
-                            '</td>' +
-							'<td colspan="1000"><b><u>{{ title }}</u></b></td>' +
-						'</tr>' +
-                        '<tr ng-repeat="$row in group track by $row.Id">' +
-                            '<td ng-if="::$table.selectionColumn" style="width:40px;text-align:center;">' +
-                                '<div class="checkbox"><input id="table-check-{{::title}}{{::$index}}" type="checkbox" ng-click="$table.toggleRowSelection(group, $row)" ng-checked="$row.$selected"/><label for="table-check-{{::title}}{{::$index}}"></label></div>' +
-                            '</td>' +
-                            '<td ng-repeat="$column in $columns | filter: { visible: true } track by $column.key">' +
-                                '{{$column.accessor($row)}}' +
-                            '</td>' +
-                            '<td ng-if="::$table.actionColumn" style="text-align:center;" bind-html-compile="$table.actionColumn.html">' +
-                            '</td>' +
-                        '</tr>' +
-                    '</tbody>';
-				return tmp;
-			},
-			compile: function (element, attrs) {
-				var selectionElement = _findSelectionColumn(element);
-				var actionsElement = _findActionColumn(element);
-
-				return link;
-
-				function link(scope, element, attrs) {
-					scope.$table.actionColumn = actionsElement;
-					scope.$table.selectionColumn = selectionElement;
-					scope.$table.getCellValue = getCellValue;
-
-					function getCellValue(row, col) {
-						console.log('GetCellValue is depreciated for performance, please use "$column.accessor($row)" instead, functions are now precompilied;');
-						if (typeof col.binding === 'string')
-							return $parse(col.binding)(row);
-						else if (angular.isFunction(col.binding))
-							return col.binding(row, col);
-						else
-							return '';
-					}
-				}
-			}
-		}
-
-		function _findActionColumn(element) {
-			var actionsElement = jQuery(element.context).find('table-actions');
-			if (actionsElement.length) {
-				return {
-					html: actionsElement.html()
-				};
-			}
-			return false;
-		}
-
-		function _findSelectionColumn(element) {
-			var selectionElement = jQuery(element.context).find('table-selection');
-			if (selectionElement.length) {
-				return {
-					html: selectionElement.html()
-				};
-			}
-			return false;
-		}
-	}
-
-	function tableFooterDirective() {
-		return {
-			restrict: 'E',
-			scope: true,
-			replace: true,
-			template: function (element, attrs) {
-				var template = '' +
-                '<tfoot><tr><th colspan="100" class="table-arrange">';
-				if (attrs.title) {
-					template += '<h3 class="table-title">' + attrs.title + '</h3>';
-				}
-				if (attrs.showCount) {
-					template += '<b class="brand-primary">(showing {{$paging.maxPerPage}} from {{ $paging.totalItems }})</b>';
-				}
-				if (attrs.columnsOptions) {
-					template += '<div class="columns-options">' +
-                                    '<a href="" ng-click="$table.reset()"><i class="icon-Reset"></i>Reset</a>' +
-                                    '<a href="" ng-click="$table.configureColumns()"><i class="icon-Receipt-2"></i>Arrange</a>' +
-                                '</div>';
-				}
-				template += '<div class="pull-right">' +
-                                    '<pagination class="pagination-sm"  style="margin: 0;" total-items="$paging.totalItems" ng-model="$paging.currentPage" items-per-page="$paging.maxPerPage" boundary-links="true" max-size="5"></pagination>' +
-                                '</div>';
-				if (attrs.search) {
-					template += '<input type="text" class="form-control pull-right" style="width:300px" placeholder="Search.." ng-model="$filtering.$" />';
-				}
-				template += '</th></tr></tfoot>'
-				return template;
-			}
-		}
-	}
-
-	softFilter.$inject = ['$filter'];
-	function softFilter($filter) {
-		return function (array, filteringConfig) {
-			var filterFn = $filter('filter');
-			var filtered = filterFn(array, filteringConfig);
-			for (var i = 0; i < array.length; i++) {
-				var target = array[i];
-				if (filtered.indexOf(target) > -1) {
-					target.$filtered = true;
-				} else {
-					target.$filtered = false;
-				}
-			}
-			return array;
-		}
-	}
-
-	function pageGroupFilter() {
-		return function (groups, pagingConfig) {
-			var newGroups = {};
-			var skip = (pagingConfig.currentPage - 1) * pagingConfig.maxPerPage;
-			var take = pagingConfig.maxPerPage;
-
-			if (angular.isArray(groups)) {
-				newGroups.undefined = groups.slice(skip, skip + take);
-			} else {
-				var groupNames = [];
-				for (var key in groups) {
-					if (groups.hasOwnProperty(key) && key[0] != '$') {
-						groupNames.push(key);
-					}
-				}
-				groupNames.sort();
-
-				angular.forEach(groupNames, function (title) {
-					var values = groups[title];
-					if (take <= 0) {
-						return;
-					} else if (skip > values.length) {
-						skip -= values.length;
-						return;
-					} else if (skip > 0) {
-						values.splice(0, skip);
-						skip = 0;
-					}
-
-					if (take >= values.length) {
-						newGroups[title] = values;
-						take -= values.length;
-					} else {
-						newGroups[title] = values.slice(0, take);
-						take = 0;
-					}
-				});
-			}
-			return newGroups;
-		};
-	}
-
-	function pagingFilter() {
-		return function (array, pagingConfig) {
-			if (array.length > pagingConfig.minimum) {
-
-			} else {
-				return array;
-			}
-		}
-	}
-
-	function publishFilter() {
-		return function (array, target) {
-			if (angular.isArray(target)) {
-				target.length = 0;
-				[].push.apply(target, array);
-			}
-			return array;
-		}
-	}
-})(angular);
\ No newline at end of file
diff --git a/common_components/filters/utility.filter.js b/common_components/filters/utility.filter.js
deleted file mode 100644
index 649ec75..0000000
--- a/common_components/filters/utility.filter.js
+++ /dev/null
@@ -1,110 +0,0 @@
-(function(angular){
-    var module = angular.module('framework.filters.utility',[]);
-
-    module.filter('RemoveSpaces', removeSpaces);
-    module.filter('Truncate', truncate);
-    module.filter('AbbrValue', abbrValue);
-    module.filter('Countdown', countdown);
-
-
-    function removeSpaces() {
-        return function (text) {
-            return text.replace(/\s/g, '');
-        }
-    }
-
-    function truncate () {
-        return function (text, length, end) {
-            if (isNaN(length))
-                length = 10;
-            if (end === undefined)
-                end = "...";
-            if (text.length <= length || text.length - end.length <= length)
-            { return text; }
-            else
-            { return String(text).substring(0, length - end.length) + end; }
-        }
-    }
-
-    function abbrValue() {
-        return function (val) {
-
-        return Math.abs(Number(val)) >= 1.0e+9
-
-           ? Math.round(Math.abs((Number(val)) / 1.0e+9)*10)/10 + "b"
-           // Six Zeroes for Millions 
-           : Math.abs(Number(val)) >= 1.0e+6
-
-           ? Math.round(Math.abs((Number(val)) / 1.0e+6)*10)/10 + "m"
-           // Three Zeroes for Thousands
-           : Math.abs(Number(val)) >= 1.0e+3
-
-           ? Math.round(Math.abs((Number(val)) / 1.0e+3)*10)/10 + "k"
-
-           : Math.abs(Number(val));
-        }
-    }
-
-    function countdown() {
-        return function (input) {
-            var substitute = function (stringOrFunction, number, strings) {
-                var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, dateDifference) : stringOrFunction;
-                var value = (strings.numbers && strings.numbers[number]) || number;
-                return string.replace(/%d/i, value);
-            },
-                nowTime = (new Date()).getTime(),
-                date = (new Date(input)).getTime(),
-                allowFuture = true,
-                strings = {
-                    prefixAgo: null,
-                    prefixFromNow: null,
-                    suffixAgo: "ago",
-                    suffixFromNow: "",//"from now"
-                    seconds: "less than a minute",
-                    minute: "a minute",
-                    minutes: "%d minutes",
-                    hour: "an hour",
-                    hours: "%d hours",
-                    day: "a day",
-                    days: "%d days",
-                    month: "a month",
-                    months: "%d months",
-                    year: "a year",
-                    years: "%d years"
-                },
-                dateDifference = nowTime - date,
-                words,
-                seconds = Math.abs(dateDifference) / 1000,
-                minutes = seconds / 60,
-                hours = minutes / 60,
-                days = hours / 24,
-                years = days / 365,
-                separator = strings.wordSeparator === undefined ? " " : strings.wordSeparator,
-                prefix = strings.prefixAgo,
-                suffix = strings.suffixAgo;
-
-            if (allowFuture) {
-                if (dateDifference < 0) {
-                    prefix = strings.prefixFromNow;
-                    suffix = strings.suffixFromNow;
-                }
-            }
-
-            words = seconds < 45 && substitute(strings.seconds, Math.round(seconds), strings) ||
-            seconds < 90 && substitute(strings.minute, 1, strings) ||
-            minutes < 45 && substitute(strings.minutes, Math.round(minutes), strings) ||
-            minutes < 90 && substitute(strings.hour, 1, strings) ||
-            hours < 24 && substitute(strings.hours, Math.round(hours), strings) ||
-            hours < 42 && substitute(strings.day, 1, strings) ||
-            days < 30 && substitute(strings.days, Math.round(days), strings) ||
-            days < 45 && substitute(strings.month, 1, strings) ||
-            days < 365 && substitute(strings.months, Math.round(days / 30), strings) ||
-            years < 1.5 && substitute(strings.year, 1, strings) ||
-            substitute(strings.years, Math.round(years), strings);
-
-            return $.trim([prefix, words, suffix].join(separator));
-        }
-    }
-
-
-})(angular);
\ No newline at end of file
diff --git a/common_components/layouts/breadcrumb/breadcrumb.controller.js b/common_components/layouts/breadcrumb/breadcrumb.controller.js
deleted file mode 100644
index 2c57daf..0000000
--- a/common_components/layouts/breadcrumb/breadcrumb.controller.js
+++ /dev/null
@@ -1,48 +0,0 @@
-(function (window, angular) {
-    var app = angular.module("framework.UI.breadcrumb", []);
-
-    app.controller('BarController', barController);
-
-    barController.$inject = ['$scope', '$state', '$modal', '$rootScope'];
-    function barController($scope, $state, $modal, $rootScope) {
-        $scope.breadcrumbs = [];
-        $scope.helpAvailable = null;
-        $scope.showHelp = showHelp;
-
-        function showHelp() {
-            if ($scope.helpAvailable)
-                $modal.open({
-                    templateUrl: $scope.helpAvailable,
-                });
-        }
-
-        $rootScope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) {
-            _parseStateName(toState.name);
-            $scope.helpAvailable = toState.hasHelp;
-        });
-
-        $scope.helpAvailable = $state.current.hasHelp;
-        _parseStateName($state.current.name);
-
-        function _parseStateName(stateName) {
-            var parts = stateName.split('.');
-            var breadcrumbs = [];
-            for (var i = 0; i < parts.length; i++) {
-                var p = parts[i];
-                if (p === "root")
-                    continue;
-                var full = parts.slice(0, i + 1).join('.');
-                breadcrumbs.push({
-                    name: parts[i],
-                    $html: _generateBreadcrumbHtml(p, full)
-                });
-            }
-            $scope.breadcrumbs = breadcrumbs;
-        }
-
-        function _generateBreadcrumbHtml(name, state) {
-            var template = '<a ui-sref="' + state + '" >' + name + '</a>';
-            return template;
-        }
-    };
-})(window, angular);
\ No newline at end of file
diff --git a/common_components/layouts/breadcrumb/breadcrumb.partial.html b/common_components/layouts/breadcrumb/breadcrumb.partial.html
deleted file mode 100644
index 9a60a4d..0000000
--- a/common_components/layouts/breadcrumb/breadcrumb.partial.html
+++ /dev/null
@@ -1,8 +0,0 @@
-<div ng-controller="BarController">
-    <ol class="breadcrumb">
-        <li ng-repeat="item in breadcrumbs" ui-sref-active="active" bind-html-compile="item.$html"></li>
-    </ol>
-    <span class="module-help" ng-if="helpAvailable">
-    	<a href="" ng-click="showHelp()"><i class="icon-Assistant"></i>Help</a>
-    </span>
-</div>
diff --git a/common_components/layouts/documentsview/documents-view.controller.js b/common_components/layouts/documentsview/documents-view.controller.js
deleted file mode 100644
index 6ef8e67..0000000
--- a/common_components/layouts/documentsview/documents-view.controller.js
+++ /dev/null
@@ -1,12 +0,0 @@
-(function (angular) {
-    var module = angular.module('framework.documents',[]);
-
-    module.controller('DocumentsController', DocumentsController);
-
-    DocumentsController.$inject = ['$scope', 'rData', '$state'];
-    function DocumentsController($scope, rData, $state) {
-        $scope.documents = rData;
-        $scope.selectedDocument=rData[0];
-    }
-
-})(angular);
\ No newline at end of file
diff --git a/common_components/layouts/documentsview/documents-view.partial.html b/common_components/layouts/documentsview/documents-view.partial.html
deleted file mode 100644
index b74c3da..0000000
--- a/common_components/layouts/documentsview/documents-view.partial.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<div class="document-options">
-	<a href="" class="btn btn-xs btn-primary"><i class="icon-Add-File"></i> Add New</a>
-</div>
-<div class="row">
-	<div class="col-md-4">
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				<h3 class="panel-title">Documents</h3>
-			</div>
-			<div class="panel-body">
-				<div ng-repeat="doc in documents">
-					<div class="document" ng-click="$parent.selectedDocument=doc" ng-class="(selectedDocument==doc)?'active':''">
-						<small class="pull-right grey">{{doc.ExpiryDate | countdown}}</small>
-						<strong>{{doc.Name}}</strong><br />
-						{{doc.IdentificationNo}}
-						<small class="pull-right grey mt5"><i class="icon-Pencil"></i></small>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-	<div class="col-md-8">
-		<div class="panel panel-default">
-			<div class="panel-heading">
-				<h3 class="panel-title">Viewer</h3>
-			</div>
-			<div class="panel-body document-viewer">
-				<div class="document-viewer-options">
-					<a href="" class="btn-icon"><i class="icon-Download"></i>Save</a>
-					<a href="" class="btn-icon"><i class="icon-Close-Window"></i>Delete</a>
-				</div>
-				<img src="{{selectedDocument.DocumentURL}}" width="500px" />
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/common_components/layouts/module/module-base.layout.html b/common_components/layouts/module/module-base.layout.html
deleted file mode 100644
index bbf6a5f..0000000
--- a/common_components/layouts/module/module-base.layout.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="module">
-	<div ui-view name="options-area"></div>
-	<div class="row">
-		<div class="col-md-12 col-lg-9 module-primary">
-			<div ui-view name="view-area"></div>
-		</div>
-		<div class="visible-lg col-lg-3 module-secondary">
-			<div ui-view name="stats-area"></div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/common_components/layouts/module/module-cards.controller.js b/common_components/layouts/module/module-cards.controller.js
deleted file mode 100644
index 530beea..0000000
--- a/common_components/layouts/module/module-cards.controller.js
+++ /dev/null
@@ -1,37 +0,0 @@
-(function (angular) {
-    var module = angular.module('framework.UI.module',[]);
-
-    module.controller('ModuleCardsController', moduleCardsController);
-
-    moduleCardsController.$inject = ['$scope', 'rData', 'rNavTo','rAccessors', '$state', '$interval', '$timeout'];
-    function moduleCardsController($scope, rData, rNavTo, rAccessors, $state, $interval, $timeout) {
-        $scope.rawItems = rData;
-        $scope.accessors = rAccessors;
-        $scope.rNavTo = rNavTo;
-        $scope.showScore = false;
-        $scope.chosenGroup = null;
-        $scope.cardLimit = 2;
-
-        $scope.groups = {};
-        rData = rData.sort(function(a,b){
-        	var valA = rAccessors.Title(a), valB = rAccessors.Title(b);
-        	if(valA < valB) {
-        		return -1;
-        	} else if (valA > valB){
-        		return 1;
-        	} else
-        		return 0;
-        });
-        
-        var i;
-
-        for(i = 0; i < rData.length; i++) {
-            var title = rAccessors.Group(rData[i]);
-            if($scope.groups[title])
-                $scope.groups[title].push(rData[i]);
-            else 
-                $scope.groups[title] = [rData[i]];
-        }
-    }
-
-})(angular);
\ No newline at end of file
diff --git a/common_components/layouts/module/module-cards.partial.html b/common_components/layouts/module/module-cards.partial.html
deleted file mode 100644
index d8d0286..0000000
--- a/common_components/layouts/module/module-cards.partial.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="cards-wrapper">
-	<div class="cards-view-options">
-		<div class="row">
-			<div class="col-sm-8 col-xs-8">
-				 <div class="group-filters">
-				<a class="group-options" ng-click="chosenGroup = null" ng-class="(chosenGroup == null)?'active':''">All</a>
-				<a class="group-options" ng-click="$parent.chosenGroup = title" ng-class="($parent.chosenGroup == title)?'active':''" ng-repeat="(title, items) in groups">{{title}}({{(items | filter:searchTerm).length }})</a>
-				</div>
-			</div>
-			<div class="col-sm-4 col-xs-4 text-right">
-				<a class="btn btn-primary btn-xs" ng-click="showScore=!showScore" ng-bind="(showScore)? 'Hide Scores':'Show Scores'" ng-class="(showScore)?'active':''">Show Scores</a>
-			</div>
-		</div>
-	</div>
-	<div ng-repeat="(title, items) in ::groups track by title" ng-if="!chosenGroup || chosenGroup==title">
-		<h3 class="section-title" ng-show="results.length > 0">{{title}}</h3>
-		
-		<card ng-repeat="item in items  | filter:searchTerm as results track by item.Id" showscore="{{showScore}}" ></card>
-
-		<br class="clearfix" ng-show="results.length > 0" />
-	</div>
-    <div ng-if="rawItems.length === 0">
-        No Items Added Yet.
-    </div>
-    <br class="clearfix" />
-</div>
\ No newline at end of file
diff --git a/common_components/layouts/module/module-item.controller.js b/common_components/layouts/module/module-item.controller.js
deleted file mode 100644
index 7c15440..0000000
--- a/common_components/layouts/module/module-item.controller.js
+++ /dev/null
@@ -1,14 +0,0 @@
-(function (angular) {
-    var module = angular.module('framework.UI.module');
-
-    module.controller('ModuleItemViewController', moduleItemViewController);
-
-    moduleItemViewController.$inject = ['$scope', 'rTabs', 'rData', 'rAccessors'];
-
-    function moduleItemViewController($scope, rTabs, rData, rAccessors) {
-        $scope.item = rData[0];
-        $scope.accessors = rAccessors;
-        $scope.tabDefs = rTabs;
-    }
-
-})(angular);
\ No newline at end of file
diff --git a/common_components/layouts/module/module-item.layout.html b/common_components/layouts/module/module-item.layout.html
deleted file mode 100644
index c981b06..0000000
--- a/common_components/layouts/module/module-item.layout.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<div class="module-item">
-	<div class="module-item-cover"></div>
-	<div class="module-item-nav-bar">
-		<card class="module-item-card" allow-click="false" show-score="false" class="single pull-left" show-title="false" show-subtitle="false"></card>
-		<div class="module-item-brief">
-			<h3>{{accessors.Title(item)}}</h3>
-			<h4>{{accessors.SubTitle(item)}}</h4>
-		</div>	
-		<tabs data="tabDefs" type="tabs" justified="false"></tabs>
-	</div>
-	<div class="module-item-options">
-		<div ui-view name="options-area"></div>
-	</div>
-	<div class="module-item-content">
-		<div class="row">
-			<div class="col-md-12">
-				<ui-view class="tab-content"></ui-view>
-			</div>
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/common_components/layouts/module/module-table.controller.js b/common_components/layouts/module/module-table.controller.js
deleted file mode 100644
index 739ccb6..0000000
--- a/common_components/layouts/module/module-table.controller.js
+++ /dev/null
@@ -1,22 +0,0 @@
-(function (angular) {
-    var module = angular.module('framework.UI.module');
-
-    module.controller('ModuleTableController', moduleCardsController);
-
-    moduleCardsController.$inject = ['$scope', 'rData', 'rNavTo', 'rSchema', '$state', '$q'];
-    function moduleCardsController($scope, rData, rNavTo, rSchema, $state, $q) {
-    	$scope.items = rData;
-    	
-    	function n() {
-    		console.log(arguments);
-    		return $q.when(rData);
-    	};
-
-        $scope.viewItem = viewItem;
-        $scope.Schema = rSchema;
-        function viewItem(item) {
-            $state.go(rNavTo, { Id: 11 });
-        }
-    }
-
-})(angular);
\ No newline at end of file
diff --git a/common_components/layouts/module/module-table.partial.html b/common_components/layouts/module/module-table.partial.html
deleted file mode 100644
index 01c7136..0000000
--- a/common_components/layouts/module/module-table.partial.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<table-for datasource="items" class="table table-condensed table-hover" schema="{{Schema}}" filtering="searchTerm" sorting="" paging="" grouping="grouping" wrapper-class="" table-class="">
-	<table-titlebar columns-options="true" paging="true"></table-titlebar>
-    <table-heading sorting="true">
-        <!--<table-cell column=""></table-cell>--> <!-- for overriding -->
-    </table-heading>
-    <table-data-rows>
-        <table-selection></table-selection>
-        <!--<table-cell column=""></table-cell>--> <!-- for overriding -->
-        <!--<table-expand-template></table-expand-template>--> <!-- for expanding -->
-        <table-actions>
-            <a class="btn btn-xs btn-primary" ng-click="viewItem(item)"><i class="icon-D-Eyeglasses2"></i>View</a>
-        </table-actions>
-    </table-data-rows>
-    <table-footer paging="true">
-    
-    </table-footer>
-</table-for>
\ No newline at end of file
diff --git a/common_components/layouts/structure/page.controller.js b/common_components/layouts/structure/page.controller.js
deleted file mode 100644
index 2f8627a..0000000
--- a/common_components/layouts/structure/page.controller.js
+++ /dev/null
@@ -1,12 +0,0 @@
-(function (window, angular) {
-    var app = angular.module("framework.UI.structure", []);
-
-    app.controller('PageController', pageController);
-
-    pageController.$inject = ['$scope', '$interval'];
-    
-    function pageController($scope, $interval) {
-        setupUIElements();
-    };
-
-})(window, angular);
\ No newline at end of file
diff --git a/common_components/layouts/structure/page.layout.html b/common_components/layouts/structure/page.layout.html
deleted file mode 100644
index fc095d5..0000000
--- a/common_components/layouts/structure/page.layout.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<div id="application-layout" ng-controller="PageController">
-    <div id="sidebar-left" ui-view name="sidebar-left"></div>
-    <div id="topbar" ui-view name="topbar"></div>
-    <div id="content-wrapper">
-        <div id="breadcrumb-bar" ng-include="'/common_components/layouts/breadcrumb/breadcrumb.partial.html'">
-            
-        </div>
-        <div ui-view name="content-wrapper">
-            
-        </div>
-    </div>
-    <div id="sidebar-toggle">
-        <i class="icon-Align-JustifyAll"></i>
-	</div>
-    <div id="sidebar-right" ui-view name="sidebar-right"></div>
-</div>
\ No newline at end of file
diff --git a/common_components/layouts/table-page/table-page.layout.html b/common_components/layouts/table-page/table-page.layout.html
deleted file mode 100644
index 489f478..0000000
--- a/common_components/layouts/table-page/table-page.layout.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<div class="container-fluid tablepage-layout">
-    <div class="row">
-        <div class="col-md-12">
-            <div ui-view name="table-options"></div>
-        </div>
-    </div>
-    <div class="row">
-        <div class="col-md-12">
-            <div ui-view name="table-content"></div>
-        </div>
-    </div>
-</div>
diff --git a/common_components/services/ConsoleLoggingProvider.service.js b/common_components/services/ConsoleLoggingProvider.service.js
deleted file mode 100644
index e44b1ee..0000000
--- a/common_components/services/ConsoleLoggingProvider.service.js
+++ /dev/null
@@ -1,67 +0,0 @@
-(function () {
-    var app = angular.module('framework.services.logging');
-
-    app.service('ConsoleLoggingProvider', ['$window', consoleLoggingProvider]);
-
-    function consoleLoggingProvider($window) {
-        this.log = log;
-        this.debug = debug;
-        this.info = info;
-        this.warning = warning;
-        this.error = error;
-
-        function log(level, catagory, msg, others) {
-            switch (level) {
-                case 1:
-                    debug(catagory, msg, others);
-                    break;
-                case 2:
-                    info(catagory, msg, others);
-                    break;
-                case 3:
-                    warning(catagory, msg, others);
-                    break;
-                case 4:
-                    error(catagory, msg, exception, others);
-                    break;
-                default:
-                    debug(catagory, msg, others);
-                    break;
-            }
-        }
-
-        function debug(catagory, msg, others) {
-            var date = new Date();
-            console.debug(date.toISOString() + ' - ' + catagory.toUpperCase() + ' - ' + msg);
-            angular.forEach(others, function (val, ind) {
-                console.debug('additional info ' + ind + ': ', val);
-            });
-        }
-
-        function info(catagory, msg, others) {
-            var date = new Date();
-            console.info(date.toISOString() + ' - ' + catagory.toUpperCase() + ' - ' + msg);
-            angular.forEach(others, function (val, ind) {
-                console.info('additional info ' + ind + ': ', val);
-            });
-        }
-
-        function warning(catagory, msg, others) {
-            var date = new Date();
-            console.warn(date.toISOString() + ' - ' + catagory.toUpperCase() + ' - ' + msg);
-            angular.forEach(others, function (val, ind) {
-                console.warn('additional info ' + ind + ': ', val);
-            });
-        }
-
-        function error(catagory, msg, exception, others) {
-            var date = new Date();
-            console.error(date.toISOString() + ' - ' + catagory.toUpperCase() + ' - ' + msg);
-            console.error('original exception: ' + exception);
-            angular.forEach(others, function (val, ind) {
-                console.error('additional info ' + ind + ': ', val);
-            });
-        }
-    }
-    
-})();
\ No newline at end of file
diff --git a/common_components/services/Logger.service.js b/common_components/services/Logger.service.js
deleted file mode 100644
index b24f748..0000000
--- a/common_components/services/Logger.service.js
+++ /dev/null
@@ -1,139 +0,0 @@
-(function (window, angular) {
-    var app = angular.module("framework.services.logging", []);
-
-    app.provider('Logger', function () {
-        var providers = [];
-        var hiddenCatagorys = [];
-        var loggingLevel = 1;
-
-        this.DEBUG = 1;
-        this.INFO = 2;
-        this.WARNING = 3;
-        this.ERROR = 4;
-
-        this.setGlobalLoggingLevel = setGlobalLoggingLevel;
-        this.addProvider = addProvider;
-        this.hideCatagory = hideCatagory;
-
-        function setGlobalLoggingLevel(level) {
-            loggingLevel = level;
-        }
-
-        function addProvider(provider) {
-            providers.push(provider);
-        }
-
-        function hideCatagory(catagory) {
-            hiddenCatagorys.push(catagory);
-        }
-
-        this.$get = buildLoggerService;
-
-        buildLoggerService.$inject = ['$injector'];
-        function buildLoggerService($injector) {
-            var instance = createLogger('Default');
-            this.createLogger = createLogger;
-            this.log = instance.log;
-            this.debug = instance.debug;
-            this.info = instance.info;
-            this.warning = instance.warning;
-            this.error = instance.error;
-            this.DEBUG = 1;
-            this.INFO = 2;
-            this.WARNING = 3;
-            this.ERROR = 4;
-            var concreteProviders = [];
-            angular.forEach(providers, function (value) {
-                if (angular.isObject(value)) {
-                    concreteProviders.push(value);
-                } else if (angular.isFunction(value)) {
-                    var pro = {
-                        log: value,
-                        debug: log.bind(null, 1),
-                        info: log.bind(null, 2),
-                        warning: log.bind(null, 3),
-                        error: log.bind(null, 4)
-                    };
-                    concreteProviders.push(pro);
-                } else if (angular.isArray(value)) {
-                    var pro = $injector.invoke(value, null, {
-                        Levels: {
-                            DEBUG: 1,
-                            INFO: 2,
-                            WARNING: 3,
-                            ERROR: 4
-                        }
-                    });
-                    concreteProviders.push(pro);
-                } else if (typeof value === 'string') {
-                    var pro = $injector.get(value);
-                    concreteProviders.push(pro);
-                }
-            });
-
-            function createLogger(catagory) {
-                return new Logger(catagory, concreteProviders, loggingLevel, hiddenCatagorys);
-            }
-
-            return this;
-        }
-    });
-
-    function Logger(catagory, providers, loggingLevel, hiddenCatagorys) {
-        this.log = log;
-        this.debug = debug;
-        this.info = info;
-        this.warning = warning;
-        this.error = error;
-
-        function log(level, msg) {
-            if (level < loggingLevel || hiddenCatagorys.indexOf(catagory) != -1)
-                return;
-            
-            var args = Array.prototype.slice.call(arguments, 2);
-            angular.forEach(providers, function (provider) {
-                provider.log(level, catagory, msg, args);
-            });
-        }
-
-        function debug(msg) {
-            if (1 < loggingLevel || hiddenCatagorys.indexOf(catagory) != -1)
-                return;
-
-            var args = Array.prototype.slice.call(arguments, 1);
-            angular.forEach(providers, function (provider) {
-                provider.debug(catagory, msg, args);
-            });
-        }
-
-        function info(msg) {
-            if (2 < loggingLevel || hiddenCatagorys.indexOf(catagory) != -1)
-                return;
-
-            var args = Array.prototype.slice.call(arguments, 1);
-            angular.forEach(providers, function (provider) {
-                provider.info(catagory, msg, args);
-            });
-        }
-
-        function warning(msg) {
-            if (3 < loggingLevel || hiddenCatagorys.indexOf(catagory) != -1)
-                return;
-
-            var args = Array.prototype.slice.call(arguments, 1);
-            angular.forEach(providers, function (provider) {
-                provider.warning(catagory, msg, args);
-            });
-        }
-
-        function error(msg, exception) {
-            if (4 < loggingLevel || hiddenCatagorys.indexOf(catagory) != -1)
-                return;
-
-            var args = Array.prototype.slice.call(arguments, 2);
-            angular.forEach(providers, function (provider) {
-                provider.error(catagory, msg, exception, args);
-            });
-        }
-    }
-})(window, angular);
\ No newline at end of file
diff --git a/common_components/services/Menu.service.js b/common_components/services/Menu.service.js
deleted file mode 100644
index d9a52d0..0000000
--- a/common_components/services/Menu.service.js
+++ /dev/null
@@ -1,45 +0,0 @@
-(function (window, angular) {
-    var app = angular.module("framework.services.menu", []);
-
-    app.provider('MenuService', MenuServiceProvider);
-
-    function MenuServiceProvider() {
-        var menuItems = [];
-        var defaultIcon = 'icon-Align-JustifyAll';
-        var provider = {
-            registerMenuItem: registerMenuItem,
-            setDefaultIcon: setDefaultIcon,
-            $get: getService
-        };
-
-        return provider;
-
-        function registerMenuItem(menuItem) {
-            menuItems.push(menuItem);
-        }
-
-        function setDefaultIcon(icon) {
-            defaultIcon = icon;
-        }
-
-        function getService() {
-            angular.forEach(menuItems, function (mi) {
-                mi.$html = _buildTemplate(mi);
-            });
-            var service = {
-                menuItems: menuItems,
-                defaultIcon: defaultIcon
-            };
-            return service;
-        }
-
-        function _buildTemplate(menuItem) {
-            var template = '<a ui-sref="' + menuItem.state + '" style="color:white;">' +
-                '<i class="{{item.icon ? item.icon : menu.defaultIcon}}"></i>' +
-                '{{item.title}}' +
-            '</a>';
-            return template;
-        }
-
-    };
-})(window, angular);
\ No newline at end of file
diff --git a/common_components/services/Model.service.js b/common_components/services/Model.service.js
deleted file mode 100644
index 8ff2ddd..0000000
--- a/common_components/services/Model.service.js
+++ /dev/null
@@ -1,300 +0,0 @@
-(function (window, angular) {
-    var module = angular.module('framework.services.model', []);
-
-    module.provider('Model', modelsProvider);
-    //module.service('DataContext', dataService);
-
-    function modelsProvider() {
-        var schemas = {
-
-        };
-
-        this.registerSchema = registerSchema;
-        this.$get = buildService;
-
-        function registerSchema(name, path, schema) {
-            schemas[name] = [path, schema];
-            return this;
-        }
-
-        buildService.$inject = ['$config', '$http', '$q'];
-        function buildService($config, $http, $q) {
-            var models = {};
-
-            angular.forEach(schemas, function (value, key) {
-                var modelName = key;
-                var modelPath = value[0];
-                var modelSchema = value[1];
-
-                models[modelName] = BuildConstructor(modelPath, modelSchema);
-            });
-
-            return models;
-
-            function Entity(apiEndpoint, schema, values) {
-                this.$$apiLocation = apiEndpoint;
-                this.$$schema = schema;
-                this.$$originalValues = {};
-                this.$$changedValues = {};
-                this.$$foreignModels = {};
-
-                this.$getChanges = getChanges;
-                this.$validate = validateEntity;
-                this.$save = saveEntity;
-                this.$update = updateEntity;
-                this.$patch = patchEntity;
-                this.$delete = deleteEntity;
-                this.$commit = commitEntity;
-                this.$rollback = rollbackEntity;
-
-                angular.forEach(schema, function (value, key) {
-                    var fieldName = key,
-                        fieldDef = value;
-
-                    if (values[fieldName] !== undefined) {
-                        if (typeof fieldDef.type === 'string' && values[fieldName] !== null) {
-                            this.$$originalValues[fieldName] = new models[fieldDef.type](values[fieldName]);
-                            this.$$foreignModels[fieldName] = fieldDef.type;
-                        } else {
-                            this.$$originalValues[fieldName] = values[fieldName];
-                        }
-                    } else {
-                        this.$$originalValues[fieldName] = fieldDef.defaultValue;
-                    }
-
-                    Object.defineProperty(this, fieldName, {
-                        configurable: false,
-                        enumerable: true,
-                        get: fieldDef.calculated || function () {
-                            return this.$$changedValues.hasOwnProperty(fieldName) ?
-                                this.$$changedValues[fieldName] : this.$$originalValues[fieldName];
-                        },
-                        set: function (value) {
-                            if (angular.isUndefined(fieldDef.editable) || fieldDef.editable) {
-
-                                this.$$changedValues[fieldName] = value; //CHECK: Cast to correct type??
-                            }
-                        }
-                    });
-                }, this);
-
-                function getChanges() {
-                    return this.$$changedValues;
-                }
-                function validateEntity() {
-                } //TODO
-                function saveEntity() {
-                    return $http.post($config.API_ENDPOINT + this.$$apiLocation, this);
-                }
-                function updateEntity() {
-                    var config = {
-                        params: {
-                            id: this.Id
-                        }
-                    };
-                    return $http.put($config.API_ENDPOINT + this.$$apiLocation, this, config);
-                }
-                function patchEntity(skipSubObjects) {
-                    var self = this;
-                    var delta = angular.extend({ Id: this.Id }, this.$getChanges());
-                    var config = {
-                        params: {
-                            id: this.Id
-                        }
-                    };
-                    var request = $http.patch($config.API_ENDPOINT + this.$$apiLocation, delta, config);
-                    request.success(function () {
-                        self.$commit(true);
-                    });
-                    return request;
-                }
-                function deleteEntity() {
-                    var config = {
-                        params: {
-                            id: this.Id
-                        }
-                    };
-                    return $http.delete($config.API_ENDPOINT + this.$$apiLocation, config);
-                }
-                function commitEntity(skipSubObjects) {
-                    angular.forEach(this.$$changedValues, function (value, key) {
-                        var fieldName = key,
-                            fieldValue = value;
-                        this.$$originalValues[fieldName] = fieldValue
-                    }, this);
-                    this.$$changedValues = {};
-
-                    if (skipSubObjects) return;
-                    angular.forEach(this.$$foreignModels, function (value, key) {
-                        this[key].$commit();
-                    }, this);
-                }
-                function rollbackEntity(skipSubObjects) {
-                    this.$$changedValues = {};
-
-                    if (skipSubObjects) return;
-                    angular.forEach(this.$$foreignModels, function (value, key) {
-                        this[key].$rollback();
-                    }, this);
-                }
-            }
-
-            function Query(apiEndpoint, ctor) {
-                var includes = [];
-                var selects = [];
-                var filters = [];
-                var order = [];
-                var modelCtor = ctor;
-                this.include = include;
-                this.select = select;
-                this.filter = filter;
-                this.where = filter;
-                this.parseAs = parseAs;
-                this.execute = execute;
-                this.orderBy = orderBy;
-
-                function parseAs(parser) {
-                    modelCtor = parser;
-                }
-
-                function include() {
-                    if (arguments.length === 2) {
-                        if (angular.isObject(arguments[1])) {
-                            //TODO: Process subquery
-                        } else if (angular.isFunction(arguments[1])) {
-                            //TODO: Process subquery
-                        }
-                    } else {
-                        [].push.apply(includes, arguments);
-                    }
-                    return this;
-                }
-
-                function orderBy(prop) {
-                	this.order.push(prop);
-					//todo add dir and aliases
-                }
-
-                function select() {
-                    [].push.apply(selects, arguments);
-                    modelCtor = null;
-                    return this;
-                }
-
-                function filter(key, op, value) {
-                    if (arguments.length === 1) {
-                        filters.push(key);
-                    } else if (arguments.length === 3) {
-                        switch (op) {
-                            case '&&':
-                                op = 'and';
-                                break;
-                            case '||':
-                                op = 'or';
-                                break;
-                            case '=':
-                            case '==':
-                            case '===':
-                                op = 'eq';
-                                break;
-                            case '!=':
-                            case '!==':
-                            case '!===':
-                                op = 'ne';
-                                break;
-                            case '>':
-                                op = 'gt';
-                                break;
-                            case '>=':
-                                op = 'ge';
-                                break;
-                            case '<':
-                                op = 'lt';
-                                break;
-                            case '<=':
-                                op = 'le';
-                                break;
-                            default:
-                                break;
-                        }
-                        filters.push(key + ' ' + op + ' ' + value);
-                    }
-                    return this;
-                }
-
-                function execute() {
-                    var config = {};
-                    config.params = _buildParams();
-                    apiCall = $config.API_ENDPOINT + apiEndpoint;
-                    return $http.get(apiCall, config).then(function (response) {
-                        if (!modelCtor) {
-                            return response.data;
-                        } else {
-                            if (angular.isArray(response.data)) {
-                                var results = [];
-                                angular.forEach(response.data, function (d) {
-                                    results.push(new modelCtor(d));
-                                });
-                                return results;
-                            } else {
-                                return new modelCtor(response.data);
-                            }
-                        }
-                    });
-                }
-                
-                function _buildParams() {
-                    var params = {};
-                    if (includes.length) {
-                        params.$expand = includes.join(',');
-                    }
-                    if (filters.length) {
-                        params.$filter = filters.join(' and ');
-                    }
-                    if (selects.length) {
-                        params.$select = selects.join(',');
-                    }
-                    return params;
-                }
-            }
-
-            function ModelCache() {
-
-            }
-
-            function BuildConstructor(apiEndpoint, schema) {
-                function ModelCtor(values) {
-                    var values = values || {};
-
-                    this.base = Entity;
-                    this.base(apiEndpoint, schema, values);
-                }
-
-                ModelCtor.prototype = new Entity;
-                ModelCtor.$schema = schema;
-                ModelCtor.query = query;
-                ModelCtor.getById = getById;
-
-                var passon = ModelCtor;
-
-                function query() {
-                    return new Query(apiEndpoint, passon);
-                }
-
-                function getById(id) {
-                    return new Query(apiEndpoint)
-                        .filter('Id', 'eq', id);
-                }
-
-                return ModelCtor;
-            }
-        }
-    }
-
-    dataService.$inject = ['$config', '$http', '$q', 'Models'];
-    function dataService($config, $http, $q, Models) {
-        var entityIdMaps = {};
-        var entityArrays = {};
-
-    }
-})(window, angular);
\ No newline at end of file
diff --git a/common_components/services/Storage.service.js b/common_components/services/Storage.service.js
deleted file mode 100644
index 70c9580..0000000
--- a/common_components/services/Storage.service.js
+++ /dev/null
@@ -1,73 +0,0 @@
-(function () {
-    var module = angular.module('framework.services.storage', [])
-
-    module.factory('$localStorage', _storageFactory('localStorage'));
-    module.factory('$sessionStorage', _storageFactory('sessionStorage'));
-
-    function _storageFactory(storageType) {
-        return ['$rootScope', '$window', '$log',
-            function ($rootScope, $window, $log) {
-                // #9: Assign a placeholder object if Web Storage is unavailable to prevent breaking the entire AngularJS app
-                var webStorage = $window[storageType] || ($log.warn('This browser does not support Web Storage!'), {}),
-                    $storage = {
-                        $default: function (items) {
-                            for (var k in items) {
-                                angular.isDefined($storage[k]) || ($storage[k] = items[k]);
-                            }
-
-                            return $storage;
-                        },
-                        $reset: function (items) {
-                            for (var k in $storage) {
-                                '$' === k[0] || delete $storage[k];
-                            }
-
-                            return $storage.$default(items);
-                        }
-                    },
-                    _last$storage,
-                    _debounce;
-
-                for (var i = 0, k; i < webStorage.length; i++) {
-                    // #8, #10: `webStorage.key(i)` may be an empty string (or throw an exception in IE9 if `webStorage` is empty)
-                    (k = webStorage.key(i)) && 'ngStorage-' === k.slice(0, 10) && ($storage[k.slice(10)] = angular.fromJson(webStorage.getItem(k)));
-                }
-
-                _last$storage = angular.copy($storage);
-
-                $rootScope.$watch(function () {
-                    _debounce || (_debounce = setTimeout(function () {
-                        _debounce = null;
-
-                        if (!angular.equals($storage, _last$storage)) {
-                            angular.forEach($storage, function (v, k) {
-                                angular.isDefined(v) && '$' !== k[0] && webStorage.setItem('ngStorage-' + k, angular.toJson(v));
-
-                                delete _last$storage[k];
-                            });
-
-                            for (var k in _last$storage) {
-                                webStorage.removeItem('ngStorage-' + k);
-                            }
-
-                            _last$storage = angular.copy($storage);
-                        }
-                    }, 100));
-                });
-
-                // #6: Use `$window.addEventListener` instead of `angular.element` to avoid the jQuery-specific `event.originalEvent`
-                'localStorage' === storageType && $window.addEventListener && $window.addEventListener('storage', function (event) {
-                    if ('ngStorage-' === event.key.slice(0, 10)) {
-                        event.newValue ? $storage[event.key.slice(10)] = angular.fromJson(event.newValue) : delete $storage[event.key.slice(10)];
-
-                        _last$storage = angular.copy($storage);
-
-                        $rootScope.$apply();
-                    }
-                });
-
-                return $storage;
-            }
-        ];
-    }
-})()
\ No newline at end of file
diff --git a/common_components/tables/Table.controller.js b/common_components/tables/Table.controller.js
deleted file mode 100644
index 51cdb6e..0000000
--- a/common_components/tables/Table.controller.js
+++ /dev/null
@@ -1,157 +0,0 @@
-(function (angular) {
-    var module = angular.module('framework.table', []);
-
-    var table_defaults = {
-        table: 'table table-bordered'
-    };
-
-    /*
-     *  Defines Table defaults and settings
-     */
-    module.constant("$table_config", table_defaults);
-
-    /*
-     *  Injectable Base Class for Inhertence
-     *  Functions:
-     *      Lays out rows / columns
-     *      Sets heading title
-     *      Parses cell values
-     *      Column Sizing
-     */
-    module.service('BasicTableControllerBase', function () {
-        return BasicTableControllerBase;
-    });
-
-    /*
-     *  Injectable Base Class for Inhertence
-     *  Functions:
-     *      As Basic Table Plus:
-     *      Sortable Columns
-     */
-    module.service('SortableTableControllerBase', function () {
-        return SortableTableControllerBase;
-    });
-
-    /*
-     *  Default Implementations
-     */
-    module.controller('BasicTableController', basicTableController);
-    module.controller('SortableTableController', sortableTableController);
-
-    //#region BaseClasses
-
-    function BasicTableControllerBase($scope, columns, data) {
-        var $injector = angular.element('*[ng-app]').injector();
-        var $parse = $injector.get('$parse');
-
-        $scope.rows = data.data;
-        $scope.columns = columns;
-        $scope.getValue = getValue;
-
-        var _totalWidths = columns.reduce(function (prev, current) {
-            return prev += (current.width || '*').length;
-        }, 0);
-
-        angular.forEach(columns, function (value) {
-            value.$$parser = angular.isFunction(value.mapping) ? value.mapping : $parse(value.mapping || value.name);
-            value.$$width = 100.00 / _totalWidths * (value.width || '*').length + '%';
-        });
-
-        function getValue(row, col) {
-            return col.$$parser(row);
-        }
-    }
-
-    function SortableTableControllerBase($scope, columns, data) {
-        this.base = BasicTableControllerBase;
-        this.base($scope, columns, data);
-
-        $scope.currentSort = {
-            value: '',
-            column: null,
-            reverse: false
-        };
-        $scope.currentSearch = searchFunction;
-        $scope.sortBy = sort;
-        $scope.searchTerm = null;
-
-        function sort(column, $event) {
-            var newSort = {
-                value: '',
-                column: null
-            };
-
-            if (angular.isObject(column)) {
-                newSort.column = column;
-                newSort.value = column.$$parser;
-            } else if (typeof column === "string") {
-                angular.forEach($scope.columns, function (colDef) {
-                    if ((colDef.mapping || colDef.name) === column) {
-                        newSort.column = colDef;
-                    }
-                });
-                newSort.value = column;
-            } else if (angular.isFunction(column)) {
-                newSort.value = column;
-                newSort.column = null;
-            }
-
-            if ($scope.currentSort.value === newSort.value) {
-                $scope.currentSort.reverse = !$scope.currentSort.reverse;
-            } else {
-                $scope.currentSort.reverse = false;
-            }
-
-            $scope.currentSort.value = newSort.value;
-            $scope.currentSort.column = newSort.column;
-        };
-
-        function searchFunction(row) {
-            if (!$scope.searchTerm) {
-                return true;
-            }
-            var found = false;
-            for (var i = 0; i < columns.length; i++) {
-                var column = $scope.columns[i];
-                if (angular.isUndefined(column.searchable) || column.searchable) {
-                    var value = column.$$parser(row);
-                    if (angular.isFunction(column.comparator)) {
-                        found = column.comparator(value, $scope.searchTerm);
-                    } else if (typeof value === 'string') {
-                        found = value.toLowerCase().indexOf($scope.searchTerm.toLowerCase()) >= 0;
-                    }
-                }
-                if (found) {
-                    break;
-                }
-            }
-            return found;
-        };
-    }
-    SortableTableControllerBase.prototype = BasicTableControllerBase;
-
-    //#endregion
-
-    //#region Default Implementations
-
-    basicTableController.$inject = ['$scope', 'classes', 'columns', 'data'];
-    function basicTableController($scope, classes, columns, data) {
-        this.base = BasicTableControllerBase;
-        this.base($scope, columns, data);
-
-        $scope.classes = angular.extend({}, table_defaults, classes);
-    }
-    basicTableController.prototype = BasicTableControllerBase;
-
-
-    sortableTableController.$inject = ['$scope', 'classes', 'columns', 'data'];
-    function sortableTableController($scope, classes, columns, data) {
-        this.base = SortableTableControllerBase;
-        this.base($scope, columns, data);
-
-        $scope.classes = angular.extend({}, table_defaults, classes);
-    }
-    sortableTableController.prototype = SortableTableControllerBase;
-
-    //#endregion
-})(angular);
\ No newline at end of file
diff --git a/common_components/tables/basic-table.layout.html b/common_components/tables/basic-table.layout.html
deleted file mode 100644
index 4877fba..0000000
--- a/common_components/tables/basic-table.layout.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<div class="basic-table">
-    <table ng-class="classes.table">
-        <thead ng-class="classes.head">
-            <tr>
-                <th ng-repeat="col in columns" width="{{col.$$width}}" ng-class="col.classes.heading">
-                    {{ col.name }}
-                </th>
-            </tr>
-        </thead>
-        <tbody ng-class="classes.body">
-            <tr ng-repeat="row in rows">
-                <td ng-repeat="col in columns">
-                    {{ ::getValue(row, col) }}
-                </td>
-            </tr>
-        </tbody>
-    </table>
-</div>
diff --git a/common_components/tables/sortable-table.layout.html b/common_components/tables/sortable-table.layout.html
deleted file mode 100644
index d67ec0a..0000000
--- a/common_components/tables/sortable-table.layout.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<div class="basic-table">
-    <input type="text" ng-model="searchTerm" />
-    <table ng-class="classes.table">
-        <thead>
-            <tr>
-                <th ng-repeat="col in columns" width="{{::col.$$width}}">
-                    {{ ::col.name }}
-                    <i class="fa" ng-class="currentSort.column === col ? (currentSort.reverse ? 'fa-sort-amount-desc' : 'fa-sort-amount-asc') : 'fa-sort-amount-asc text-muted' " ng-click="sortBy(col, $event)"></i>
-                </th>
-            </tr>
-        </thead>
-        <tbody>
-            <tr ng-repeat="row in rows | filter:currentSearch | orderBy:currentSort.value:currentSort.reverse">
-                <td ng-repeat="col in columns">
-                    {{ ::getValue(row, col) }}
-                </td>
-            </tr>
-        </tbody>
-    </table>
-</div>
diff --git a/directives/BindHtmlCompile.directive.js b/directives/BindHtmlCompile.directive.js
new file mode 100644
index 0000000..195de96
--- /dev/null
+++ b/directives/BindHtmlCompile.directive.js
@@ -0,0 +1,21 @@
+(function (angular) {
+    'use strict';
+
+    var module = angular.module('framework.directives.utils', []);
+
+    module.directive('bindHtmlCompile', ['$compile', bindHtmlCompile]);
+
+    function bindHtmlCompile($compile) {
+        return {
+            restrict: 'A',
+            link: function (scope, element, attrs) {
+                scope.$watch(function () {
+                    return scope.$eval(attrs.bindHtmlCompile);
+                }, function (value) {
+                    element.html(value);
+                    $compile(element.contents())(scope);
+                });
+            }
+        };
+    }
+}(angular));
\ No newline at end of file
diff --git a/directives/Card.directive.js b/directives/Card.directive.js
new file mode 100644
index 0000000..6cd9578
--- /dev/null
+++ b/directives/Card.directive.js
@@ -0,0 +1,48 @@
+(function(angular){
+	var module = angular.module('framework.directives.UI',[]);
+
+	module.directive('card', cardDirective);
+	cardDirective.$inject=['$state', '$interval', '$parse'];
+	function cardDirective($state, $interval, $parse) {
+		return {
+			restrict: 'E',
+			transclude: true,
+			replace: true,
+			scope: true,
+			template: function(element, attrs) {
+				var template='';
+				template += '<div class="card"><div class="card-container"';
+				if(attrs.allowClick!="false") {
+					template += ' ng-click="viewItem(item)"'
+				}
+				template += '><svg class="logo" style="background-image:url(\'{{::accessors.LogoUrl(item)}}\')" viewBox="0 0 100 100"><circle cx="50" cy="50" r="50" fill="transparent" stroke-width="10" stroke-linecap="round" ng-show="showScore==true" stroke-location="outside"></circle></svg>';
+				if(attrs.showTitle!="false") {
+					template += '<strong>{{ ::accessors.Title(item) }}</strong>';
+				}
+				if(attrs.showSubtitle!="false") {
+					template += '<small>{{ ::accessors.SubTitle(item) }}</small>';
+				}
+				template += '</div></div>';
+				return template;
+			},
+			link: function(scope, elem, attrs, ctrls, transcludeFn) {
+				if(attrs.item) {
+					var getter = $parse(attrs.item);
+					scope.item = getter(scope);
+				}
+				scope.viewItem = viewItem;
+				if(scope.accessors.Score) {
+					var percentScore = (2 * Math.PI*50)/100*scope.accessors.Score(scope.item);
+					var percentColor = (percentScore < 90)? 'red': (percentScore >= 90 && percentScore <180)? 'orange' :(percentScore >= 180 && percentScore <270)? 'rgb(25, 195, 45)' : 'rgb(25, 195, 45);';
+					elem.find("circle")
+						.attr("stroke", percentColor)
+						.attr("stroke-dasharray",percentScore+",10000");
+				}
+
+				function viewItem(item) {
+         		   $state.go(scope.rNavTo, { Id: item.Id });
+        		}
+			}
+		}
+	}
+})(angular);
\ No newline at end of file
diff --git a/directives/FieldFor.directive.js b/directives/FieldFor.directive.js
new file mode 100644
index 0000000..a352549
--- /dev/null
+++ b/directives/FieldFor.directive.js
@@ -0,0 +1,218 @@
+(function (angular) {
+    var module = angular.module('framework.directives.UI');
+
+    module.directive('fieldFor', fieldForDirective);
+    module.directive('formFor', formForDirective);
+    module.filter('propSearch', propertySearchFilter);
+
+    formForDirective.$inject = ['Model'];
+    function formForDirective(Model) {
+        return {
+            restrict: 'A',
+            scope: true,
+            transclude: true,
+            template: function (element, attrs) {
+                return '<form name="formFor.form" class="transclude-target" autocomplete="off" novalidate></form>';
+            },
+            link: function (scope, element, attrs, ctrls, transcludeFn) {
+                scope.formFor = (scope.formFor || {});
+                scope.formFor.target = scope.$eval(attrs.formFor);
+                scope.formFor.schema = (attrs.schema) ? Model[attrs.schema].$schema : scope.target.$$schema;
+                scope.formFor.mode = 'EDIT';
+
+                scope.$watch(function () {
+                    return scope.target;
+                }, function (newvalue) {
+
+                });
+
+                if (attrs.mode) {
+                    scope.formFor.mode = attrs.mode;
+                    attrs.$observe('mode', function (newvalue) {
+                        scope.formFor.mode = newvalue;
+                    });
+                }
+
+                transcludeFn(scope, function (clone, scope) {
+                    element.children('.transclude-target').append(clone);
+                });
+            }
+        }
+    };
+
+    fieldForDirective.$inject = ['Model'];
+    function fieldForDirective(Model) {
+        var defaults = {
+            inputType: 'text',
+            required: false,
+            selectTheme: 'selectize',
+            selectSelectedTemplate: '{{$select.selected.Name}}',
+            selectOptionTemplate: '<div ng-bind-html="option.Name | highlight: $select.search"></div><small class="text-muted">{{option.Description}}</small>'
+        };
+        return {
+            restrict: 'A',
+            scope: true,
+            template: function (element, attrs) {
+                var formParent = element.closest('[form-for]'),
+                    subformParent = element.closest('[sub-form-for]'),
+                    schemaName = ((subformParent.length) ? subformParent : formParent).attr('schema'),
+                    ctor = Model[schemaName],
+                    schema = ctor && ctor.$schema,
+                    fieldDef = schema && schema[attrs.fieldFor],
+                    subForm = subformParent.attr('sub-form-for') || '';
+
+                if (!fieldDef) {
+                    return;
+                }
+
+                var inputConfig = angular.extend({ display: attrs.fieldFor, inputType: 'text' }, defaults, fieldDef, fieldDef.input, attrs);
+
+                //need to fetch these.
+                var labelText = attrs.display || attrs.fieldFor,
+                    fieldName = attrs.fieldFor,
+                    selectFrom = attrs.selectFrom;
+
+                var template = '' +
+                        '<div class="form-group">' +
+                        '<label class="control-label" for="' + subForm + fieldName + 'Input">' + inputConfig.display + '</label>' +
+                        '<div ng-if="formFor.mode === \'VIEW\'">' +
+                        '<p class="form-control-static" ng-bind="::formFor.target.' + ((subForm) ? (subForm + '.') : '') + (inputConfig.displayField ? inputConfig.displayField : fieldName) + (inputConfig.displayFilters ? inputConfig.displayFilters : '') + '"></p>' +
+                        '</div>' +
+                        '<div ng-if="formFor.mode === \'EDIT\'">';
+
+                if (selectFrom) {
+                    template += '' +
+                        '<ui-select ng-model="formFor.target.' + ((subForm) ? (subForm + '.') : '') + fieldName + '" name="' + subForm + fieldName + 'Input" theme="' + inputConfig.selectTheme + '" ng-disabled="' + (angular.isDefined(inputConfig.editable) && !inputConfig.editable) + '" ng-required="' + inputConfig.required + '">' +
+                            '<ui-select-match allow-clear="true" placeholder="' + (inputConfig.placeholder || 'Select..') + '">' + inputConfig.selectSelectedTemplate + '</ui-select-match>' +
+                            '<ui-select-choices repeat="option.Id as option in ' + selectFrom + ' | propSearch: { Name: $select.search }">' +
+                                inputConfig.selectOptionTemplate +
+                            '</ui-select-choices>'+
+                        '</ui-select>';
+                } else if (inputConfig.type === moment) {
+                    template += '' +
+                        '<div class="input-group">' +
+                            buildElement('input', {
+                                class: 'form-control',
+                                type: 'text',
+                                name: subForm + fieldName + 'Input',
+                                ngModel: 'formFor.target.' + ((subForm) ? (subForm + '.') : '') + fieldName,
+                                ngRequired: inputConfig.required,
+                                datepickerPopup: 'dd/MM/yyyy',
+                                isOpen: 'opened',
+                                placeholder: 'DD/MM/YYYY',
+                                ngDisabled: angular.isDefined(inputConfig.editable) && !inputConfig.editable
+                            }) +
+                            '<span class="input-group-btn">' +
+                                '<button type="button" class="btn btn-default" ng-click="openCalendar($event)"><i class="glyphicon glyphicon-calendar"></i></button>' +
+                            '</span>' +
+                        '</div>';
+                } else {
+                    if (inputConfig.append || inputConfig.prepend) {
+                        template += '<div class="input-group">';
+                    }
+                    if (inputConfig.prepend) {
+                        template += '<span class="input-group-btn">' +
+                                '<button type="button" class="btn btn-default" ng-click="' + inputConfig.prepend.click + '"><i class="' + inputConfig.prepend.icon + '"></i>' + inputConfig.prepend.text + '</button>' +
+                        '</span>'
+                    }
+                    template += buildElement('input', {
+                        class: 'form-control',
+                        type: inputConfig.inputType,
+                        name: subForm + fieldName + 'Input',
+                        ngModel: 'formFor.target.' + ((subForm) ? (subForm + '.') : '') + fieldName,
+                        ngRequired: inputConfig.required,
+                        placeholder: inputConfig.placeholder
+                    });
+                    if (inputConfig.append) {
+                        template += '<span class="input-group-btn">' +
+                                '<button type="button" class="btn btn-default" ng-click="' + inputConfig.append.click + '"><i class="' + inputConfig.append.icon + '"></i>' + inputConfig.append.text + '</button>' +
+                        '</span>'
+                    }
+                    if (inputConfig.append || inputConfig.prepend) {
+                        template += '</div>';
+                    }
+                }
+
+                template += '' +
+                    '<div ng-messages="formFor.form.' + subForm + fieldName + 'Input.$error" class="help-block">' +
+                        '<div ng-message="required">' + inputConfig.display + ' is required.</div>' +
+                        '<div ng-message="parse">' + inputConfig.display + ' is incorrectly formatted.</div>' +
+                        '<div ng-message="email">' + inputConfig.display + ' is not a valid e-mail.</div>' +
+                        '</div>' +
+                    '</div>';
+                template += '</div>';
+                return template;
+            },
+            link: function (scope, element, attrs) {
+                scope.opened = false;
+
+                scope.openCalendar = function (event) {
+                    event.preventDefault();
+                    event.stopPropagation();
+                    scope.opened = true;
+                }
+            }
+        };
+    };
+
+    function propertySearchFilter() {
+        return function (items, props) {
+            var out = [];
+
+            if (angular.isArray(items)) {
+                items.forEach(function (item) {
+                    var itemMatches = false;
+
+                    var keys = Object.keys(props);
+                    for (var i = 0; i < keys.length; i++) {
+                        var prop = keys[i];
+                        var text = props[prop].toLowerCase();
+                        if (item[prop].toString().toLowerCase().indexOf(text) !== -1) {
+                            itemMatches = true;
+                            break;
+                        }
+                    }
+
+                    if (itemMatches) {
+                        out.push(item);
+                    }
+                });
+            } else {
+                // Let the output be the input untouched
+                out = items;
+            }
+
+            return out;
+        };
+    };
+
+    function buildElement(elementType, attrs) {
+        var result = '<' + elementType + ' ';
+
+        angular.forEach(attrs, function (value, key) {
+            if (angular.isDefined(value) && value !== null)
+                result += normalise(key) + '="' + value + '"';
+        });
+
+        if (elementType === 'input') {
+            result += ' />';
+        } else {
+            result += ' ></' + elementType + '>';
+        }
+        return result;
+    }
+
+    function normalise(input) {
+        var result = '';
+        for (var i = 0; i < input.length; i++) {
+            var char = input[i];
+            if (char == char.toUpperCase()) {
+                result += '-' + char.toLowerCase();
+            } else {
+                result += char;
+            }
+        }
+        return result;
+    }
+
+}(angular));
\ No newline at end of file
diff --git a/directives/Score.directive.js b/directives/Score.directive.js
new file mode 100644
index 0000000..25e2bf6
--- /dev/null
+++ b/directives/Score.directive.js
@@ -0,0 +1,53 @@
+(function(angular){
+	var module = angular.module('framework.directives.UI');
+
+	module.directive('score', scoreDirective);
+
+	scoreDirective.$inject=['$state', '$interval', '$parse'];
+	
+	function scoreDirective($state, $interval, $parse) {
+		return {
+			restrict: 'E',
+			transclude: true,
+			replace: true,
+			scope: true,
+			template: function(element, attrs) {
+				var template='';
+				template += '<div class="score"';
+				if(attrs.size) {
+					var scoreSize = parseInt(attrs.size);
+					template += ' style="position:relative;width:'+ (scoreSize) +'px; height: ' + (scoreSize) + 'px; border-radius:'+ (scoreSize/2) + 'px;padding:5px;">';
+				}
+				else {
+					template += ' style="width:100px;height:100px;border-radius:50px;">';
+				}
+				if(attrs.showScore) {
+					template += '<div class="score-value" style="line-height:' + scoreSize + 'px">'+attrs.showScore+'</div>';
+				}
+				template += '<svg class="dial" viewBox="0 0 100 100">' +
+								'<circle class="score-back-circle" cx="50" cy="50" r="45" fill="transparent" stroke-linecap="round"></circle>' +
+								'<circle class="score-front-circle" cx="50" cy="50" r="45" fill="transparent" stroke-linecap="round"></circle>' +
+							'</svg>';
+				template += '</div>';
+				return template;
+			},
+			link: function(scope, elem, attrs, ctrls, transcludeFn) {
+				if(!attrs.value)
+					return;
+				
+				var strokeWidth = (attrs.strokeWidth)? attrs.strokeWidth : 5;
+				var percentScore = (2 * Math.PI*50)/100 * attrs.value;
+				var percentColor = (percentScore < 90)? 'red': (percentScore >= 90 && percentScore <180)? 'orange' :(percentScore >= 180 && percentScore <270)? 'rgb(25, 195, 45)' : 'rgb(25, 195, 45)';
+
+				elem.find("circle.score-back-circle")
+					.attr("stroke", "#eee")
+					.attr("stroke-width", strokeWidth);
+
+				elem.find("circle.score-front-circle")
+					.attr("stroke", percentColor)
+					.attr("stroke-width", strokeWidth)
+					.attr("stroke-dasharray", percentScore+",10000");
+			}
+		}
+	}
+})(angular);
\ No newline at end of file
diff --git a/directives/TableFor.directive.js b/directives/TableFor.directive.js
new file mode 100644
index 0000000..ca224e8
--- /dev/null
+++ b/directives/TableFor.directive.js
@@ -0,0 +1,592 @@
+(function (angular) {
+	var module = angular.module('framework.directives.UI');
+
+	module.directive('tableFor', tableForDirective);
+	module.directive('tableTitlebar', tableTitlebarDirective);
+	module.directive('tableHeading', tableHeadingDirective);
+	module.directive('tableDataRows', tableDataRowsDirective);
+	module.directive('tableFooter', tableFooterDirective);
+	module.filter('publish', publishFilter);
+	module.filter('softFilter', softFilter);
+	module.filter('pageGroup', pageGroupFilter);
+
+
+
+	tableForDirective.$inject = ['$parse', 'Model', '$modal', '$q', '$filter', '$timeout'];
+	function tableForDirective($parse, Model, $modal, $q, $filter, $timeout) {
+		var defaults = {
+			wrapperClass: 'table-responsive',
+			tableClass: 'table table-bordered',
+			minWidth: '600px'
+		}
+
+		function linkFn(scope, element, attrs, ctrls, transcludeFn) {
+			var externalSearch = $parse(attrs.filtering)(scope);
+			var externalSorting = $parse(attrs.sorting)(scope);
+			var externalGrouping = $parse(attrs.grouping)(scope);
+			var externalPaging = $parse(attrs.paging)(scope);
+
+			scope.$schema = Model[attrs.schema].$schema;
+			scope.$table = {
+				actionColumn: false,
+				selectionColumn: false,
+				cardTemplate: '{{$row | json}}',
+				toggleSelectAll: toggleSelectAll,
+				toggleRowSelection: toggleRowSelection,
+				toggleGroupSelection: toggleGroupSelection,
+				allSelected: false,
+				reset: reset,
+				configureColumns: configureColumns,
+				sort: sort,
+				getSortingClass: getSortingClass
+			};
+			scope.$columns = generateColumns(scope.$schema);
+			scope.$filtering = externalSearch || {
+				$: ''
+			}
+			scope.$sorting = externalSorting || [];
+			scope.$grouping = externalGrouping || {
+				value: undefined
+			};
+			scope.$paging = externalPaging || {
+				currentPage: 1, 
+				totalItems: 0,
+				maxPerPage: 10
+			};
+			scope.$data = {}; //object as it's grouped
+			scope.$datasource = function () {
+				return arguments[4]; //returns existing data by default;
+			};
+
+			var datasource = $parse(attrs.datasource)(scope);
+			if (angular.isArray(datasource)) {
+				scope.$datasource = generateLocalDatasource(datasource);
+			} else if (angular.isFunction(datasource)) {
+				scope.$datasource = datasource;
+			} else {
+				scope.$datasource = generateModelDatasource(scope.$schema.query);
+			}
+
+			scope.$watchCollection(function () { return scope.$filtering; }, debouncedUpdateData);
+			scope.$watchCollection(function () { return scope.$sorting; }, debouncedUpdateData);
+			scope.$watchCollection(function () { return scope.$grouping; }, debouncedUpdateData);
+			scope.$watch(function () { return scope.$paging.currentPage; }, debouncedUpdateData);
+			scope.$watch(function () { return scope.$paging.maxPerPage; }, debouncedUpdateData);
+
+			var updateDebounce = null;
+
+			function debouncedUpdateData() {
+				if (updateDebounce) {
+					$timeout.cancel(updateDebounce);
+					updateDebounce = null;
+				}
+				updateDebounce = $timeout(updateData, 500);
+			}
+
+			function updateData() {
+				for (var key in scope.$data) {
+					delete scope.$data[key];
+				}
+				scope.$data.$loading = true;
+				scope.$data.$error = null;
+				scope.$datasource(scope.$filtering, scope.$sorting, scope.$grouping, scope.$paging, scope.$data).then(dataReceived, dataError, dataNotified);
+			}
+
+			function dataReceived(data) {
+				for (var key in scope.$data) {
+					delete scope.$data[key];
+				}
+				scope.$data.$loading = false;
+				angular.extend(scope.$data, data);
+			}
+
+			function dataError(error) {
+				for (var key in scope.$data) {
+					delete scope.$data[key];
+				}
+				scope.$data.$loading = false;
+				scope.$data.$error = error;
+			}
+
+			function dataNotified(dataLength) {
+				scope.$paging.totalItems = dataLength;
+			}
+
+			transcludeFn(scope, function (clone, scope) {
+				element.find('table').append(clone);
+			});
+
+			function generateLocalDatasource(initialData) {
+				var data = initialData;
+				return function (filtering, sorting, grouping, paging, existing) {
+					var deferred = $q.defer();
+
+					setTimeout(function () {
+						var filter = $filter('filter');
+						var orderBy = $filter('orderBy');
+						var groupBy = $filter('groupBy');
+						var pageGroup = $filter('pageGroup');
+
+						deferred.notify(filter(data, filtering).length);
+
+						var amendedSorting = [grouping.value];
+						[].push.apply(amendedSorting, sorting);
+
+						var result = pageGroup(groupBy(orderBy(filter(data, filtering), amendedSorting), grouping.value), paging);
+
+						deferred.resolve(result);
+					}, 0);
+
+					return deferred.promise;
+				}
+			}
+
+			function generateModelDatasource(modelQuery) {
+				var queryBase = modelQuery;
+				return function (filtering, sorting, grouping, paging, existing) {
+					var deferred = $q.defer();
+
+					query = queryBase();
+					if (grouping.value) {
+						query.orderBy(grouping.value);
+					}
+
+					angular.forEach(ordering, function (o) { query.orderBy(o); });
+
+
+					setTimeout(function () {
+						var filter = $filter('filter');
+						var groupBy = $filter('groupBy');
+						var pageGroup = $filter('pageGroup');
+
+						deferred.notify(filter(data, filtering).length);
+
+						var amendedSorting = [grouping.value];
+						[].push.apply(amendedSorting, sorting);
+
+						var result = pageGroup(groupBy(orderBy(filter(data, filtering), amendedSorting), grouping.value), paging);
+
+						deferred.resolve(result);
+					}, 0);
+
+					return deferred.promise;
+				}
+			}
+
+			function generateColumns(modelSchema) {
+				var columns = [];
+				angular.forEach(modelSchema, function (value, key) {
+					var config = angular.extend({}, value, value.table || {});
+					if (config.hidden) {
+						return;
+					}
+					if (!angular.isDefined(config.visible)) {
+						config.visible = true;
+					}
+					if (!angular.isDefined(config.binding) && config.type === moment) {
+						config.binding = key + ".toDate() | date:'dd/MM/yyyy'";
+					}
+					columns.push({ key: key, title: config.display || key, accessor: angular.isFunction(config.binding) ? config.binding : buildAccessor(config.binding || key), binding: config.binding || key, visible: config.visible, filters: config.filters });
+				});
+				return columns;
+			}
+
+			function toggleSelectAll() {
+				scope.$table.allSelected = !scope.$table.allSelected;
+				angular.forEach(scope.$data, function (group) {
+					toggleGroupSelection(group, scope.$table.allSelected);
+				});
+			}
+
+			function toggleRowSelection(group, row, force) {
+				row.$selected = angular.isDefined(force) ? force : !row.$selected;
+				var selected = group.filter(function (d) { return d.$selected; });
+				group.$selected = selected.length === group.length;
+				
+				var groups = 0;
+				var selectedGroups = 0;
+				angular.forEach(scope.$data, function (group, title) {
+					if (title[0] == '$') {
+						return;
+					}
+					groups++;
+					if (group.$selected) selectedGroups++;
+				});
+				scope.$table.allSelected = groups === selectedGroups;
+			}
+
+			function toggleGroupSelection(group, force) {
+				if (angular.isDefined(force)) {
+					group.$selected = force;
+				} else {
+					group.$selected = !group.$selected;
+				}
+				angular.forEach(group, function (row) {
+					row.$selected = group.$selected;
+				});
+
+				if (!angular.isDefined(force)) {
+					var groups = 0;
+					var selectedGroups = 0;
+					angular.forEach(scope.$data, function (group, title) {
+						if (title[0] == '$') {
+							return;
+						}
+						groups++;
+						if (group.$selected) selectedGroups++;
+					});
+					debugger;
+					scope.$table.allSelected = groups === selectedGroups;
+				}
+			}
+
+			function setAreAllSelected() {
+				scope.$table.allSelected = false;
+			}
+
+			function sort(col) {
+				//multisort
+				var currentSort = scope.$sorting[0];
+				if (col == currentSort) {
+					scope.$sorting[0] = '-' + col;
+				} else if ('-' + col == currentSort) {
+					scope.$sorting[0] = col;
+				} else {
+					scope.$sorting.length = 0;
+					scope.$sorting.push(col);
+				}
+			}
+
+			function getSortingClass(col) {
+				if (col == scope.$sorting[0]) {
+					return 'icon-Arrow-Down2 brand-primary';
+				}
+				else if ('-' + col == scope.$sorting[0]) {
+					return 'icon-Arrow-Up2 brand-primary';
+				} else {
+					return 'icon-Arrow-Down';
+				}
+			}
+
+			function reset() {
+				scope.$filtering = externalSearch || {
+					$: ''
+				}
+				scope.$sorting = [];
+
+				//TODO: Deselect ALL
+
+				scope.$columns.length = 0;
+				[].push.apply(scope.$columns, generateColumns(scope.$schema));
+			}
+
+			function buildAccessor(fieldName) {
+				console.log('return row.' + fieldName + ';');
+				window.count = window.count || 0;
+				return new Function('row', 'return row.' + fieldName + ';');
+			}
+
+			function configureColumns() {
+				$modal.open({
+					template: '' +
+							'<div class="modal-header">' +
+								'<button class="close" type="button" ng-click="$close()"><i class="icon-Close"></i></button>' +
+								'<h3 class="modal-title">Customize Columns</h3>' +
+							'</div>' +
+							'<div class="modal-body">' +
+								'<div ng-repeat="column in columns">' +
+									'<a ng-click="moveUp(column)" ng-hide="$first"><i class="icon-Arrow-UpinCircle brand-primary"></i></a>' +
+									' &nbsp; {{column.title}}' +
+									' &nbsp; <a ng-click="moveDown(column)" ng-hide="$last"><i class="icon-Arrow-DowninCircle brand-primary"></i></a>' +
+									'<div class="checkbox pull-right m0">' +
+										'<input type="checkbox" id="columncustomise{{::$index}}" ng-model="column.visible" ng-checked="column.visible" />' +
+										'<label for="columncustomise{{::$index}}"></label>' +
+									'</div><br class="clearfix">' +
+								'</div>' +
+							'</div>',
+					controller: function ($scope, columns) {
+						$scope.columns = columns;
+						$scope.moveUp = function (column) {
+							var index = $scope.columns.indexOf(column);
+							move(index, index - 1);
+						}
+						$scope.moveDown = function (column) {
+							var index = $scope.columns.indexOf(column);
+							move(index, index + 1);
+						}
+
+						function move(old_index, new_index) {
+							$scope.columns.splice(new_index, 0, $scope.columns.splice(old_index, 1)[0]);
+						}
+					},
+					size: 'sm',
+					resolve: {
+						columns: function () {
+							return scope.$columns
+						}
+					}
+				});
+			}
+		}
+
+		function compileFn(element, attrs) {
+			return linkFn;
+		}
+
+		return {
+			scope: true,
+			transclude: true,
+			template: function (element, attrs) {
+				return '<div class="' + (attrs.wrapperClass || defaults.wrapperClass) + '"><table class="' + (attrs.tableClass || defaults.tableClass) + ' module-table" style="min-width:' + (attrs.minWidth || defaults.minWidth) + '"></table></div>'
+			},
+			compile: function (element, attrs) {
+				return linkFn;
+			}
+		};
+	}
+
+	function tableTitlebarDirective() {
+		return {
+			restrict: 'E',
+			scope: true,
+			replace: true,
+			template: function (element, attrs) {
+				var template = '' +
+                '<thead><tr><th colspan="100" class="table-arrange">';
+				if (attrs.title) {
+					template += '<h3 class="table-title">' + attrs.title + '</h3>';
+				}
+				if (attrs.showCount) {
+					template += '<h3 class="table-title brand-primary">({{$visible.length}} / {{ $data.length }})</h3>';
+				}
+				if (attrs.columnsOptions) {
+					template += '<div class="columns-options">' +
+                                    '<a href="" ng-click="$table.reset()"><i class="icon-Reset"></i>Reset</a>' +
+                                    '<a href="" ng-click="$table.configureColumns()"><i class="icon-Receipt-2"></i>Arrange</a>' +
+                                '</div>';
+				}
+				template += '<div class="pull-right">' +
+                                    '<pagination class="pagination-sm"  style="margin: 0;" total-items="$paging.totalItems" ng-model="$paging.currentPage" items-per-page="$paging.maxPerPage" boundary-links="true" max-size="5"></pagination>' +
+                                '</div>';
+				if (attrs.search) {
+					template += '<input type="text" class="form-control pull-right" style="width:300px" placeholder="Search.." ng-model="$filtering.$" />';
+				}
+				template += '</th></tr></thead>'
+				return template;
+			}
+		}
+	}
+
+	function tableHeadingDirective() {
+		var defaults = {
+		}
+		return {
+			restrict: 'E',
+			scope: true,
+			replace: true,
+			template: function (element, attrs) {
+				var tmpl = '' +
+                    '<thead><tr>' +
+                        '<th ng-if="::$table.selectionColumn" style="width:40px;text-align:center;">' +
+                            '<div class="checkbox"><input type="checkbox" id="table-group-check" ng-click="$table.toggleSelectAll()" ng-checked="$table.allSelected"/><label for="table-group-check"></label></div>' +
+
+                        '</th>' +
+                        '<th ng-repeat="$column in $columns | filter: { visible: true }" class="module-table-head">' +
+                            '<div><i ng-class="$column.icon"></i> {{ ::$column.title }}' +
+                            '<span class="table-sort"><a href="" ng-click="$table.sort($column.key)"><i ng-class="$table.getSortingClass($column.key)"></i></a></span>' +
+                            '</div>' + //add filter and search menu
+                        '</th>' +
+                        '<th ng-if="::$table.actionColumn" style="text-align:center;">' +
+                            'Actions' +
+                        '</th>' +
+                    '</tr>';
+				tmpl += '</thead>';
+				return tmpl;
+			}
+		};
+	}
+
+	tableDataRowsDirective.$inject = ['$parse', 'Model'];
+	function tableDataRowsDirective($parse, Model) {
+		return {
+			restrict: 'E',
+			scope: true,
+			replace: true,
+			template: function (element, attrs) {
+				var tmp = '' +
+                    '<tbody ng-repeat="(title, group) in $data track by title">' +
+                        '<tr ng-hide="title == \'undefined\'">' +
+							'<td ng-if="::$table.selectionColumn" style="width:40px;text-align:center;">' +
+                                '<div class="checkbox"><input id="group-check-{{::title}}" type="checkbox" ng-click="$table.toggleGroupSelection(group)" ng-checked="group.$selected"/><label for="group-check-{{::title}}"></label></div>' +
+                            '</td>' +
+							'<td colspan="1000"><b><u>{{ title }}</u></b></td>' +
+						'</tr>' +
+                        '<tr ng-repeat="$row in group track by $row.Id">' +
+                            '<td ng-if="::$table.selectionColumn" style="width:40px;text-align:center;">' +
+                                '<div class="checkbox"><input id="table-check-{{::title}}{{::$index}}" type="checkbox" ng-click="$table.toggleRowSelection(group, $row)" ng-checked="$row.$selected"/><label for="table-check-{{::title}}{{::$index}}"></label></div>' +
+                            '</td>' +
+                            '<td ng-repeat="$column in $columns | filter: { visible: true } track by $column.key">' +
+                                '{{$column.accessor($row)}}' +
+                            '</td>' +
+                            '<td ng-if="::$table.actionColumn" style="text-align:center;" bind-html-compile="$table.actionColumn.html">' +
+                            '</td>' +
+                        '</tr>' +
+                    '</tbody>';
+				return tmp;
+			},
+			compile: function (element, attrs) {
+				var selectionElement = _findSelectionColumn(element);
+				var actionsElement = _findActionColumn(element);
+
+				return link;
+
+				function link(scope, element, attrs) {
+					scope.$table.actionColumn = actionsElement;
+					scope.$table.selectionColumn = selectionElement;
+					scope.$table.getCellValue = getCellValue;
+
+					function getCellValue(row, col) {
+						console.log('GetCellValue is depreciated for performance, please use "$column.accessor($row)" instead, functions are now precompilied;');
+						if (typeof col.binding === 'string')
+							return $parse(col.binding)(row);
+						else if (angular.isFunction(col.binding))
+							return col.binding(row, col);
+						else
+							return '';
+					}
+				}
+			}
+		}
+
+		function _findActionColumn(element) {
+			var actionsElement = jQuery(element.context).find('table-actions');
+			if (actionsElement.length) {
+				return {
+					html: actionsElement.html()
+				};
+			}
+			return false;
+		}
+
+		function _findSelectionColumn(element) {
+			var selectionElement = jQuery(element.context).find('table-selection');
+			if (selectionElement.length) {
+				return {
+					html: selectionElement.html()
+				};
+			}
+			return false;
+		}
+	}
+
+	function tableFooterDirective() {
+		return {
+			restrict: 'E',
+			scope: true,
+			replace: true,
+			template: function (element, attrs) {
+				var template = '' +
+                '<tfoot><tr><th colspan="100" class="table-arrange">';
+				if (attrs.title) {
+					template += '<h3 class="table-title">' + attrs.title + '</h3>';
+				}
+				if (attrs.showCount) {
+					template += '<b class="brand-primary">(showing {{$paging.maxPerPage}} from {{ $paging.totalItems }})</b>';
+				}
+				if (attrs.columnsOptions) {
+					template += '<div class="columns-options">' +
+                                    '<a href="" ng-click="$table.reset()"><i class="icon-Reset"></i>Reset</a>' +
+                                    '<a href="" ng-click="$table.configureColumns()"><i class="icon-Receipt-2"></i>Arrange</a>' +
+                                '</div>';
+				}
+				template += '<div class="pull-right">' +
+                                    '<pagination class="pagination-sm"  style="margin: 0;" total-items="$paging.totalItems" ng-model="$paging.currentPage" items-per-page="$paging.maxPerPage" boundary-links="true" max-size="5"></pagination>' +
+                                '</div>';
+				if (attrs.search) {
+					template += '<input type="text" class="form-control pull-right" style="width:300px" placeholder="Search.." ng-model="$filtering.$" />';
+				}
+				template += '</th></tr></tfoot>'
+				return template;
+			}
+		}
+	}
+
+	softFilter.$inject = ['$filter'];
+	function softFilter($filter) {
+		return function (array, filteringConfig) {
+			var filterFn = $filter('filter');
+			var filtered = filterFn(array, filteringConfig);
+			for (var i = 0; i < array.length; i++) {
+				var target = array[i];
+				if (filtered.indexOf(target) > -1) {
+					target.$filtered = true;
+				} else {
+					target.$filtered = false;
+				}
+			}
+			return array;
+		}
+	}
+
+	function pageGroupFilter() {
+		return function (groups, pagingConfig) {
+			var newGroups = {};
+			var skip = (pagingConfig.currentPage - 1) * pagingConfig.maxPerPage;
+			var take = pagingConfig.maxPerPage;
+
+			if (angular.isArray(groups)) {
+				newGroups.undefined = groups.slice(skip, skip + take);
+			} else {
+				var groupNames = [];
+				for (var key in groups) {
+					if (groups.hasOwnProperty(key) && key[0] != '$') {
+						groupNames.push(key);
+					}
+				}
+				groupNames.sort();
+
+				angular.forEach(groupNames, function (title) {
+					var values = groups[title];
+					if (take <= 0) {
+						return;
+					} else if (skip > values.length) {
+						skip -= values.length;
+						return;
+					} else if (skip > 0) {
+						values.splice(0, skip);
+						skip = 0;
+					}
+
+					if (take >= values.length) {
+						newGroups[title] = values;
+						take -= values.length;
+					} else {
+						newGroups[title] = values.slice(0, take);
+						take = 0;
+					}
+				});
+			}
+			return newGroups;
+		};
+	}
+
+	function pagingFilter() {
+		return function (array, pagingConfig) {
+			if (array.length > pagingConfig.minimum) {
+
+			} else {
+				return array;
+			}
+		}
+	}
+
+	function publishFilter() {
+		return function (array, target) {
+			if (angular.isArray(target)) {
+				target.length = 0;
+				[].push.apply(target, array);
+			}
+			return array;
+		}
+	}
+})(angular);
\ No newline at end of file
diff --git a/filters/utility.filter.js b/filters/utility.filter.js
new file mode 100644
index 0000000..649ec75
--- /dev/null
+++ b/filters/utility.filter.js
@@ -0,0 +1,110 @@
+(function(angular){
+    var module = angular.module('framework.filters.utility',[]);
+
+    module.filter('RemoveSpaces', removeSpaces);
+    module.filter('Truncate', truncate);
+    module.filter('AbbrValue', abbrValue);
+    module.filter('Countdown', countdown);
+
+
+    function removeSpaces() {
+        return function (text) {
+            return text.replace(/\s/g, '');
+        }
+    }
+
+    function truncate () {
+        return function (text, length, end) {
+            if (isNaN(length))
+                length = 10;
+            if (end === undefined)
+                end = "...";
+            if (text.length <= length || text.length - end.length <= length)
+            { return text; }
+            else
+            { return String(text).substring(0, length - end.length) + end; }
+        }
+    }
+
+    function abbrValue() {
+        return function (val) {
+
+        return Math.abs(Number(val)) >= 1.0e+9
+
+           ? Math.round(Math.abs((Number(val)) / 1.0e+9)*10)/10 + "b"
+           // Six Zeroes for Millions 
+           : Math.abs(Number(val)) >= 1.0e+6
+
+           ? Math.round(Math.abs((Number(val)) / 1.0e+6)*10)/10 + "m"
+           // Three Zeroes for Thousands
+           : Math.abs(Number(val)) >= 1.0e+3
+
+           ? Math.round(Math.abs((Number(val)) / 1.0e+3)*10)/10 + "k"
+
+           : Math.abs(Number(val));
+        }
+    }
+
+    function countdown() {
+        return function (input) {
+            var substitute = function (stringOrFunction, number, strings) {
+                var string = $.isFunction(stringOrFunction) ? stringOrFunction(number, dateDifference) : stringOrFunction;
+                var value = (strings.numbers && strings.numbers[number]) || number;
+                return string.replace(/%d/i, value);
+            },
+                nowTime = (new Date()).getTime(),
+                date = (new Date(input)).getTime(),
+                allowFuture = true,
+                strings = {
+                    prefixAgo: null,
+                    prefixFromNow: null,
+                    suffixAgo: "ago",
+                    suffixFromNow: "",//"from now"
+                    seconds: "less than a minute",
+                    minute: "a minute",
+                    minutes: "%d minutes",
+                    hour: "an hour",
+                    hours: "%d hours",
+                    day: "a day",
+                    days: "%d days",
+                    month: "a month",
+                    months: "%d months",
+                    year: "a year",
+                    years: "%d years"
+                },
+                dateDifference = nowTime - date,
+                words,
+                seconds = Math.abs(dateDifference) / 1000,
+                minutes = seconds / 60,
+                hours = minutes / 60,
+                days = hours / 24,
+                years = days / 365,
+                separator = strings.wordSeparator === undefined ? " " : strings.wordSeparator,
+                prefix = strings.prefixAgo,
+                suffix = strings.suffixAgo;
+
+            if (allowFuture) {
+                if (dateDifference < 0) {
+                    prefix = strings.prefixFromNow;
+                    suffix = strings.suffixFromNow;
+                }
+            }
+
+            words = seconds < 45 && substitute(strings.seconds, Math.round(seconds), strings) ||
+            seconds < 90 && substitute(strings.minute, 1, strings) ||
+            minutes < 45 && substitute(strings.minutes, Math.round(minutes), strings) ||
+            minutes < 90 && substitute(strings.hour, 1, strings) ||
+            hours < 24 && substitute(strings.hours, Math.round(hours), strings) ||
+            hours < 42 && substitute(strings.day, 1, strings) ||
+            days < 30 && substitute(strings.days, Math.round(days), strings) ||
+            days < 45 && substitute(strings.month, 1, strings) ||
+            days < 365 && substitute(strings.months, Math.round(days / 30), strings) ||
+            years < 1.5 && substitute(strings.year, 1, strings) ||
+            substitute(strings.years, Math.round(years), strings);
+
+            return $.trim([prefix, words, suffix].join(separator));
+        }
+    }
+
+
+})(angular);
\ No newline at end of file
diff --git a/layouts/breadcrumb/breadcrumb.controller.js b/layouts/breadcrumb/breadcrumb.controller.js
new file mode 100644
index 0000000..2c57daf
--- /dev/null
+++ b/layouts/breadcrumb/breadcrumb.controller.js
@@ -0,0 +1,48 @@
+(function (window, angular) {
+    var app = angular.module("framework.UI.breadcrumb", []);
+
+    app.controller('BarController', barController);
+
+    barController.$inject = ['$scope', '$state', '$modal', '$rootScope'];
+    function barController($scope, $state, $modal, $rootScope) {
+        $scope.breadcrumbs = [];
+        $scope.helpAvailable = null;
+        $scope.showHelp = showHelp;
+
+        function showHelp() {
+            if ($scope.helpAvailable)
+                $modal.open({
+                    templateUrl: $scope.helpAvailable,
+                });
+        }
+
+        $rootScope.$on('$stateChangeSuccess', function (event, toState, toParams, fromState, fromParams) {
+            _parseStateName(toState.name);
+            $scope.helpAvailable = toState.hasHelp;
+        });
+
+        $scope.helpAvailable = $state.current.hasHelp;
+        _parseStateName($state.current.name);
+
+        function _parseStateName(stateName) {
+            var parts = stateName.split('.');
+            var breadcrumbs = [];
+            for (var i = 0; i < parts.length; i++) {
+                var p = parts[i];
+                if (p === "root")
+                    continue;
+                var full = parts.slice(0, i + 1).join('.');
+                breadcrumbs.push({
+                    name: parts[i],
+                    $html: _generateBreadcrumbHtml(p, full)
+                });
+            }
+            $scope.breadcrumbs = breadcrumbs;
+        }
+
+        function _generateBreadcrumbHtml(name, state) {
+            var template = '<a ui-sref="' + state + '" >' + name + '</a>';
+            return template;
+        }
+    };
+})(window, angular);
\ No newline at end of file
diff --git a/layouts/breadcrumb/breadcrumb.partial.html b/layouts/breadcrumb/breadcrumb.partial.html
new file mode 100644
index 0000000..9a60a4d
--- /dev/null
+++ b/layouts/breadcrumb/breadcrumb.partial.html
@@ -0,0 +1,8 @@
+<div ng-controller="BarController">
+    <ol class="breadcrumb">
+        <li ng-repeat="item in breadcrumbs" ui-sref-active="active" bind-html-compile="item.$html"></li>
+    </ol>
+    <span class="module-help" ng-if="helpAvailable">
+    	<a href="" ng-click="showHelp()"><i class="icon-Assistant"></i>Help</a>
+    </span>
+</div>
diff --git a/layouts/documentsview/documents-view.controller.js b/layouts/documentsview/documents-view.controller.js
new file mode 100644
index 0000000..6ef8e67
--- /dev/null
+++ b/layouts/documentsview/documents-view.controller.js
@@ -0,0 +1,12 @@
+(function (angular) {
+    var module = angular.module('framework.documents',[]);
+
+    module.controller('DocumentsController', DocumentsController);
+
+    DocumentsController.$inject = ['$scope', 'rData', '$state'];
+    function DocumentsController($scope, rData, $state) {
+        $scope.documents = rData;
+        $scope.selectedDocument=rData[0];
+    }
+
+})(angular);
\ No newline at end of file
diff --git a/layouts/documentsview/documents-view.partial.html b/layouts/documentsview/documents-view.partial.html
new file mode 100644
index 0000000..b74c3da
--- /dev/null
+++ b/layouts/documentsview/documents-view.partial.html
@@ -0,0 +1,36 @@
+<div class="document-options">
+	<a href="" class="btn btn-xs btn-primary"><i class="icon-Add-File"></i> Add New</a>
+</div>
+<div class="row">
+	<div class="col-md-4">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h3 class="panel-title">Documents</h3>
+			</div>
+			<div class="panel-body">
+				<div ng-repeat="doc in documents">
+					<div class="document" ng-click="$parent.selectedDocument=doc" ng-class="(selectedDocument==doc)?'active':''">
+						<small class="pull-right grey">{{doc.ExpiryDate | countdown}}</small>
+						<strong>{{doc.Name}}</strong><br />
+						{{doc.IdentificationNo}}
+						<small class="pull-right grey mt5"><i class="icon-Pencil"></i></small>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div class="col-md-8">
+		<div class="panel panel-default">
+			<div class="panel-heading">
+				<h3 class="panel-title">Viewer</h3>
+			</div>
+			<div class="panel-body document-viewer">
+				<div class="document-viewer-options">
+					<a href="" class="btn-icon"><i class="icon-Download"></i>Save</a>
+					<a href="" class="btn-icon"><i class="icon-Close-Window"></i>Delete</a>
+				</div>
+				<img src="{{selectedDocument.DocumentURL}}" width="500px" />
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/layouts/module/module-base.layout.html b/layouts/module/module-base.layout.html
new file mode 100644
index 0000000..bbf6a5f
--- /dev/null
+++ b/layouts/module/module-base.layout.html
@@ -0,0 +1,11 @@
+<div class="module">
+	<div ui-view name="options-area"></div>
+	<div class="row">
+		<div class="col-md-12 col-lg-9 module-primary">
+			<div ui-view name="view-area"></div>
+		</div>
+		<div class="visible-lg col-lg-3 module-secondary">
+			<div ui-view name="stats-area"></div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/layouts/module/module-cards.controller.js b/layouts/module/module-cards.controller.js
new file mode 100644
index 0000000..530beea
--- /dev/null
+++ b/layouts/module/module-cards.controller.js
@@ -0,0 +1,37 @@
+(function (angular) {
+    var module = angular.module('framework.UI.module',[]);
+
+    module.controller('ModuleCardsController', moduleCardsController);
+
+    moduleCardsController.$inject = ['$scope', 'rData', 'rNavTo','rAccessors', '$state', '$interval', '$timeout'];
+    function moduleCardsController($scope, rData, rNavTo, rAccessors, $state, $interval, $timeout) {
+        $scope.rawItems = rData;
+        $scope.accessors = rAccessors;
+        $scope.rNavTo = rNavTo;
+        $scope.showScore = false;
+        $scope.chosenGroup = null;
+        $scope.cardLimit = 2;
+
+        $scope.groups = {};
+        rData = rData.sort(function(a,b){
+        	var valA = rAccessors.Title(a), valB = rAccessors.Title(b);
+        	if(valA < valB) {
+        		return -1;
+        	} else if (valA > valB){
+        		return 1;
+        	} else
+        		return 0;
+        });
+        
+        var i;
+
+        for(i = 0; i < rData.length; i++) {
+            var title = rAccessors.Group(rData[i]);
+            if($scope.groups[title])
+                $scope.groups[title].push(rData[i]);
+            else 
+                $scope.groups[title] = [rData[i]];
+        }
+    }
+
+})(angular);
\ No newline at end of file
diff --git a/layouts/module/module-cards.partial.html b/layouts/module/module-cards.partial.html
new file mode 100644
index 0000000..d8d0286
--- /dev/null
+++ b/layouts/module/module-cards.partial.html
@@ -0,0 +1,26 @@
+<div class="cards-wrapper">
+	<div class="cards-view-options">
+		<div class="row">
+			<div class="col-sm-8 col-xs-8">
+				 <div class="group-filters">
+				<a class="group-options" ng-click="chosenGroup = null" ng-class="(chosenGroup == null)?'active':''">All</a>
+				<a class="group-options" ng-click="$parent.chosenGroup = title" ng-class="($parent.chosenGroup == title)?'active':''" ng-repeat="(title, items) in groups">{{title}}({{(items | filter:searchTerm).length }})</a>
+				</div>
+			</div>
+			<div class="col-sm-4 col-xs-4 text-right">
+				<a class="btn btn-primary btn-xs" ng-click="showScore=!showScore" ng-bind="(showScore)? 'Hide Scores':'Show Scores'" ng-class="(showScore)?'active':''">Show Scores</a>
+			</div>
+		</div>
+	</div>
+	<div ng-repeat="(title, items) in ::groups track by title" ng-if="!chosenGroup || chosenGroup==title">
+		<h3 class="section-title" ng-show="results.length > 0">{{title}}</h3>
+		
+		<card ng-repeat="item in items  | filter:searchTerm as results track by item.Id" showscore="{{showScore}}" ></card>
+
+		<br class="clearfix" ng-show="results.length > 0" />
+	</div>
+    <div ng-if="rawItems.length === 0">
+        No Items Added Yet.
+    </div>
+    <br class="clearfix" />
+</div>
\ No newline at end of file
diff --git a/layouts/module/module-item.controller.js b/layouts/module/module-item.controller.js
new file mode 100644
index 0000000..7c15440
--- /dev/null
+++ b/layouts/module/module-item.controller.js
@@ -0,0 +1,14 @@
+(function (angular) {
+    var module = angular.module('framework.UI.module');
+
+    module.controller('ModuleItemViewController', moduleItemViewController);
+
+    moduleItemViewController.$inject = ['$scope', 'rTabs', 'rData', 'rAccessors'];
+
+    function moduleItemViewController($scope, rTabs, rData, rAccessors) {
+        $scope.item = rData[0];
+        $scope.accessors = rAccessors;
+        $scope.tabDefs = rTabs;
+    }
+
+})(angular);
\ No newline at end of file
diff --git a/layouts/module/module-item.layout.html b/layouts/module/module-item.layout.html
new file mode 100644
index 0000000..c981b06
--- /dev/null
+++ b/layouts/module/module-item.layout.html
@@ -0,0 +1,21 @@
+<div class="module-item">
+	<div class="module-item-cover"></div>
+	<div class="module-item-nav-bar">
+		<card class="module-item-card" allow-click="false" show-score="false" class="single pull-left" show-title="false" show-subtitle="false"></card>
+		<div class="module-item-brief">
+			<h3>{{accessors.Title(item)}}</h3>
+			<h4>{{accessors.SubTitle(item)}}</h4>
+		</div>	
+		<tabs data="tabDefs" type="tabs" justified="false"></tabs>
+	</div>
+	<div class="module-item-options">
+		<div ui-view name="options-area"></div>
+	</div>
+	<div class="module-item-content">
+		<div class="row">
+			<div class="col-md-12">
+				<ui-view class="tab-content"></ui-view>
+			</div>
+		</div>
+	</div>
+</div>
\ No newline at end of file
diff --git a/layouts/module/module-table.controller.js b/layouts/module/module-table.controller.js
new file mode 100644
index 0000000..739ccb6
--- /dev/null
+++ b/layouts/module/module-table.controller.js
@@ -0,0 +1,22 @@
+(function (angular) {
+    var module = angular.module('framework.UI.module');
+
+    module.controller('ModuleTableController', moduleCardsController);
+
+    moduleCardsController.$inject = ['$scope', 'rData', 'rNavTo', 'rSchema', '$state', '$q'];
+    function moduleCardsController($scope, rData, rNavTo, rSchema, $state, $q) {
+    	$scope.items = rData;
+    	
+    	function n() {
+    		console.log(arguments);
+    		return $q.when(rData);
+    	};
+
+        $scope.viewItem = viewItem;
+        $scope.Schema = rSchema;
+        function viewItem(item) {
+            $state.go(rNavTo, { Id: 11 });
+        }
+    }
+
+})(angular);
\ No newline at end of file
diff --git a/layouts/module/module-table.partial.html b/layouts/module/module-table.partial.html
new file mode 100644
index 0000000..01c7136
--- /dev/null
+++ b/layouts/module/module-table.partial.html
@@ -0,0 +1,17 @@
+<table-for datasource="items" class="table table-condensed table-hover" schema="{{Schema}}" filtering="searchTerm" sorting="" paging="" grouping="grouping" wrapper-class="" table-class="">
+	<table-titlebar columns-options="true" paging="true"></table-titlebar>
+    <table-heading sorting="true">
+        <!--<table-cell column=""></table-cell>--> <!-- for overriding -->
+    </table-heading>
+    <table-data-rows>
+        <table-selection></table-selection>
+        <!--<table-cell column=""></table-cell>--> <!-- for overriding -->
+        <!--<table-expand-template></table-expand-template>--> <!-- for expanding -->
+        <table-actions>
+            <a class="btn btn-xs btn-primary" ng-click="viewItem(item)"><i class="icon-D-Eyeglasses2"></i>View</a>
+        </table-actions>
+    </table-data-rows>
+    <table-footer paging="true">
+    
+    </table-footer>
+</table-for>
\ No newline at end of file
diff --git a/layouts/structure/page.controller.js b/layouts/structure/page.controller.js
new file mode 100644
index 0000000..2f8627a
--- /dev/null
+++ b/layouts/structure/page.controller.js
@@ -0,0 +1,12 @@
+(function (window, angular) {
+    var app = angular.module("framework.UI.structure", []);
+
+    app.controller('PageController', pageController);
+
+    pageController.$inject = ['$scope', '$interval'];
+    
+    function pageController($scope, $interval) {
+        setupUIElements();
+    };
+
+})(window, angular);
\ No newline at end of file
diff --git a/layouts/structure/page.layout.html b/layouts/structure/page.layout.html
new file mode 100644
index 0000000..fc095d5
--- /dev/null
+++ b/layouts/structure/page.layout.html
@@ -0,0 +1,16 @@
+<div id="application-layout" ng-controller="PageController">
+    <div id="sidebar-left" ui-view name="sidebar-left"></div>
+    <div id="topbar" ui-view name="topbar"></div>
+    <div id="content-wrapper">
+        <div id="breadcrumb-bar" ng-include="'/common_components/layouts/breadcrumb/breadcrumb.partial.html'">
+            
+        </div>
+        <div ui-view name="content-wrapper">
+            
+        </div>
+    </div>
+    <div id="sidebar-toggle">
+        <i class="icon-Align-JustifyAll"></i>
+	</div>
+    <div id="sidebar-right" ui-view name="sidebar-right"></div>
+</div>
\ No newline at end of file
diff --git a/layouts/table-page/table-page.layout.html b/layouts/table-page/table-page.layout.html
new file mode 100644
index 0000000..489f478
--- /dev/null
+++ b/layouts/table-page/table-page.layout.html
@@ -0,0 +1,12 @@
+<div class="container-fluid tablepage-layout">
+    <div class="row">
+        <div class="col-md-12">
+            <div ui-view name="table-options"></div>
+        </div>
+    </div>
+    <div class="row">
+        <div class="col-md-12">
+            <div ui-view name="table-content"></div>
+        </div>
+    </div>
+</div>
diff --git a/services/ConsoleLoggingProvider.service.js b/services/ConsoleLoggingProvider.service.js
new file mode 100644
index 0000000..e44b1ee
--- /dev/null
+++ b/services/ConsoleLoggingProvider.service.js
@@ -0,0 +1,67 @@
+(function () {
+    var app = angular.module('framework.services.logging');
+
+    app.service('ConsoleLoggingProvider', ['$window', consoleLoggingProvider]);
+
+    function consoleLoggingProvider($window) {
+        this.log = log;
+        this.debug = debug;
+        this.info = info;
+        this.warning = warning;
+        this.error = error;
+
+        function log(level, catagory, msg, others) {
+            switch (level) {
+                case 1:
+                    debug(catagory, msg, others);
+                    break;
+                case 2:
+                    info(catagory, msg, others);
+                    break;
+                case 3:
+                    warning(catagory, msg, others);
+                    break;
+                case 4:
+                    error(catagory, msg, exception, others);
+                    break;
+                default:
+                    debug(catagory, msg, others);
+                    break;
+            }
+        }
+
+        function debug(catagory, msg, others) {
+            var date = new Date();
+            console.debug(date.toISOString() + ' - ' + catagory.toUpperCase() + ' - ' + msg);
+            angular.forEach(others, function (val, ind) {
+                console.debug('additional info ' + ind + ': ', val);
+            });
+        }
+
+        function info(catagory, msg, others) {
+            var date = new Date();
+            console.info(date.toISOString() + ' - ' + catagory.toUpperCase() + ' - ' + msg);
+            angular.forEach(others, function (val, ind) {
+                console.info('additional info ' + ind + ': ', val);
+            });
+        }
+
+        function warning(catagory, msg, others) {
+            var date = new Date();
+            console.warn(date.toISOString() + ' - ' + catagory.toUpperCase() + ' - ' + msg);
+            angular.forEach(others, function (val, ind) {
+                console.warn('additional info ' + ind + ': ', val);
+            });
+        }
+
+        function error(catagory, msg, exception, others) {
+            var date = new Date();
+            console.error(date.toISOString() + ' - ' + catagory.toUpperCase() + ' - ' + msg);
+            console.error('original exception: ' + exception);
+            angular.forEach(others, function (val, ind) {
+                console.error('additional info ' + ind + ': ', val);
+            });
+        }
+    }
+    
+})();
\ No newline at end of file
diff --git a/services/Logger.service.js b/services/Logger.service.js
new file mode 100644
index 0000000..b24f748
--- /dev/null
+++ b/services/Logger.service.js
@@ -0,0 +1,139 @@
+(function (window, angular) {
+    var app = angular.module("framework.services.logging", []);
+
+    app.provider('Logger', function () {
+        var providers = [];
+        var hiddenCatagorys = [];
+        var loggingLevel = 1;
+
+        this.DEBUG = 1;
+        this.INFO = 2;
+        this.WARNING = 3;
+        this.ERROR = 4;
+
+        this.setGlobalLoggingLevel = setGlobalLoggingLevel;
+        this.addProvider = addProvider;
+        this.hideCatagory = hideCatagory;
+
+        function setGlobalLoggingLevel(level) {
+            loggingLevel = level;
+        }
+
+        function addProvider(provider) {
+            providers.push(provider);
+        }
+
+        function hideCatagory(catagory) {
+            hiddenCatagorys.push(catagory);
+        }
+
+        this.$get = buildLoggerService;
+
+        buildLoggerService.$inject = ['$injector'];
+        function buildLoggerService($injector) {
+            var instance = createLogger('Default');
+            this.createLogger = createLogger;
+            this.log = instance.log;
+            this.debug = instance.debug;
+            this.info = instance.info;
+            this.warning = instance.warning;
+            this.error = instance.error;
+            this.DEBUG = 1;
+            this.INFO = 2;
+            this.WARNING = 3;
+            this.ERROR = 4;
+            var concreteProviders = [];
+            angular.forEach(providers, function (value) {
+                if (angular.isObject(value)) {
+                    concreteProviders.push(value);
+                } else if (angular.isFunction(value)) {
+                    var pro = {
+                        log: value,
+                        debug: log.bind(null, 1),
+                        info: log.bind(null, 2),
+                        warning: log.bind(null, 3),
+                        error: log.bind(null, 4)
+                    };
+                    concreteProviders.push(pro);
+                } else if (angular.isArray(value)) {
+                    var pro = $injector.invoke(value, null, {
+                        Levels: {
+                            DEBUG: 1,
+                            INFO: 2,
+                            WARNING: 3,
+                            ERROR: 4
+                        }
+                    });
+                    concreteProviders.push(pro);
+                } else if (typeof value === 'string') {
+                    var pro = $injector.get(value);
+                    concreteProviders.push(pro);
+                }
+            });
+
+            function createLogger(catagory) {
+                return new Logger(catagory, concreteProviders, loggingLevel, hiddenCatagorys);
+            }
+
+            return this;
+        }
+    });
+
+    function Logger(catagory, providers, loggingLevel, hiddenCatagorys) {
+        this.log = log;
+        this.debug = debug;
+        this.info = info;
+        this.warning = warning;
+        this.error = error;
+
+        function log(level, msg) {
+            if (level < loggingLevel || hiddenCatagorys.indexOf(catagory) != -1)
+                return;
+            
+            var args = Array.prototype.slice.call(arguments, 2);
+            angular.forEach(providers, function (provider) {
+                provider.log(level, catagory, msg, args);
+            });
+        }
+
+        function debug(msg) {
+            if (1 < loggingLevel || hiddenCatagorys.indexOf(catagory) != -1)
+                return;
+
+            var args = Array.prototype.slice.call(arguments, 1);
+            angular.forEach(providers, function (provider) {
+                provider.debug(catagory, msg, args);
+            });
+        }
+
+        function info(msg) {
+            if (2 < loggingLevel || hiddenCatagorys.indexOf(catagory) != -1)
+                return;
+
+            var args = Array.prototype.slice.call(arguments, 1);
+            angular.forEach(providers, function (provider) {
+                provider.info(catagory, msg, args);
+            });
+        }
+
+        function warning(msg) {
+            if (3 < loggingLevel || hiddenCatagorys.indexOf(catagory) != -1)
+                return;
+
+            var args = Array.prototype.slice.call(arguments, 1);
+            angular.forEach(providers, function (provider) {
+                provider.warning(catagory, msg, args);
+            });
+        }
+
+        function error(msg, exception) {
+            if (4 < loggingLevel || hiddenCatagorys.indexOf(catagory) != -1)
+                return;
+
+            var args = Array.prototype.slice.call(arguments, 2);
+            angular.forEach(providers, function (provider) {
+                provider.error(catagory, msg, exception, args);
+            });
+        }
+    }
+})(window, angular);
\ No newline at end of file
diff --git a/services/Menu.service.js b/services/Menu.service.js
new file mode 100644
index 0000000..d9a52d0
--- /dev/null
+++ b/services/Menu.service.js
@@ -0,0 +1,45 @@
+(function (window, angular) {
+    var app = angular.module("framework.services.menu", []);
+
+    app.provider('MenuService', MenuServiceProvider);
+
+    function MenuServiceProvider() {
+        var menuItems = [];
+        var defaultIcon = 'icon-Align-JustifyAll';
+        var provider = {
+            registerMenuItem: registerMenuItem,
+            setDefaultIcon: setDefaultIcon,
+            $get: getService
+        };
+
+        return provider;
+
+        function registerMenuItem(menuItem) {
+            menuItems.push(menuItem);
+        }
+
+        function setDefaultIcon(icon) {
+            defaultIcon = icon;
+        }
+
+        function getService() {
+            angular.forEach(menuItems, function (mi) {
+                mi.$html = _buildTemplate(mi);
+            });
+            var service = {
+                menuItems: menuItems,
+                defaultIcon: defaultIcon
+            };
+            return service;
+        }
+
+        function _buildTemplate(menuItem) {
+            var template = '<a ui-sref="' + menuItem.state + '" style="color:white;">' +
+                '<i class="{{item.icon ? item.icon : menu.defaultIcon}}"></i>' +
+                '{{item.title}}' +
+            '</a>';
+            return template;
+        }
+
+    };
+})(window, angular);
\ No newline at end of file
diff --git a/services/Model.service.js b/services/Model.service.js
new file mode 100644
index 0000000..8ff2ddd
--- /dev/null
+++ b/services/Model.service.js
@@ -0,0 +1,300 @@
+(function (window, angular) {
+    var module = angular.module('framework.services.model', []);
+
+    module.provider('Model', modelsProvider);
+    //module.service('DataContext', dataService);
+
+    function modelsProvider() {
+        var schemas = {
+
+        };
+
+        this.registerSchema = registerSchema;
+        this.$get = buildService;
+
+        function registerSchema(name, path, schema) {
+            schemas[name] = [path, schema];
+            return this;
+        }
+
+        buildService.$inject = ['$config', '$http', '$q'];
+        function buildService($config, $http, $q) {
+            var models = {};
+
+            angular.forEach(schemas, function (value, key) {
+                var modelName = key;
+                var modelPath = value[0];
+                var modelSchema = value[1];
+
+                models[modelName] = BuildConstructor(modelPath, modelSchema);
+            });
+
+            return models;
+
+            function Entity(apiEndpoint, schema, values) {
+                this.$$apiLocation = apiEndpoint;
+                this.$$schema = schema;
+                this.$$originalValues = {};
+                this.$$changedValues = {};
+                this.$$foreignModels = {};
+
+                this.$getChanges = getChanges;
+                this.$validate = validateEntity;
+                this.$save = saveEntity;
+                this.$update = updateEntity;
+                this.$patch = patchEntity;
+                this.$delete = deleteEntity;
+                this.$commit = commitEntity;
+                this.$rollback = rollbackEntity;
+
+                angular.forEach(schema, function (value, key) {
+                    var fieldName = key,
+                        fieldDef = value;
+
+                    if (values[fieldName] !== undefined) {
+                        if (typeof fieldDef.type === 'string' && values[fieldName] !== null) {
+                            this.$$originalValues[fieldName] = new models[fieldDef.type](values[fieldName]);
+                            this.$$foreignModels[fieldName] = fieldDef.type;
+                        } else {
+                            this.$$originalValues[fieldName] = values[fieldName];
+                        }
+                    } else {
+                        this.$$originalValues[fieldName] = fieldDef.defaultValue;
+                    }
+
+                    Object.defineProperty(this, fieldName, {
+                        configurable: false,
+                        enumerable: true,
+                        get: fieldDef.calculated || function () {
+                            return this.$$changedValues.hasOwnProperty(fieldName) ?
+                                this.$$changedValues[fieldName] : this.$$originalValues[fieldName];
+                        },
+                        set: function (value) {
+                            if (angular.isUndefined(fieldDef.editable) || fieldDef.editable) {
+
+                                this.$$changedValues[fieldName] = value; //CHECK: Cast to correct type??
+                            }
+                        }
+                    });
+                }, this);
+
+                function getChanges() {
+                    return this.$$changedValues;
+                }
+                function validateEntity() {
+                } //TODO
+                function saveEntity() {
+                    return $http.post($config.API_ENDPOINT + this.$$apiLocation, this);
+                }
+                function updateEntity() {
+                    var config = {
+                        params: {
+                            id: this.Id
+                        }
+                    };
+                    return $http.put($config.API_ENDPOINT + this.$$apiLocation, this, config);
+                }
+                function patchEntity(skipSubObjects) {
+                    var self = this;
+                    var delta = angular.extend({ Id: this.Id }, this.$getChanges());
+                    var config = {
+                        params: {
+                            id: this.Id
+                        }
+                    };
+                    var request = $http.patch($config.API_ENDPOINT + this.$$apiLocation, delta, config);
+                    request.success(function () {
+                        self.$commit(true);
+                    });
+                    return request;
+                }
+                function deleteEntity() {
+                    var config = {
+                        params: {
+                            id: this.Id
+                        }
+                    };
+                    return $http.delete($config.API_ENDPOINT + this.$$apiLocation, config);
+                }
+                function commitEntity(skipSubObjects) {
+                    angular.forEach(this.$$changedValues, function (value, key) {
+                        var fieldName = key,
+                            fieldValue = value;
+                        this.$$originalValues[fieldName] = fieldValue
+                    }, this);
+                    this.$$changedValues = {};
+
+                    if (skipSubObjects) return;
+                    angular.forEach(this.$$foreignModels, function (value, key) {
+                        this[key].$commit();
+                    }, this);
+                }
+                function rollbackEntity(skipSubObjects) {
+                    this.$$changedValues = {};
+
+                    if (skipSubObjects) return;
+                    angular.forEach(this.$$foreignModels, function (value, key) {
+                        this[key].$rollback();
+                    }, this);
+                }
+            }
+
+            function Query(apiEndpoint, ctor) {
+                var includes = [];
+                var selects = [];
+                var filters = [];
+                var order = [];
+                var modelCtor = ctor;
+                this.include = include;
+                this.select = select;
+                this.filter = filter;
+                this.where = filter;
+                this.parseAs = parseAs;
+                this.execute = execute;
+                this.orderBy = orderBy;
+
+                function parseAs(parser) {
+                    modelCtor = parser;
+                }
+
+                function include() {
+                    if (arguments.length === 2) {
+                        if (angular.isObject(arguments[1])) {
+                            //TODO: Process subquery
+                        } else if (angular.isFunction(arguments[1])) {
+                            //TODO: Process subquery
+                        }
+                    } else {
+                        [].push.apply(includes, arguments);
+                    }
+                    return this;
+                }
+
+                function orderBy(prop) {
+                	this.order.push(prop);
+					//todo add dir and aliases
+                }
+
+                function select() {
+                    [].push.apply(selects, arguments);
+                    modelCtor = null;
+                    return this;
+                }
+
+                function filter(key, op, value) {
+                    if (arguments.length === 1) {
+                        filters.push(key);
+                    } else if (arguments.length === 3) {
+                        switch (op) {
+                            case '&&':
+                                op = 'and';
+                                break;
+                            case '||':
+                                op = 'or';
+                                break;
+                            case '=':
+                            case '==':
+                            case '===':
+                                op = 'eq';
+                                break;
+                            case '!=':
+                            case '!==':
+                            case '!===':
+                                op = 'ne';
+                                break;
+                            case '>':
+                                op = 'gt';
+                                break;
+                            case '>=':
+                                op = 'ge';
+                                break;
+                            case '<':
+                                op = 'lt';
+                                break;
+                            case '<=':
+                                op = 'le';
+                                break;
+                            default:
+                                break;
+                        }
+                        filters.push(key + ' ' + op + ' ' + value);
+                    }
+                    return this;
+                }
+
+                function execute() {
+                    var config = {};
+                    config.params = _buildParams();
+                    apiCall = $config.API_ENDPOINT + apiEndpoint;
+                    return $http.get(apiCall, config).then(function (response) {
+                        if (!modelCtor) {
+                            return response.data;
+                        } else {
+                            if (angular.isArray(response.data)) {
+                                var results = [];
+                                angular.forEach(response.data, function (d) {
+                                    results.push(new modelCtor(d));
+                                });
+                                return results;
+                            } else {
+                                return new modelCtor(response.data);
+                            }
+                        }
+                    });
+                }
+                
+                function _buildParams() {
+                    var params = {};
+                    if (includes.length) {
+                        params.$expand = includes.join(',');
+                    }
+                    if (filters.length) {
+                        params.$filter = filters.join(' and ');
+                    }
+                    if (selects.length) {
+                        params.$select = selects.join(',');
+                    }
+                    return params;
+                }
+            }
+
+            function ModelCache() {
+
+            }
+
+            function BuildConstructor(apiEndpoint, schema) {
+                function ModelCtor(values) {
+                    var values = values || {};
+
+                    this.base = Entity;
+                    this.base(apiEndpoint, schema, values);
+                }
+
+                ModelCtor.prototype = new Entity;
+                ModelCtor.$schema = schema;
+                ModelCtor.query = query;
+                ModelCtor.getById = getById;
+
+                var passon = ModelCtor;
+
+                function query() {
+                    return new Query(apiEndpoint, passon);
+                }
+
+                function getById(id) {
+                    return new Query(apiEndpoint)
+                        .filter('Id', 'eq', id);
+                }
+
+                return ModelCtor;
+            }
+        }
+    }
+
+    dataService.$inject = ['$config', '$http', '$q', 'Models'];
+    function dataService($config, $http, $q, Models) {
+        var entityIdMaps = {};
+        var entityArrays = {};
+
+    }
+})(window, angular);
\ No newline at end of file
diff --git a/services/Storage.service.js b/services/Storage.service.js
new file mode 100644
index 0000000..70c9580
--- /dev/null
+++ b/services/Storage.service.js
@@ -0,0 +1,73 @@
+(function () {
+    var module = angular.module('framework.services.storage', [])
+
+    module.factory('$localStorage', _storageFactory('localStorage'));
+    module.factory('$sessionStorage', _storageFactory('sessionStorage'));
+
+    function _storageFactory(storageType) {
+        return ['$rootScope', '$window', '$log',
+            function ($rootScope, $window, $log) {
+                // #9: Assign a placeholder object if Web Storage is unavailable to prevent breaking the entire AngularJS app
+                var webStorage = $window[storageType] || ($log.warn('This browser does not support Web Storage!'), {}),
+                    $storage = {
+                        $default: function (items) {
+                            for (var k in items) {
+                                angular.isDefined($storage[k]) || ($storage[k] = items[k]);
+                            }
+
+                            return $storage;
+                        },
+                        $reset: function (items) {
+                            for (var k in $storage) {
+                                '$' === k[0] || delete $storage[k];
+                            }
+
+                            return $storage.$default(items);
+                        }
+                    },
+                    _last$storage,
+                    _debounce;
+
+                for (var i = 0, k; i < webStorage.length; i++) {
+                    // #8, #10: `webStorage.key(i)` may be an empty string (or throw an exception in IE9 if `webStorage` is empty)
+                    (k = webStorage.key(i)) && 'ngStorage-' === k.slice(0, 10) && ($storage[k.slice(10)] = angular.fromJson(webStorage.getItem(k)));
+                }
+
+                _last$storage = angular.copy($storage);
+
+                $rootScope.$watch(function () {
+                    _debounce || (_debounce = setTimeout(function () {
+                        _debounce = null;
+
+                        if (!angular.equals($storage, _last$storage)) {
+                            angular.forEach($storage, function (v, k) {
+                                angular.isDefined(v) && '$' !== k[0] && webStorage.setItem('ngStorage-' + k, angular.toJson(v));
+
+                                delete _last$storage[k];
+                            });
+
+                            for (var k in _last$storage) {
+                                webStorage.removeItem('ngStorage-' + k);
+                            }
+
+                            _last$storage = angular.copy($storage);
+                        }
+                    }, 100));
+                });
+
+                // #6: Use `$window.addEventListener` instead of `angular.element` to avoid the jQuery-specific `event.originalEvent`
+                'localStorage' === storageType && $window.addEventListener && $window.addEventListener('storage', function (event) {
+                    if ('ngStorage-' === event.key.slice(0, 10)) {
+                        event.newValue ? $storage[event.key.slice(10)] = angular.fromJson(event.newValue) : delete $storage[event.key.slice(10)];
+
+                        _last$storage = angular.copy($storage);
+
+                        $rootScope.$apply();
+                    }
+                });
+
+                return $storage;
+            }
+        ];
+    }
+})()
\ No newline at end of file
diff --git a/tables/Table.controller.js b/tables/Table.controller.js
new file mode 100644
index 0000000..51cdb6e
--- /dev/null
+++ b/tables/Table.controller.js
@@ -0,0 +1,157 @@
+(function (angular) {
+    var module = angular.module('framework.table', []);
+
+    var table_defaults = {
+        table: 'table table-bordered'
+    };
+
+    /*
+     *  Defines Table defaults and settings
+     */
+    module.constant("$table_config", table_defaults);
+
+    /*
+     *  Injectable Base Class for Inhertence
+     *  Functions:
+     *      Lays out rows / columns
+     *      Sets heading title
+     *      Parses cell values
+     *      Column Sizing
+     */
+    module.service('BasicTableControllerBase', function () {
+        return BasicTableControllerBase;
+    });
+
+    /*
+     *  Injectable Base Class for Inhertence
+     *  Functions:
+     *      As Basic Table Plus:
+     *      Sortable Columns
+     */
+    module.service('SortableTableControllerBase', function () {
+        return SortableTableControllerBase;
+    });
+
+    /*
+     *  Default Implementations
+     */
+    module.controller('BasicTableController', basicTableController);
+    module.controller('SortableTableController', sortableTableController);
+
+    //#region BaseClasses
+
+    function BasicTableControllerBase($scope, columns, data) {
+        var $injector = angular.element('*[ng-app]').injector();
+        var $parse = $injector.get('$parse');
+
+        $scope.rows = data.data;
+        $scope.columns = columns;
+        $scope.getValue = getValue;
+
+        var _totalWidths = columns.reduce(function (prev, current) {
+            return prev += (current.width || '*').length;
+        }, 0);
+
+        angular.forEach(columns, function (value) {
+            value.$$parser = angular.isFunction(value.mapping) ? value.mapping : $parse(value.mapping || value.name);
+            value.$$width = 100.00 / _totalWidths * (value.width || '*').length + '%';
+        });
+
+        function getValue(row, col) {
+            return col.$$parser(row);
+        }
+    }
+
+    function SortableTableControllerBase($scope, columns, data) {
+        this.base = BasicTableControllerBase;
+        this.base($scope, columns, data);
+
+        $scope.currentSort = {
+            value: '',
+            column: null,
+            reverse: false
+        };
+        $scope.currentSearch = searchFunction;
+        $scope.sortBy = sort;
+        $scope.searchTerm = null;
+
+        function sort(column, $event) {
+            var newSort = {
+                value: '',
+                column: null
+            };
+
+            if (angular.isObject(column)) {
+                newSort.column = column;
+                newSort.value = column.$$parser;
+            } else if (typeof column === "string") {
+                angular.forEach($scope.columns, function (colDef) {
+                    if ((colDef.mapping || colDef.name) === column) {
+                        newSort.column = colDef;
+                    }
+                });
+                newSort.value = column;
+            } else if (angular.isFunction(column)) {
+                newSort.value = column;
+                newSort.column = null;
+            }
+
+            if ($scope.currentSort.value === newSort.value) {
+                $scope.currentSort.reverse = !$scope.currentSort.reverse;
+            } else {
+                $scope.currentSort.reverse = false;
+            }
+
+            $scope.currentSort.value = newSort.value;
+            $scope.currentSort.column = newSort.column;
+        };
+
+        function searchFunction(row) {
+            if (!$scope.searchTerm) {
+                return true;
+            }
+            var found = false;
+            for (var i = 0; i < columns.length; i++) {
+                var column = $scope.columns[i];
+                if (angular.isUndefined(column.searchable) || column.searchable) {
+                    var value = column.$$parser(row);
+                    if (angular.isFunction(column.comparator)) {
+                        found = column.comparator(value, $scope.searchTerm);
+                    } else if (typeof value === 'string') {
+                        found = value.toLowerCase().indexOf($scope.searchTerm.toLowerCase()) >= 0;
+                    }
+                }
+                if (found) {
+                    break;
+                }
+            }
+            return found;
+        };
+    }
+    SortableTableControllerBase.prototype = BasicTableControllerBase;
+
+    //#endregion
+
+    //#region Default Implementations
+
+    basicTableController.$inject = ['$scope', 'classes', 'columns', 'data'];
+    function basicTableController($scope, classes, columns, data) {
+        this.base = BasicTableControllerBase;
+        this.base($scope, columns, data);
+
+        $scope.classes = angular.extend({}, table_defaults, classes);
+    }
+    basicTableController.prototype = BasicTableControllerBase;
+
+
+    sortableTableController.$inject = ['$scope', 'classes', 'columns', 'data'];
+    function sortableTableController($scope, classes, columns, data) {
+        this.base = SortableTableControllerBase;
+        this.base($scope, columns, data);
+
+        $scope.classes = angular.extend({}, table_defaults, classes);
+    }
+    sortableTableController.prototype = SortableTableControllerBase;
+
+    //#endregion
+})(angular);
\ No newline at end of file
diff --git a/tables/basic-table.layout.html b/tables/basic-table.layout.html
new file mode 100644
index 0000000..4877fba
--- /dev/null
+++ b/tables/basic-table.layout.html
@@ -0,0 +1,18 @@
+<div class="basic-table">
+    <table ng-class="classes.table">
+        <thead ng-class="classes.head">
+            <tr>
+                <th ng-repeat="col in columns" width="{{col.$$width}}" ng-class="col.classes.heading">
+                    {{ col.name }}
+                </th>
+            </tr>
+        </thead>
+        <tbody ng-class="classes.body">
+            <tr ng-repeat="row in rows">
+                <td ng-repeat="col in columns">
+                    {{ ::getValue(row, col) }}
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</div>
diff --git a/tables/sortable-table.layout.html b/tables/sortable-table.layout.html
new file mode 100644
index 0000000..d67ec0a
--- /dev/null
+++ b/tables/sortable-table.layout.html
@@ -0,0 +1,20 @@
+<div class="basic-table">
+    <input type="text" ng-model="searchTerm" />
+    <table ng-class="classes.table">
+        <thead>
+            <tr>
+                <th ng-repeat="col in columns" width="{{::col.$$width}}">
+                    {{ ::col.name }}
+                    <i class="fa" ng-class="currentSort.column === col ? (currentSort.reverse ? 'fa-sort-amount-desc' : 'fa-sort-amount-asc') : 'fa-sort-amount-asc text-muted' " ng-click="sortBy(col, $event)"></i>
+                </th>
+            </tr>
+        </thead>
+        <tbody>
+            <tr ng-repeat="row in rows | filter:currentSearch | orderBy:currentSort.value:currentSort.reverse">
+                <td ng-repeat="col in columns">
+                    {{ ::getValue(row, col) }}
+                </td>
+            </tr>
+        </tbody>
+    </table>
+</div>
--
libgit2 0.21.0