diff --git a/bower.json b/bower.json
index 7bb0380..7fc4eae 100644
--- a/bower.json
+++ b/bower.json
@@ -1,6 +1,6 @@
 {
     "name": "wim_angular",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "homepage": "https://github.com/jknewson/wim_angular",
     "authors": [
         "jknewson <jknewson@usgs.gov>"
diff --git a/dist/Directives/wimLegend.js b/dist/Directives/wimLegend.js
index b0d07af..c64632b 100644
--- a/dist/Directives/wimLegend.js
+++ b/dist/Directives/wimLegend.js
@@ -20,7 +20,7 @@ var WiM;
                 this.style = style;
             }
             return LegendLayerAddedEventArgs;
-        })(WiM.Event.EventArgs);
+        }(WiM.Event.EventArgs));
         Directives.LegendLayerAddedEventArgs = LegendLayerAddedEventArgs;
         var LegendLayerChangedEventArgs = (function (_super) {
             __extends(LegendLayerChangedEventArgs, _super);
@@ -31,7 +31,7 @@ var WiM;
                 this.Value = value;
             }
             return LegendLayerChangedEventArgs;
-        })(WiM.Event.EventArgs);
+        }(WiM.Event.EventArgs));
         Directives.LegendLayerChangedEventArgs = LegendLayerChangedEventArgs;
         var LegendLayerRemovedEventArgs = (function (_super) {
             __extends(LegendLayerRemovedEventArgs, _super);
@@ -41,7 +41,7 @@ var WiM;
                 this.layerType = ltype;
             }
             return LegendLayerRemovedEventArgs;
-        })(WiM.Event.EventArgs);
+        }(WiM.Event.EventArgs));
         Directives.LegendLayerRemovedEventArgs = LegendLayerRemovedEventArgs;
         var wimLegendController = (function (_super) {
             __extends(wimLegendController, _super);
@@ -66,7 +66,7 @@ var WiM;
                 if (mlyr.type != "agsDynamic")
                     return;
                 var url = mlyr.url + "/legend?f=pjson";
-                var request = new WiM.Services.Helpers.RequestInfo(url, true);
+                var request = new Services.Helpers.RequestInfo(url, true);
                 this.Execute(request).then(function (response) {
                     if (response.data.layers.length > 0) {
                         mlyr.isOpen = true;
@@ -139,7 +139,7 @@ var WiM;
             };
             wimLegendController.$inject = ['$scope', '$http', 'leafletData', 'WiM.Event.EventManager'];
             return wimLegendController;
-        })(WiM.Services.HTTPServiceBase);
+        }(Services.HTTPServiceBase));
         var wimLegend = (function () {
             function wimLegend() {
                 this.scope = {
@@ -148,7 +148,7 @@ var WiM;
                     showGroups: '=?',
                     title: '@',
                     baseTitle: '@',
-                    overlaysTitle: '@',
+                    overlaysTitle: '@'
                 };
                 this.restrict = 'E';
                 this.require = '^leaflet';
@@ -159,18 +159,18 @@ var WiM;
                     '        <button class="close-legend" ng-click="vm.layerControlExpanded = false; $event.stopPropagation();">Close Legend</button>' +
                     '        <div class="list-group">' +
                     '            <!-- baselayers -->' +
-                    '            <a ng-class="!vm.baselayers.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'" ng-click="vm.baselayers.isOpen=(vm.baselayers.isOpen) ? false : true;">' +
+                    '            <a ng-class="!vm.baselayers.isOpen  ? \' list-group-item-active wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'" ng-click="vm.baselayers.isOpen=(vm.baselayers.isOpen) ? false : true;">' +
                     '                Base Maps' +
                     '                <i ng-class="!vm.baselayers.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'"></i>' +
                     '            </a> ' +
-                    '            <div ng-hide="vm.baselayers.isOpen" class="wimLegend-list-group-body">' +
+                    '            <div ng-hide="vm.baselayers.isOpen" class="list-group-body wimLegend-list-group-body">' +
                     '                <div class="sitebar-item" ng-repeat="(key, layer) in vm.baselayers.layergroup">' +
                     '                    <input type="radio" id="baselayerRadio{{$id}}" ng-checked="$parent.vm.baselayers.selectedlayerName === key.toString()" ng-value="key.toString()" /><label for="baselayerRadio{{$id}}" ng-click="vm.changeBaseLayer(key, $event)">{{layer.name}}</label>' +
                     '                </div>' +
                     '            </div>  ' +
                     '            <!-- Application Layers -->' +
                     '            <div ng-if="vm.applicationLayer.isAvailable">' +
-                    '                <div ng-class="vm.applicationLayer.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'">' +
+                    '                <div ng-class="vm.applicationLayer.isOpen  ? \'list-group-item wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'">' +
                     '                    <label> {{vm.applicationLayer.selectedlayerName}}</label>' +
                     '                    <i ng-class="vm.applicationLayer.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'" ng-click="vm.applicationLayer.isOpen=(vm.applicationLayer.isOpen) ? false : true;"></i>' +
                     '                </div>' +
@@ -183,7 +183,7 @@ var WiM;
                     '            </div>' +
                     '            <!-- overlays --> ' +
                     '            <div ng-repeat="layer in vm.overlays.layergroup" ng-init="vm.initOverlays(layer)">' +
-                    '                <div ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-class="!layer.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'">' +
+                    '                <div ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-class="!layer.isOpen  ? \'list-group-item-active wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'">' +
                     '                    <input type="checkbox" id="checkbox{{$id}}" ng-checked="layer.visible" />' +
                     '                    <label for="checkbox{{$id}}" ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-click="layer.visible = (layer.visible) ? false : true;">' +
                     '                        {{layer.name}}' +
@@ -237,7 +237,7 @@ var WiM;
                 });
             };
             return wimLegend;
-        })();
+        }());
         angular.module('wim_angular')
             .directive('wimLegend', wimLegend.instance);
     })(Directives = WiM.Directives || (WiM.Directives = {}));
diff --git a/dist/Events/Delegate.js b/dist/Events/Delegate.js
index a6db666..93ac792 100644
--- a/dist/Events/Delegate.js
+++ b/dist/Events/Delegate.js
@@ -23,7 +23,7 @@ var WiM;
                 }
             };
             return Delegate;
-        })();
+        }());
         Event.Delegate = Delegate;
     })(Event = WiM.Event || (WiM.Event = {}));
 })(WiM || (WiM = {}));
diff --git a/dist/Events/EventHandler.js b/dist/Events/EventHandler.js
index f58bb05..e929010 100644
--- a/dist/Events/EventHandler.js
+++ b/dist/Events/EventHandler.js
@@ -10,7 +10,7 @@ var WiM;
                 this._handler(sender, e);
             };
             return EventHandler;
-        })();
+        }());
         Event.EventHandler = EventHandler;
     })(Event = WiM.Event || (WiM.Event = {}));
 })(WiM || (WiM = {}));
diff --git a/dist/Events/EventManager.js b/dist/Events/EventManager.js
index be372c7..c4ffefb 100644
--- a/dist/Events/EventManager.js
+++ b/dist/Events/EventManager.js
@@ -15,7 +15,7 @@ var WiM;
                 configurable: true
             });
             return Event;
-        })();
+        }());
         var EventManager = (function () {
             function EventManager() {
                 this._eventList = {};
@@ -43,7 +43,7 @@ var WiM;
                 this._eventList[EventName].onChanged.unsubscribe(handler);
             };
             return EventManager;
-        })();
+        }());
         factory.$inject = [];
         function factory() {
             return new EventManager();
diff --git a/dist/Services/HTTPServiceBase.js b/dist/Services/HTTPServiceBase.js
index af712ba..d2733bd 100644
--- a/dist/Services/HTTPServiceBase.js
+++ b/dist/Services/HTTPServiceBase.js
@@ -13,7 +13,7 @@ var WiM;
                 return this.$http(request);
             };
             return HTTPServiceBase;
-        })();
+        }());
         Services.HTTPServiceBase = HTTPServiceBase;
     })(Services = WiM.Services || (WiM.Services = {}));
 })(WiM || (WiM = {}));
diff --git a/dist/Services/Helpers/RequestInfo.js b/dist/Services/Helpers/RequestInfo.js
index 2a4e67d..5474a4c 100644
--- a/dist/Services/Helpers/RequestInfo.js
+++ b/dist/Services/Helpers/RequestInfo.js
@@ -21,7 +21,7 @@ var WiM;
                     this.data = data;
                 }
                 return RequestInfo;
-            })();
+            }());
             Helpers.RequestInfo = RequestInfo;
             (function (methodType) {
                 methodType[methodType["GET"] = 0] = "GET";
diff --git a/dist/Services/SearchAPIService.js b/dist/Services/SearchAPIService.js
index 34b71d2..719b1de 100644
--- a/dist/Services/SearchAPIService.js
+++ b/dist/Services/SearchAPIService.js
@@ -16,7 +16,7 @@ var WiM;
                 this.selectedAreaOfInterest = aoi;
             }
             return SearchAPIEventArgs;
-        })(WiM.Event.EventArgs);
+        }(WiM.Event.EventArgs));
         Services.SearchAPIEventArgs = SearchAPIEventArgs;
         var SearchLocation = (function () {
             function SearchLocation(nm, ct, st, lat, long) {
@@ -28,12 +28,12 @@ var WiM;
                 this.crs = "4326";
             }
             return SearchLocation;
-        })();
+        }());
         var SearchConfig = (function () {
             function SearchConfig() {
             }
             return SearchConfig;
-        })();
+        }());
         var SearchAPIService = (function (_super) {
             __extends(SearchAPIService, _super);
             function SearchAPIService($http, $q, eventManager) {
@@ -124,7 +124,7 @@ var WiM;
                 this.config.state = '';
             };
             return SearchAPIService;
-        })(Services.HTTPServiceBase);
+        }(Services.HTTPServiceBase));
         factory.$inject = ['$http', '$q', 'WiM.Event.EventManager'];
         function factory($http, $q, eventManager) {
             return new SearchAPIService($http, $q, eventManager);
diff --git a/dist/typings/Directives/wimLegend.js b/dist/typings/Directives/wimLegend.js
new file mode 100644
index 0000000..7918d0b
--- /dev/null
+++ b/dist/typings/Directives/wimLegend.js
@@ -0,0 +1,245 @@
+var __extends = (this && this.__extends) || function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() { this.constructor = d; }
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+};
+var WiM;
+(function (WiM) {
+    var Directives;
+    (function (Directives) {
+        'use string';
+        Directives.onLayerAdded = "onLayerAdded";
+        Directives.onLayerChanged = "onLayerChanged";
+        Directives.onLayerRemoved = "onLayerRemoved";
+        var LegendLayerAddedEventArgs = (function (_super) {
+            __extends(LegendLayerAddedEventArgs, _super);
+            function LegendLayerAddedEventArgs(layername, ltype, style) {
+                _super.call(this);
+                this.LayerName = layername;
+                this.layerType = ltype;
+                this.style = style;
+            }
+            return LegendLayerAddedEventArgs;
+        }(WiM.Event.EventArgs));
+        Directives.LegendLayerAddedEventArgs = LegendLayerAddedEventArgs;
+        var LegendLayerChangedEventArgs = (function (_super) {
+            __extends(LegendLayerChangedEventArgs, _super);
+            function LegendLayerChangedEventArgs(layername, propertyname, value) {
+                _super.call(this);
+                this.LayerName = layername;
+                this.PropertyName = propertyname;
+                this.Value = value;
+            }
+            return LegendLayerChangedEventArgs;
+        }(WiM.Event.EventArgs));
+        Directives.LegendLayerChangedEventArgs = LegendLayerChangedEventArgs;
+        var LegendLayerRemovedEventArgs = (function (_super) {
+            __extends(LegendLayerRemovedEventArgs, _super);
+            function LegendLayerRemovedEventArgs(layername, ltype) {
+                _super.call(this);
+                this.LayerName = layername;
+                this.layerType = ltype;
+            }
+            return LegendLayerRemovedEventArgs;
+        }(WiM.Event.EventArgs));
+        Directives.LegendLayerRemovedEventArgs = LegendLayerRemovedEventArgs;
+        var wimLegendController = (function (_super) {
+            __extends(wimLegendController, _super);
+            function wimLegendController($scope, $http, leafletData, eventManager) {
+                var _this = this;
+                _super.call(this, $http, '');
+                $scope.vm = this;
+                this.eventManager = eventManager;
+                this.eventManager.AddEvent(Directives.onLayerAdded);
+                this.eventManager.AddEvent(Directives.onLayerChanged);
+                this.eventManager.AddEvent(Directives.onLayerRemoved);
+                this.eventManager.SubscribeToEvent(Directives.onLayerAdded, new WiM.Event.EventHandler(function (sender, e) {
+                    _this.onLayerAdded(sender, e);
+                }));
+                this.eventManager.SubscribeToEvent(Directives.onLayerRemoved, new WiM.Event.EventHandler(function (sender, e) {
+                    _this.onLayerRemoved(sender, e);
+                }));
+                this.leafletData = leafletData;
+                this.init();
+            }
+            wimLegendController.prototype.initOverlays = function (mlyr) {
+                if (mlyr.type != "agsDynamic")
+                    return;
+                var url = mlyr.url + "/legend?f=pjson";
+                var request = new WiM.Services.Helpers.RequestInfo(url, true);
+                this.Execute(request).then(function (response) {
+                    if (response.data.layers.length > 0) {
+                        mlyr.isOpen = true;
+                        mlyr.layerArray = response.data.layers;
+                    }
+                }, function (error) {
+                });
+            };
+            wimLegendController.prototype.changeBaseLayer = function (key, evt) {
+                var _this = this;
+                this.baselayers.selectedlayerName = key.toString();
+                this.leafletData.getMap().then(function (map) {
+                    _this.leafletData.getLayers().then(function (maplayers) {
+                        if (map.hasLayer(maplayers.baselayers[key])) {
+                            return;
+                        }
+                        for (var mlayr in maplayers.baselayers) {
+                            if (map.hasLayer(maplayers.baselayers[mlayr])) {
+                                map.removeLayer(maplayers.baselayers[mlayr]);
+                            }
+                        }
+                        map.addLayer(maplayers.baselayers[key]);
+                    });
+                });
+                evt.preventDefault();
+            };
+            wimLegendController.prototype.toggleLayer = function (layerName, visibility) {
+                var layer = this.applicationLayer.layergroup[layerName];
+                layer.visible = (layer.visible) ? false : true;
+                this.eventManager.RaiseEvent(Directives.onLayerChanged, this, new LegendLayerChangedEventArgs(layerName, "visible", layer.visible));
+            };
+            wimLegendController.prototype.init = function () {
+                var _this = this;
+                this.overlays = {};
+                this.baselayers = {};
+                this.baselayers.isOpen = true;
+                this.applicationLayer = {
+                    selectedlayerName: "Application Layers",
+                    isAvailable: false,
+                    layergroup: {},
+                    isOpen: false
+                };
+                this.leafletData.getMap().then(function (map) {
+                    _this.leafletData.getLayers().then(function (maplayers) {
+                        for (var key in maplayers.baselayers) {
+                            if (map.hasLayer(maplayers.baselayers[key])) {
+                                _this.baselayers.selectedlayerName = key.toString();
+                                break;
+                            }
+                        }
+                    });
+                });
+            };
+            wimLegendController.prototype.onLayerAdded = function (sender, e) {
+                if (e.layerType != 'geojson')
+                    return;
+                if (this.applicationLayer.layergroup.hasOwnProperty(e.LayerName))
+                    return;
+                this.applicationLayer.isAvailable = true;
+                this.applicationLayer.layergroup[e.LayerName] = {
+                    visible: true,
+                    style: e.style
+                };
+            };
+            wimLegendController.prototype.onLayerRemoved = function (sender, e) {
+                if (e.layerType != 'geojson')
+                    return;
+                if (this.applicationLayer.layergroup.hasOwnProperty(e.LayerName))
+                    delete this.applicationLayer[e.LayerName];
+            };
+            wimLegendController.$inject = ['$scope', '$http', 'leafletData', 'WiM.Event.EventManager'];
+            return wimLegendController;
+        }(WiM.Services.HTTPServiceBase));
+        var wimLegend = (function () {
+            function wimLegend() {
+                this.scope = {
+                    icons: '=?',
+                    autoHideOpacity: '=?',
+                    showGroups: '=?',
+                    title: '@',
+                    baseTitle: '@',
+                    overlaysTitle: '@'
+                };
+                this.restrict = 'E';
+                this.require = '^leaflet';
+                this.transclude = false;
+                this.controller = wimLegendController;
+                this.template = '<div ng-class="vm.layerControlExpanded ? \'angular-leaflet-control-layers-expanded\' : \'angular-leaflet-control-layers-collapsed\'" ng-click="vm.layerControlExpanded = true; $event.stopPropagation(); $event.preventDefault()" ng-init="vm.layerControlExpanded == false">' +
+                    '    <div ng-show="vm.layerControlExpanded">' +
+                    '        <button class="close-legend" ng-click="vm.layerControlExpanded = false; $event.stopPropagation();">Close Legend</button>' +
+                    '        <div class="list-group">' +
+                    '            <!-- baselayers -->' +
+                    '            <a ng-class="!vm.baselayers.isOpen  ? \' list-group-item-active wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'" ng-click="vm.baselayers.isOpen=(vm.baselayers.isOpen) ? false : true;">' +
+                    '                Base Maps' +
+                    '                <i ng-class="!vm.baselayers.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'"></i>' +
+                    '            </a> ' +
+                    '            <div ng-hide="vm.baselayers.isOpen" class="list-group-body wimLegend-list-group-body">' +
+                    '                <div class="sitebar-item" ng-repeat="(key, layer) in vm.baselayers.layergroup">' +
+                    '                    <input type="radio" id="baselayerRadio{{$id}}" ng-checked="$parent.vm.baselayers.selectedlayerName === key.toString()" ng-value="key.toString()" /><label for="baselayerRadio{{$id}}" ng-click="vm.changeBaseLayer(key, $event)">{{layer.name}}</label>' +
+                    '                </div>' +
+                    '            </div>  ' +
+                    '            <!-- Application Layers -->' +
+                    '            <div ng-if="vm.applicationLayer.isAvailable">' +
+                    '                <div ng-class="vm.applicationLayer.isOpen  ? \'list-group-item wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'">' +
+                    '                    <label> {{vm.applicationLayer.selectedlayerName}}</label>' +
+                    '                    <i ng-class="vm.applicationLayer.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'" ng-click="vm.applicationLayer.isOpen=(vm.applicationLayer.isOpen) ? false : true;"></i>' +
+                    '                </div>' +
+                    '                <div ng-show="vm.applicationLayer.isOpen">' +
+                    '                    <div ng-repeat="(key, lyr) in vm.applicationLayer.layergroup">' +
+                    '                        <input type="checkbox" id="applicationLayer{{$id}}" ng-checked="lyr.visible" ng-value="lyr.visible" />                        ' +
+                    '                        <label for="applicationLayer{{$id}}" ng-click="$parent.vm.toggleLayer(key.toString(), lyr.visible)"><img ng-src={{lyr.style.imagesrc}} />{{lyr.style.displayName}}</label>' +
+                    '                    </div>' +
+                    '                </div>' +
+                    '            </div>' +
+                    '            <!-- overlays --> ' +
+                    '            <div ng-repeat="layer in vm.overlays.layergroup" ng-init="vm.initOverlays(layer)">' +
+                    '                <div ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-class="!layer.isOpen  ? \'list-group-item-active wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'">' +
+                    '                    <input type="checkbox" id="checkbox{{$id}}" ng-checked="layer.visible" />' +
+                    '                    <label for="checkbox{{$id}}" ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-click="layer.visible = (layer.visible) ? false : true;">' +
+                    '                        {{layer.name}}' +
+                    '                    </label>' +
+                    '                    <i ng-class="!layer.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'" ng-click="layer.isOpen=(layer.isOpen) ? false : true;"></i>' +
+                    '                </div>' +
+                    '                <div ng-hide="layer.isOpen">' +
+                    '                    <div class="legendGroup" ng-if="layer.type == \'agsDynamic\'">' +
+                    '                        <div ng-repeat="lyr in layer.layerArray ">' +
+                    '                            <label>{{lyr.layerName}}</label>' +
+                    '                            <div ng-repeat="leg in lyr.legend ">' +
+                    '                                <img class="legendSwatch" alt="Embedded Image"' +
+                    '                                     src="data:{{leg.contentType}};base64,{{leg.imageData}}" />' +
+                    '                                <i>{{leg.label}}</i>' +
+                    '                            </div>' +
+                    '                        </div>' +
+                    '                    </div>' +
+                    '                </div>' +
+                    '            </div>' +
+                    '            ' +
+                    '        </div>' +
+                    '    </div>' +
+                    '</div>';
+                this.replace = true;
+            }
+            wimLegend.instance = function () {
+                return new wimLegend;
+            };
+            wimLegend.prototype.link = function (scope, element, attributes, controller) {
+                var leafletScope = controller.getLeafletScope();
+                var layers = leafletScope.layers;
+                scope.vm.overlays.layergroup = layers.overlays;
+                scope.vm.baselayers.layergroup = layers.baselayers;
+                element.bind('click', function (e) {
+                    e.stopPropagation();
+                    e.preventDefault();
+                });
+                element.bind('mouseover', function (e) {
+                    controller.getMap().then(function (map) {
+                        map.dragging.disable();
+                        map.doubleClickZoom.disable;
+                        map.scrollWheelZoom.disable();
+                    });
+                });
+                element.bind('mouseout', function (e) {
+                    controller.getMap().then(function (map) {
+                        map.dragging.enable();
+                        map.doubleClickZoom.enable();
+                        map.scrollWheelZoom.enable();
+                    });
+                });
+            };
+            return wimLegend;
+        }());
+        angular.module('wim_angular')
+            .directive('wimLegend', wimLegend.instance);
+    })(Directives = WiM.Directives || (WiM.Directives = {}));
+})(WiM || (WiM = {}));
+//# sourceMappingURL=wimLegend.js.map
\ No newline at end of file
diff --git a/dist/typings/Directives/wimLegend.js.map b/dist/typings/Directives/wimLegend.js.map
new file mode 100644
index 0000000..db6eec3
--- /dev/null
+++ b/dist/typings/Directives/wimLegend.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"wimLegend.js","sourceRoot":"","sources":["wimLegend.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/typings/Directives/wimLegend.ts b/dist/typings/Directives/wimLegend.ts
index 4680e53..7de7d16 100644
--- a/dist/typings/Directives/wimLegend.ts
+++ b/dist/typings/Directives/wimLegend.ts
@@ -240,18 +240,18 @@ module WiM.Directives {
         '        <button class="close-legend" ng-click="vm.layerControlExpanded = false; $event.stopPropagation();">Close Legend</button>' +
         '        <div class="list-group">' +
         '            <!-- baselayers -->' +
-        '            <a ng-class="!vm.baselayers.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'" ng-click="vm.baselayers.isOpen=(vm.baselayers.isOpen) ? false : true;">' +
+        '            <a ng-class="!vm.baselayers.isOpen  ? \' list-group-item-active wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'" ng-click="vm.baselayers.isOpen=(vm.baselayers.isOpen) ? false : true;">' +
         '                Base Maps' +
         '                <i ng-class="!vm.baselayers.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'"></i>' +
         '            </a> ' +
-        '            <div ng-hide="vm.baselayers.isOpen" class="wimLegend-list-group-body">' +
+        '            <div ng-hide="vm.baselayers.isOpen" class="list-group-body wimLegend-list-group-body">' +
         '                <div class="sitebar-item" ng-repeat="(key, layer) in vm.baselayers.layergroup">' +
         '                    <input type="radio" id="baselayerRadio{{$id}}" ng-checked="$parent.vm.baselayers.selectedlayerName === key.toString()" ng-value="key.toString()" /><label for="baselayerRadio{{$id}}" ng-click="vm.changeBaseLayer(key, $event)">{{layer.name}}</label>' +
         '                </div>' +
         '            </div>  ' +
         '            <!-- Application Layers -->' +
         '            <div ng-if="vm.applicationLayer.isAvailable">' +
-        '                <div ng-class="vm.applicationLayer.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'">' +
+        '                <div ng-class="vm.applicationLayer.isOpen  ? \'list-group-item wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'">' +
         '                    <label> {{vm.applicationLayer.selectedlayerName}}</label>' +
         '                    <i ng-class="vm.applicationLayer.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'" ng-click="vm.applicationLayer.isOpen=(vm.applicationLayer.isOpen) ? false : true;"></i>' +
         '                </div>' +
@@ -264,7 +264,7 @@ module WiM.Directives {
         '            </div>' +
         '            <!-- overlays --> ' +
         '            <div ng-repeat="layer in vm.overlays.layergroup" ng-init="vm.initOverlays(layer)">' +
-        '                <div ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-class="!layer.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'">' +
+        '                <div ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-class="!layer.isOpen  ? \'list-group-item-active wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'">' +
         '                    <input type="checkbox" id="checkbox{{$id}}" ng-checked="layer.visible" />' +
         '                    <label for="checkbox{{$id}}" ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-click="layer.visible = (layer.visible) ? false : true;">' +
         '                        {{layer.name}}' +
diff --git a/dist/typings/Extensions/SurveyRound.js b/dist/typings/Extensions/SurveyRound.js
new file mode 100644
index 0000000..94e0f1c
--- /dev/null
+++ b/dist/typings/Extensions/SurveyRound.js
@@ -0,0 +1,20 @@
+if (!Number.prototype.toUSGSvalue) {
+    Number.prototype.toUSGSvalue = function () {
+        var x = parseFloat(this);
+        var precision;
+        if ((x > 1000000) && (x < 10000000))
+            precision = 10000;
+        if ((x > 100000) && (x < 1000000))
+            precision = 1000;
+        if ((x > 10000) && (x < 100000))
+            precision = 100;
+        if ((x > 1000) && (x < 10000))
+            precision = 10;
+        if ((x > 100) && (x < 1000))
+            precision = 1;
+        if (x < 100)
+            return Number(x.toFixed(3));
+        return parseInt(((x + (precision * .5)) / precision).toString()) * precision;
+    };
+}
+//# sourceMappingURL=SurveyRound.js.map
\ No newline at end of file
diff --git a/dist/typings/Extensions/SurveyRound.js.map b/dist/typings/Extensions/SurveyRound.js.map
new file mode 100644
index 0000000..54da917
--- /dev/null
+++ b/dist/typings/Extensions/SurveyRound.js.map
@@ -0,0 +1 @@
+{"version":3,"file":"SurveyRound.js","sourceRoot":"","sources":["SurveyRound.ts"],"names":[],"mappings":"AAIA,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;IAChC,MAAM,CAAC,SAAS,CAAC,WAAW,GAAG;QAC3B,IAAI,CAAC,GAAU,UAAU,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,SAAgB,CAAC;QACrB,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC;YAAC,SAAS,GAAG,KAAK,CAAC;QACvD,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC;YAAC,SAAS,GAAG,IAAI,CAAC;QACpD,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC;YAAC,SAAS,GAAG,GAAG,CAAC;QACjD,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;YAAC,SAAS,GAAG,EAAE,CAAC;QAC9C,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAAC,SAAS,GAAG,CAAC,CAAC;QAC3C,EAAE,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC;YAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;QAEzC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,QAAQ,EAAE,CAAC,GAAG,SAAS,CAAC;IACjF,CAAC,CAAC;AACN,CAAC"}
\ No newline at end of file
diff --git a/gulpfile.js b/gulpfile.js
index 7349971..940b9e6 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -7,7 +7,7 @@ var uglify = require('gulp-uglify');
 var rename = require('gulp-rename');
 
 var src = ['src/**/*.js', 'src/**/*.css'];
-var tsDefsrc = ['src/**/*d.ts'];
+var tsDefsrc = ['src/**/**/*d.ts'];
 
 // Concatenate & Minify JS
 //TODO: refactor this, possibly using the gulp-order plugin to assure proper order for concat
diff --git a/src/Directives/wimLegend.js b/src/Directives/wimLegend.js
index b0d07af..c64632b 100644
--- a/src/Directives/wimLegend.js
+++ b/src/Directives/wimLegend.js
@@ -20,7 +20,7 @@ var WiM;
                 this.style = style;
             }
             return LegendLayerAddedEventArgs;
-        })(WiM.Event.EventArgs);
+        }(WiM.Event.EventArgs));
         Directives.LegendLayerAddedEventArgs = LegendLayerAddedEventArgs;
         var LegendLayerChangedEventArgs = (function (_super) {
             __extends(LegendLayerChangedEventArgs, _super);
@@ -31,7 +31,7 @@ var WiM;
                 this.Value = value;
             }
             return LegendLayerChangedEventArgs;
-        })(WiM.Event.EventArgs);
+        }(WiM.Event.EventArgs));
         Directives.LegendLayerChangedEventArgs = LegendLayerChangedEventArgs;
         var LegendLayerRemovedEventArgs = (function (_super) {
             __extends(LegendLayerRemovedEventArgs, _super);
@@ -41,7 +41,7 @@ var WiM;
                 this.layerType = ltype;
             }
             return LegendLayerRemovedEventArgs;
-        })(WiM.Event.EventArgs);
+        }(WiM.Event.EventArgs));
         Directives.LegendLayerRemovedEventArgs = LegendLayerRemovedEventArgs;
         var wimLegendController = (function (_super) {
             __extends(wimLegendController, _super);
@@ -66,7 +66,7 @@ var WiM;
                 if (mlyr.type != "agsDynamic")
                     return;
                 var url = mlyr.url + "/legend?f=pjson";
-                var request = new WiM.Services.Helpers.RequestInfo(url, true);
+                var request = new Services.Helpers.RequestInfo(url, true);
                 this.Execute(request).then(function (response) {
                     if (response.data.layers.length > 0) {
                         mlyr.isOpen = true;
@@ -139,7 +139,7 @@ var WiM;
             };
             wimLegendController.$inject = ['$scope', '$http', 'leafletData', 'WiM.Event.EventManager'];
             return wimLegendController;
-        })(WiM.Services.HTTPServiceBase);
+        }(Services.HTTPServiceBase));
         var wimLegend = (function () {
             function wimLegend() {
                 this.scope = {
@@ -148,7 +148,7 @@ var WiM;
                     showGroups: '=?',
                     title: '@',
                     baseTitle: '@',
-                    overlaysTitle: '@',
+                    overlaysTitle: '@'
                 };
                 this.restrict = 'E';
                 this.require = '^leaflet';
@@ -159,18 +159,18 @@ var WiM;
                     '        <button class="close-legend" ng-click="vm.layerControlExpanded = false; $event.stopPropagation();">Close Legend</button>' +
                     '        <div class="list-group">' +
                     '            <!-- baselayers -->' +
-                    '            <a ng-class="!vm.baselayers.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'" ng-click="vm.baselayers.isOpen=(vm.baselayers.isOpen) ? false : true;">' +
+                    '            <a ng-class="!vm.baselayers.isOpen  ? \' list-group-item-active wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'" ng-click="vm.baselayers.isOpen=(vm.baselayers.isOpen) ? false : true;">' +
                     '                Base Maps' +
                     '                <i ng-class="!vm.baselayers.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'"></i>' +
                     '            </a> ' +
-                    '            <div ng-hide="vm.baselayers.isOpen" class="wimLegend-list-group-body">' +
+                    '            <div ng-hide="vm.baselayers.isOpen" class="list-group-body wimLegend-list-group-body">' +
                     '                <div class="sitebar-item" ng-repeat="(key, layer) in vm.baselayers.layergroup">' +
                     '                    <input type="radio" id="baselayerRadio{{$id}}" ng-checked="$parent.vm.baselayers.selectedlayerName === key.toString()" ng-value="key.toString()" /><label for="baselayerRadio{{$id}}" ng-click="vm.changeBaseLayer(key, $event)">{{layer.name}}</label>' +
                     '                </div>' +
                     '            </div>  ' +
                     '            <!-- Application Layers -->' +
                     '            <div ng-if="vm.applicationLayer.isAvailable">' +
-                    '                <div ng-class="vm.applicationLayer.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'">' +
+                    '                <div ng-class="vm.applicationLayer.isOpen  ? \'list-group-item wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'">' +
                     '                    <label> {{vm.applicationLayer.selectedlayerName}}</label>' +
                     '                    <i ng-class="vm.applicationLayer.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'" ng-click="vm.applicationLayer.isOpen=(vm.applicationLayer.isOpen) ? false : true;"></i>' +
                     '                </div>' +
@@ -183,7 +183,7 @@ var WiM;
                     '            </div>' +
                     '            <!-- overlays --> ' +
                     '            <div ng-repeat="layer in vm.overlays.layergroup" ng-init="vm.initOverlays(layer)">' +
-                    '                <div ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-class="!layer.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'">' +
+                    '                <div ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-class="!layer.isOpen  ? \'list-group-item-active wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'">' +
                     '                    <input type="checkbox" id="checkbox{{$id}}" ng-checked="layer.visible" />' +
                     '                    <label for="checkbox{{$id}}" ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-click="layer.visible = (layer.visible) ? false : true;">' +
                     '                        {{layer.name}}' +
@@ -237,7 +237,7 @@ var WiM;
                 });
             };
             return wimLegend;
-        })();
+        }());
         angular.module('wim_angular')
             .directive('wimLegend', wimLegend.instance);
     })(Directives = WiM.Directives || (WiM.Directives = {}));
diff --git a/src/Directives/wimLegend.js.map b/src/Directives/wimLegend.js.map
index 115a5fa..b3a24f0 100644
--- a/src/Directives/wimLegend.js.map
+++ b/src/Directives/wimLegend.js.map
@@ -1 +1 @@
-{"version":3,"file":"wimLegend.js","sourceRoot":"","sources":["wimLegend.ts"],"names":["WiM","WiM.Directives","WiM.Directives.LegendLayerAddedEventArgs","WiM.Directives.LegendLayerAddedEventArgs.constructor","WiM.Directives.LegendLayerChangedEventArgs","WiM.Directives.LegendLayerChangedEventArgs.constructor","WiM.Directives.LegendLayerRemovedEventArgs","WiM.Directives.LegendLayerRemovedEventArgs.constructor","WiM.Directives.wimLegendController","WiM.Directives.wimLegendController.constructor","WiM.Directives.wimLegendController.initOverlays","WiM.Directives.wimLegendController.changeBaseLayer","WiM.Directives.wimLegendController.toggleLayer","WiM.Directives.wimLegendController.init","WiM.Directives.wimLegendController.onLayerAdded","WiM.Directives.wimLegendController.onLayerRemoved","WiM.Directives.wimLegend","WiM.Directives.wimLegend.constructor","WiM.Directives.wimLegend.instance","WiM.Directives.wimLegend.link"],"mappings":"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CA;gBACxFA,IAAIA,CAACA,OAAOA,CAACA,OAAOA,CAACA,CAACA,IAAIA,CACtBA,UAACA,QAAaA;oBAEVA,EAAEA,CAACA,CAACA,QAAQA,CAACA,IAAIA,CAACA,MAAMA,CAACA,MAAMA,GAAGA,CAACA,CAACA,CAACA,CAACA;wBAClCA,IAAIA,CAACA,MAAMA,GAAGA,IAAIA,CAACA;wBACnBA,IAAIA,CAACA,UAAUA,GAAGA,QAAQA,CAACA,IAAIA,CAACA,MAAMA,CAACA;oBAC3CA,CAACA;gBACLA,CAACA,EAAEA,UAACA,KAAKA;gBAETA,CAACA,CAACA,CAACA;YACXA,CAACA;YAEMF,6CAAeA,GAAtBA,UAAuBA,GAAQA,EAAEA,GAAQA;gBAAzCG,iBAkBCA;gBAhBGA,IAAIA,CAACA,UAAUA,CAACA,iBAAiBA,GAAGA,GAAGA,CAACA,QAAQA,EAAEA,CAACA;gBACnDA,IAAIA,CAACA,WAAWA,CAACA,MAAMA,EAAEA,CAACA,IAAIA,CAACA,UAACA,GAAQA;oBACpCA,KAAIA,CAACA,WAAWA,CAACA,SAASA,EAAEA,CAACA,IAAIA,CAACA,UAACA,SAAcA;wBAC7CA,EAAEA,CAACA,CAACA,GAAGA,CAACA,QAAQA,CAACA,SAASA,CAACA,UAAUA,CAACA,GAAGA,CAACA,CAACA,CAACA,CAACA,CAACA;4BAACA,MAAMA,CAACA;wBAACA,CAACA;wBAExDA,GAAGA,CAACA,CAACA,GAAGA,CAACA,KAAKA,IAAIA,SAASA,CAACA,UAAUA,CAACA,CAACA,CAACA;4BACrCA,EAAEA,CAACA,CAACA,GAAGA,CAACA,QAAQA,CAACA,SAASA,CAACA,UAAUA,CAACA,KAAKA,CAACA,CAACA,CAACA,CAACA,CAACA;gCAC5CA,GAAGA,CAACA,WAAWA,CAACA,SAASA,CAACA,UAAUA,CAACA,KAAKA,CAACA,CAACA,CAACA;4BACjDA,CAACA;wBACLA,CAACA;wBAEDA,GAAGA,CAACA,QAAQA,CAACA,SAASA,CAACA,UAAUA,CAACA,GAAGA,CAACA,CAACA,CAACA;oBAC5CA,CAACA,CAACA,CA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"}
\ No newline at end of file
+{"version":3,"file":"wimLegend.js","sourceRoot":"","sources":["wimLegend.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/Directives/wimLegend.ts b/src/Directives/wimLegend.ts
index fb41b09..91112dc 100644
--- a/src/Directives/wimLegend.ts
+++ b/src/Directives/wimLegend.ts
@@ -240,18 +240,18 @@ module WiM.Directives {
         '        <button class="close-legend" ng-click="vm.layerControlExpanded = false; $event.stopPropagation();">Close Legend</button>' +
         '        <div class="list-group">' +
         '            <!-- baselayers -->' +
-        '            <a ng-class="!vm.baselayers.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'" ng-click="vm.baselayers.isOpen=(vm.baselayers.isOpen) ? false : true;">' +
+        '            <a ng-class="!vm.baselayers.isOpen  ? \' list-group-item-active wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'" ng-click="vm.baselayers.isOpen=(vm.baselayers.isOpen) ? false : true;">' +
         '                Base Maps' +
         '                <i ng-class="!vm.baselayers.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'"></i>' +
         '            </a> ' +
-        '            <div ng-hide="vm.baselayers.isOpen" class="wimLegend-list-group-body">' +
+        '            <div ng-hide="vm.baselayers.isOpen" class="list-group-body wimLegend-list-group-body">' +
         '                <div class="sitebar-item" ng-repeat="(key, layer) in vm.baselayers.layergroup">' +
         '                    <input type="radio" id="baselayerRadio{{$id}}" ng-checked="$parent.vm.baselayers.selectedlayerName === key.toString()" ng-value="key.toString()" /><label for="baselayerRadio{{$id}}" ng-click="vm.changeBaseLayer(key, $event)">{{layer.name}}</label>' +
         '                </div>' +
         '            </div>  ' +
         '            <!-- Application Layers -->' +
         '            <div ng-if="vm.applicationLayer.isAvailable">' +
-        '                <div ng-class="vm.applicationLayer.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'">' +
+        '                <div ng-class="vm.applicationLayer.isOpen  ? \'list-group-item wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'">' +
         '                    <label> {{vm.applicationLayer.selectedlayerName}}</label>' +
         '                    <i ng-class="vm.applicationLayer.isOpen ? \'fa fa-chevron-up pull-right\': \'fa fa-chevron-down pull-right\'" ng-click="vm.applicationLayer.isOpen=(vm.applicationLayer.isOpen) ? false : true;"></i>' +
         '                </div>' +
@@ -264,7 +264,7 @@ module WiM.Directives {
         '            </div>' +
         '            <!-- overlays --> ' +
         '            <div ng-repeat="layer in vm.overlays.layergroup" ng-init="vm.initOverlays(layer)">' +
-        '                <div ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-class="!layer.isOpen  ? \'wimLegend-list-group-item-active\': \'wimLegend-list-group-item\'">' +
+        '                <div ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-class="!layer.isOpen  ? \'list-group-item-active wimLegend-list-group-item-active\': \'list-group-item wimLegend-list-group-item\'">' +
         '                    <input type="checkbox" id="checkbox{{$id}}" ng-checked="layer.visible" />' +
         '                    <label for="checkbox{{$id}}" ng-if="!layer.layerParams.showOnSelector && layer.layerParams.showOnSelector !== false" ng-click="layer.visible = (layer.visible) ? false : true;">' +
         '                        {{layer.name}}' +
diff --git a/src/Events/Delegate.js b/src/Events/Delegate.js
index a6db666..93ac792 100644
--- a/src/Events/Delegate.js
+++ b/src/Events/Delegate.js
@@ -23,7 +23,7 @@ var WiM;
                 }
             };
             return Delegate;
-        })();
+        }());
         Event.Delegate = Delegate;
     })(Event = WiM.Event || (WiM.Event = {}));
 })(WiM || (WiM = {}));
diff --git a/src/Events/Delegate.js.map b/src/Events/Delegate.js.map
index d6c65d2..fbf0681 100644
--- a/src/Events/Delegate.js.map
+++ b/src/Events/Delegate.js.map
@@ -1 +1 @@
-{"version":3,"file":"Delegate.js","sourceRoot":"","sources":["Delegate.ts"],"names":["WiM","WiM.Event","WiM.Event.Delegate","WiM.Event.Delegate.constructor","WiM.Event.Delegate.subscribe","WiM.Event.Delegate.unsubscribe","WiM.Event.Delegate.raise"],"mappings":"AACA,IAAO,GAAG,CA2BT;AA3BD,WAAO,GAAG;IAACA,IAAAA,KAAKA,CA2BfA;IA3BUA,WAAAA,KAAKA,EAACA,CAACA;QACjBC;YAGOC;gBACIC,IAAIA,CAACA,cAAcA,GAAGA,IAAIA,KAAKA,EAAmBA,CAACA;YACvDA,CAACA;YAEMD,4BAASA,GAAhBA,UAAiBA,YAA6BA;gBAC1CE,EAAEA,CAACA,CAACA,IAAIA,CAACA,cAAcA,CAACA,OAAOA,CAACA,YAAYA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA,CAACA;oBAClDA,IAAIA,CAACA,cAAcA,CAACA,IAAIA,CAACA,YAAYA,CAACA,CAACA;gBAC3CA,CAACA;YACLA,CAACA;YAEMF,8BAAWA,GAAlBA,UAAmBA,YAA6BA;gBAC5CG,IAAIA,CAACA,GAAGA,IAAIA,CAACA,cAAcA,CAACA,OAAOA,CAACA,YAAYA,CAACA,CAACA;gBAClDA,EAAEA,CAACA,CAACA,CAACA,IAAIA,CAACA,CAACA,CAACA,CAACA,CAACA;oBACVA,IAAIA,CAACA,cAAcA,CAACA,MAAMA,CAACA,CAACA,EAAEA,CAACA,CAACA,CAACA;gBACrCA,CAACA;YACLA,CAACA;YAEMH,wBAAKA,GAAZA,UAAaA,MAAWA,EAAEA,CAAIA;gBAC1BI,GAAGA,CAACA,CAACA,GAAGA,CAACA,CAACA,GAAGA,CAACA,EAAEA,CAACA,GAAGA,IAAIA,CAACA,cAAcA,CAACA,MAAMA,EAAEA,CAACA,EAAEA,EAAEA,CAACA;oBAClDA,IAAIA,CAACA,cAAcA,CAACA,CAACA,CAACA,CAACA,MAAMA,CAACA,MAAMA,EAAEA,CAACA,CAACA,CAACA;gBAC7CA,CAACA;YACLA,CAACA;YACLJ,eAACA;QAADA,CAACA,AAzBJD,IAyBIA;QAzBSA,cAAQA,WAyBjBA,CAAAA;IACLA,CAACA,EA3BUD,KAAKA,GAALA,SAAKA,KAALA,SAAKA,QA2BfA;AAADA,CAACA,EA3BM,GAAG,KAAH,GAAG,QA2BT"}
\ No newline at end of file
+{"version":3,"file":"Delegate.js","sourceRoot":"","sources":["Delegate.ts"],"names":[],"mappings":"AACA,IAAO,GAAG,CA2BT;AA3BD,WAAO,GAAG;IAAC,IAAA,KAAK,CA2Bf;IA3BU,WAAA,KAAK,EAAC,CAAC;QACjB;YAGO;gBACI,IAAI,CAAC,cAAc,GAAG,IAAI,KAAK,EAAmB,CAAC;YACvD,CAAC;YAEM,4BAAS,GAAhB,UAAiB,YAA6B;gBAC1C,EAAE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;oBAClD,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;gBAC3C,CAAC;YACL,CAAC;YAEM,8BAAW,GAAlB,UAAmB,YAA6B;gBAC5C,IAAI,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;gBAClD,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;oBACV,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBACrC,CAAC;YACL,CAAC;YAEM,wBAAK,GAAZ,UAAa,MAAW,EAAE,CAAI;gBAC1B,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;oBAClD,IAAI,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC7C,CAAC;YACL,CAAC;YACL,eAAC;QAAD,CAAC,AAzBJ,IAyBI;QAzBS,cAAQ,WAyBjB,CAAA;IACL,CAAC,EA3BU,KAAK,GAAL,SAAK,KAAL,SAAK,QA2Bf;AAAD,CAAC,EA3BM,GAAG,KAAH,GAAG,QA2BT"}
\ No newline at end of file
diff --git a/src/Events/EventHandler.js b/src/Events/EventHandler.js
index f58bb05..e929010 100644
--- a/src/Events/EventHandler.js
+++ b/src/Events/EventHandler.js
@@ -10,7 +10,7 @@ var WiM;
                 this._handler(sender, e);
             };
             return EventHandler;
-        })();
+        }());
         Event.EventHandler = EventHandler;
     })(Event = WiM.Event || (WiM.Event = {}));
 })(WiM || (WiM = {}));
diff --git a/src/Events/EventHandler.js.map b/src/Events/EventHandler.js.map
index d89c31a..7f739ee 100644
--- a/src/Events/EventHandler.js.map
+++ b/src/Events/EventHandler.js.map
@@ -1 +1 @@
-{"version":3,"file":"EventHandler.js","sourceRoot":"","sources":["EventHandler.ts"],"names":["WiM","WiM.Event","WiM.Event.EventHandler","WiM.Event.EventHandler.constructor","WiM.Event.EventHandler.handle"],"mappings":"AAAA,IAAO,GAAG,CAYT;AAZD,WAAO,GAAG;IAACA,IAAAA,KAAKA,CAYfA;IAZUA,WAAAA,KAAKA,EAAAA,CAACA;QACjBC;YAGIC,sBAAYA,OAAsCA;gBAC9CC,IAAIA,CAACA,QAAQA,GAAGA,OAAOA,CAACA;YAC5BA,CAACA;YAEMD,6BAAMA,GAAbA,UAAcA,MAAWA,EAAEA,CAAIA;gBAC3BE,IAAIA,CAACA,QAAQA,CAACA,MAAMA,EAAEA,CAACA,CAACA,CAACA;YAC7BA,CAACA;YACLF,mBAACA;QAADA,CAACA,AAVDD,IAUCA;QAVYA,kBAAYA,eAUxBA,CAAAA;IACDA,CAACA,EAZUD,KAAKA,GAALA,SAAKA,KAALA,SAAKA,QAYfA;AAADA,CAACA,EAZM,GAAG,KAAH,GAAG,QAYT"}
\ No newline at end of file
+{"version":3,"file":"EventHandler.js","sourceRoot":"","sources":["EventHandler.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CAYT;AAZD,WAAO,GAAG;IAAC,IAAA,KAAK,CAYf;IAZU,WAAA,KAAK,EAAA,CAAC;QACjB;YAGI,sBAAY,OAAsC;gBAC9C,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC;YAC5B,CAAC;YAEM,6BAAM,GAAb,UAAc,MAAW,EAAE,CAAI;gBAC3B,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;YAC7B,CAAC;YACL,mBAAC;QAAD,CAAC,AAVD,IAUC;QAVY,kBAAY,eAUxB,CAAA;IACD,CAAC,EAZU,KAAK,GAAL,SAAK,KAAL,SAAK,QAYf;AAAD,CAAC,EAZM,GAAG,KAAH,GAAG,QAYT"}
\ No newline at end of file
diff --git a/src/Events/EventManager.js b/src/Events/EventManager.js
index be372c7..c4ffefb 100644
--- a/src/Events/EventManager.js
+++ b/src/Events/EventManager.js
@@ -15,7 +15,7 @@ var WiM;
                 configurable: true
             });
             return Event;
-        })();
+        }());
         var EventManager = (function () {
             function EventManager() {
                 this._eventList = {};
@@ -43,7 +43,7 @@ var WiM;
                 this._eventList[EventName].onChanged.unsubscribe(handler);
             };
             return EventManager;
-        })();
+        }());
         factory.$inject = [];
         function factory() {
             return new EventManager();
diff --git a/src/Events/EventManager.js.map b/src/Events/EventManager.js.map
index 55daf16..46ccf61 100644
--- a/src/Events/EventManager.js.map
+++ b/src/Events/EventManager.js.map
@@ -1 +1 @@
-{"version":3,"file":"EventManager.js","sourceRoot":"","sources":["EventManager.ts"],"names":["WiM","WiM.Event","WiM.Event.Event","WiM.Event.Event.constructor","WiM.Event.Event.onChanged","WiM.Event.EventManager","WiM.Event.EventManager.constructor","WiM.Event.EventManager.AddEvent","WiM.Event.EventManager.SubscribeToEvent","WiM.Event.EventManager.RaiseEvent","WiM.Event.EventManager.UnSubscribeToEvent","WiM.Event.factory"],"mappings":"AAwBA,IAAO,GAAG,CA4ET;AA5ED,WAAO,GAAG;IAACA,IAAAA,KAAKA,CA4EfA;IA5EUA,WAAAA,OAAKA,EAACA,CAACA;QACdC,YAAYA,CAAAA;QAcZA;YAOIC,eAAYA,QAA6BA;gBACrCC,IAAIA,CAACA,UAAUA,GAAGA,QAAQA,CAACA;YAC/BA,CAACA;YAPDD,sBAAWA,4BAASA;qBAApBA;oBACIE,MAAMA,CAACA,IAAIA,CAACA,UAAUA,CAACA;gBAC3BA,CAACA;;;eAAAF;YAOLA,YAACA;QAADA,CAACA,AAXDD,IAWCA;QAEDA;YASII;gBACIC,IAAIA,CAACA,UAAUA,GAAGA,EAAEA,CAACA;YACzBA,CAACA;YAIMD,+BAAQA,GAAfA,UAAqCA,SAAiBA;gBAClDE,EAAEA,CAACA,CAACA,CAACA,IAAIA,CAACA,UAAUA,CAACA,cAAcA,CAACA,SAASA,CAACA,CAACA;oBAC/CA,IAAIA,CAACA,UAAUA,CAACA,SAASA,CAACA,GAAGA,IAAIA,KAAKA,CAACA,IAAIA,gBAAQA,EAAKA,CAACA,CAACA;YAC9DA,CAACA;YACMF,uCAAgBA,GAAvBA,UAA6CA,SAAiBA,EAAEA,OAAwBA;gBACpFG,EAAEA,CAACA,CAACA,CAACA,IAAIA,CAACA,UAAUA,CAACA,cAAcA,CAACA,SAASA,CAACA,CAACA,CAACA,CAACA;oBAC7CA,IAAIA,CAACA,QAAQA,CAAIA,SAASA,CAACA,CAACA;gBAChCA,CAACA;gBAEDA,IAAIA,CAACA,UAAUA,CAACA,SAASA,CAACA,CAACA,SAASA,CAACA,SAASA,CAACA,OAAOA,CAACA,CAACA;YAC5DA,CAACA;YACMH,iCAAUA,GAAjBA,UAAkBA,SAAiBA,EAAEA,MAAiBA,EAAEA,IAAiCA;gBAApDI,sBAAiBA,GAAjBA,aAAiBA;gBAAEA,oBAAiCA,GAAjCA,OAAkBA,iBAASA,CAACA,KAAKA;gBACrFA,EAAEA,CAACA,CAACA,CAACA,IAAIA,CAACA,UAAUA,CAACA,cAAcA,CAACA,SAASA,CAACA,CAACA;oBAACA,MAAMA,CAACA;gBACvDA,IAAIA,CAACA,UAAUA,CAACA,SAASA,CAACA,CAACA,SAASA,CAACA,KAAKA,CAACA,MAAMA,EAAEA,IAAIA,CAACA,CAACA;YAE7DA,CAACA;YACMJ,yCAAkBA,GAAzBA,UAA+CA,SAAiBA,EAAEA,OAAwBA;gBACtFK,EAAEA,CAACA,CAACA,CAACA,IAAIA,CAACA,UAAUA,CAACA,cAAcA,CAACA,SAASA,CAACA,CAACA;oBAACA,MAAMA,CAACA;gBAEvDA,IAAIA,CAACA,UAAUA,CAACA,SAASA,CAACA,CAACA,SAASA,CAACA,WAAWA,CAACA,OAAOA,CAACA,CAACA;YAC9DA,CAACA;YAKLL,mBAACA;QAADA,CAACA,AAxCDJ,IAwCCA;QAEDA,OAAOA,CAACA,OAAOA,GAAGA,EAAEA,CAACA;QACrBA;YACIU,MAAMA,CAACA,IAAIA,YAAYA,EAAEA,CAAAA;QAC7BA,CAACA;QACDV,OAAOA,CAACA,MAAMA,CAACA,WAAWA,EAACA,EAAEA,CAACA;aACzBA,OAAOA,CAACA,wBAAwBA,EAAEA,OAAOA,CAACA,CAAAA;IACnDA,CAACA,EA5EUD,KAAKA,GAALA,SAAKA,KAALA,SAAKA,QA4EfA;AAADA,CAACA,EA5EM,GAAG,KAAH,GAAG,QA4ET"}
\ No newline at end of file
+{"version":3,"file":"EventManager.js","sourceRoot":"","sources":["EventManager.ts"],"names":[],"mappings":"AAwBA,IAAO,GAAG,CA4ET;AA5ED,WAAO,GAAG;IAAC,IAAA,KAAK,CA4Ef;IA5EU,WAAA,OAAK,EAAC,CAAC;QACd,YAAY,CAAA;QAcZ;YAOI,eAAY,QAA6B;gBACrC,IAAI,CAAC,UAAU,GAAG,QAAQ,CAAC;YAC/B,CAAC;YAPD,sBAAW,4BAAS;qBAApB;oBACI,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC;gBAC3B,CAAC;;;eAAA;YAOL,YAAC;QAAD,CAAC,AAXD,IAWC;QAED;YASI;gBACI,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;YACzB,CAAC;YAIM,+BAAQ,GAAf,UAAqC,SAAiB;gBAClD,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oBAC/C,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,IAAI,KAAK,CAAC,IAAI,gBAAQ,EAAK,CAAC,CAAC;YAC9D,CAAC;YACM,uCAAgB,GAAvB,UAA6C,SAAiB,EAAE,OAAwB;gBACpF,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;oBAC7C,IAAI,CAAC,QAAQ,CAAI,SAAS,CAAC,CAAC;gBAChC,CAAC;gBAED,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;YAC5D,CAAC;YACM,iCAAU,GAAjB,UAAkB,SAAiB,EAAE,MAAiB,EAAE,IAAiC;gBAApD,sBAAiB,GAAjB,aAAiB;gBAAE,oBAAiC,GAAjC,OAAkB,iBAAS,CAAC,KAAK;gBACrF,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oBAAC,MAAM,CAAC;gBACvD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;YAE7D,CAAC;YACM,yCAAkB,GAAzB,UAA+C,SAAiB,EAAE,OAAwB;gBACtF,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oBAAC,MAAM,CAAC;gBAEvD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC;YAC9D,CAAC;YAKL,mBAAC;QAAD,CAAC,AAxCD,IAwCC;QAED,OAAO,CAAC,OAAO,GAAG,EAAE,CAAC;QACrB;YACI,MAAM,CAAC,IAAI,YAAY,EAAE,CAAA;QAC7B,CAAC;QACD,OAAO,CAAC,MAAM,CAAC,WAAW,EAAC,EAAE,CAAC;aACzB,OAAO,CAAC,wBAAwB,EAAE,OAAO,CAAC,CAAA;IACnD,CAAC,EA5EU,KAAK,GAAL,SAAK,KAAL,SAAK,QA4Ef;AAAD,CAAC,EA5EM,GAAG,KAAH,GAAG,QA4ET"}
\ No newline at end of file
diff --git a/src/Services/HTTPServiceBase.js b/src/Services/HTTPServiceBase.js
index af712ba..d2733bd 100644
--- a/src/Services/HTTPServiceBase.js
+++ b/src/Services/HTTPServiceBase.js
@@ -13,7 +13,7 @@ var WiM;
                 return this.$http(request);
             };
             return HTTPServiceBase;
-        })();
+        }());
         Services.HTTPServiceBase = HTTPServiceBase;
     })(Services = WiM.Services || (WiM.Services = {}));
 })(WiM || (WiM = {}));
diff --git a/src/Services/HTTPServiceBase.js.map b/src/Services/HTTPServiceBase.js.map
index 1f40a89..16e2eed 100644
--- a/src/Services/HTTPServiceBase.js.map
+++ b/src/Services/HTTPServiceBase.js.map
@@ -1 +1 @@
-{"version":3,"file":"HTTPServiceBase.js","sourceRoot":"","sources":["HTTPServiceBase.ts"],"names":["WiM","WiM.Services","WiM.Services.HTTPServiceBase","WiM.Services.HTTPServiceBase.constructor","WiM.Services.HTTPServiceBase.Execute"],"mappings":"AAyBA,IAAO,GAAG,CA+BT;AA/BD,WAAO,GAAG;IAACA,IAAAA,QAAQA,CA+BlBA;IA/BUA,WAAAA,QAAQA,EAAAA,CAACA;QAChBC,YAAYA,CAACA;QAMbA;YAQIC,yBAAYA,IAAqBA,EAAEA,OAAcA;gBAC7CC,IAAIA,CAACA,OAAOA,GAAGA,OAAOA,CAACA;gBACvBA,IAAIA,CAACA,KAAKA,GAAGA,IAAIA,CAACA;YACtBA,CAACA;YAIMD,iCAAOA,GAAdA,UAAkBA,OAA4BA;gBAE1CE,OAAOA,CAACA,GAAGA,GAAGA,OAAOA,CAACA,eAAeA,GAAGA,OAAOA,CAACA,GAAGA,GAAEA,IAAIA,CAACA,OAAOA,GAAGA,OAAOA,CAACA,GAAGA,CAACA;gBAChFA,MAAMA,CAACA,IAAIA,CAACA,KAAKA,CAACA,OAAOA,CAACA,CAACA;YAC/BA,CAACA;YAILF,sBAACA;QAADA,CAACA,AAvBDD,IAuBCA;QAvBYA,wBAAeA,kBAuB3BA,CAAAA;IACLA,CAACA,EA/BUD,QAAQA,GAARA,YAAQA,KAARA,YAAQA,QA+BlBA;AAADA,CAACA,EA/BM,GAAG,KAAH,GAAG,QA+BT"}
\ No newline at end of file
+{"version":3,"file":"HTTPServiceBase.js","sourceRoot":"","sources":["HTTPServiceBase.ts"],"names":[],"mappings":"AAyBA,IAAO,GAAG,CA+BT;AA/BD,WAAO,GAAG;IAAC,IAAA,QAAQ,CA+BlB;IA/BU,WAAA,QAAQ,EAAA,CAAC;QAChB,YAAY,CAAC;QAMb;YAQI,yBAAY,IAAqB,EAAE,OAAc;gBAC7C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;gBACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;YACtB,CAAC;YAIM,iCAAO,GAAd,UAAkB,OAA4B;gBAE1C,OAAO,CAAC,GAAG,GAAG,OAAO,CAAC,eAAe,GAAG,OAAO,CAAC,GAAG,GAAE,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;gBAChF,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;YAC/B,CAAC;YAIL,sBAAC;QAAD,CAAC,AAvBD,IAuBC;QAvBY,wBAAe,kBAuB3B,CAAA;IACL,CAAC,EA/BU,QAAQ,GAAR,YAAQ,KAAR,YAAQ,QA+BlB;AAAD,CAAC,EA/BM,GAAG,KAAH,GAAG,QA+BT"}
\ No newline at end of file
diff --git a/src/Services/Helpers/RequestInfo.js b/src/Services/Helpers/RequestInfo.js
index 2a4e67d..5474a4c 100644
--- a/src/Services/Helpers/RequestInfo.js
+++ b/src/Services/Helpers/RequestInfo.js
@@ -21,7 +21,7 @@ var WiM;
                     this.data = data;
                 }
                 return RequestInfo;
-            })();
+            }());
             Helpers.RequestInfo = RequestInfo;
             (function (methodType) {
                 methodType[methodType["GET"] = 0] = "GET";
diff --git a/src/Services/Helpers/RequestInfo.js.map b/src/Services/Helpers/RequestInfo.js.map
index 4293e89..ce53f00 100644
--- a/src/Services/Helpers/RequestInfo.js.map
+++ b/src/Services/Helpers/RequestInfo.js.map
@@ -1 +1 @@
-{"version":3,"file":"RequestInfo.js","sourceRoot":"","sources":["RequestInfo.ts"],"names":["WiM","WiM.Services","WiM.Services.Helpers","WiM.Services.Helpers.RequestInfo","WiM.Services.Helpers.RequestInfo.constructor","WiM.Services.Helpers.methodType"],"mappings":"AAAA,IAAO,GAAG,CA8BT;AA9BD,WAAO,GAAG;IAACA,IAAAA,QAAQA,CA8BlBA;IA9BUA,WAAAA,QAAQA;QAACC,IAAAA,OAAOA,CA8B1BA;QA9BmBA,WAAAA,OAAOA,EAACA,CAACA;YACzBC;gBAYIC,qBAAYA,EAAUA,EAAEA,eAAgCA,EAAEA,IAAiCA,EAAEA,KAAsBA,EAAEA,IAAgBA,EAAEA,OAAmBA,EAAEA,QAAoBA;oBAAxJC,+BAAgCA,GAAhCA,uBAAgCA;oBAAEA,oBAAiCA,GAAjCA,OAAmBA,UAAUA,CAACA,GAAGA;oBAAEA,qBAAsBA,GAAtBA,cAAsBA;oBAAEA,oBAAgBA,GAAhBA,WAAgBA;oBAAEA,uBAAmBA,GAAnBA,cAAmBA;oBAAEA,wBAAoBA,GAApBA,eAAoBA;oBAC5KA,IAAIA,CAACA,GAAGA,GAAGA,EAAEA,CAACA;oBACdA,IAAIA,CAACA,eAAeA,GAAGA,eAAeA,CAACA;oBACvCA,IAAIA,CAACA,MAAMA,GAAGA,UAAUA,CAACA,IAAIA,CAACA,CAACA;oBAC/BA,IAAIA,CAACA,QAAQA,GAAGA,KAAKA,CAACA;oBACtBA,IAAIA,CAACA,gBAAgBA,GAAGA,QAAQA,CAACA;oBACjCA,IAAIA,CAACA,OAAOA,GAAGA,OAAOA,CAACA;oBAEvBA,IAAIA,CAACA,IAAIA,GAAGA,IAAIA,CAACA;gBACrBA,CAACA;gBACLD,kBAACA;YAADA,CAACA,AAtBDD,IAsBCA;YAtBYA,mBAAWA,cAsBvBA,CAAAA;YACDA,WAAYA,UAAUA;gBAClBG,yCAAGA,CAAAA;gBACHA,2CAAIA,CAAAA;gBACJA,yCAAGA,CAAAA;gBACHA,+CAAMA,CAAAA;YACVA,CAACA,EALWH,kBAAUA,KAAVA,kBAAUA,QAKrBA;YALDA,IAAYA,UAAUA,GAAVA,kBAKXA,CAAAA;QACLA,CAACA,EA9BmBD,OAAOA,GAAPA,gBAAOA,KAAPA,gBAAOA,QA8B1BA;IAADA,CAACA,EA9BUD,QAAQA,GAARA,YAAQA,KAARA,YAAQA,QA8BlBA;AAADA,CAACA,EA9BM,GAAG,KAAH,GAAG,QA8BT"}
\ No newline at end of file
+{"version":3,"file":"RequestInfo.js","sourceRoot":"","sources":["RequestInfo.ts"],"names":[],"mappings":"AAAA,IAAO,GAAG,CA8BT;AA9BD,WAAO,GAAG;IAAC,IAAA,QAAQ,CA8BlB;IA9BU,WAAA,QAAQ;QAAC,IAAA,OAAO,CA8B1B;QA9BmB,WAAA,OAAO,EAAC,CAAC;YACzB;gBAYI,qBAAY,EAAU,EAAE,eAAgC,EAAE,IAAiC,EAAE,KAAsB,EAAE,IAAgB,EAAE,OAAmB,EAAE,QAAoB;oBAAxJ,+BAAgC,GAAhC,uBAAgC;oBAAE,oBAAiC,GAAjC,OAAmB,UAAU,CAAC,GAAG;oBAAE,qBAAsB,GAAtB,cAAsB;oBAAE,oBAAgB,GAAhB,WAAgB;oBAAE,uBAAmB,GAAnB,cAAmB;oBAAE,wBAAoB,GAApB,eAAoB;oBAC5K,IAAI,CAAC,GAAG,GAAG,EAAE,CAAC;oBACd,IAAI,CAAC,eAAe,GAAG,eAAe,CAAC;oBACvC,IAAI,CAAC,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;oBAC/B,IAAI,CAAC,QAAQ,GAAG,KAAK,CAAC;oBACtB,IAAI,CAAC,gBAAgB,GAAG,QAAQ,CAAC;oBACjC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;oBAEvB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;gBACrB,CAAC;gBACL,kBAAC;YAAD,CAAC,AAtBD,IAsBC;YAtBY,mBAAW,cAsBvB,CAAA;YACD,WAAY,UAAU;gBAClB,yCAAG,CAAA;gBACH,2CAAI,CAAA;gBACJ,yCAAG,CAAA;gBACH,+CAAM,CAAA;YACV,CAAC,EALW,kBAAU,KAAV,kBAAU,QAKrB;YALD,IAAY,UAAU,GAAV,kBAKX,CAAA;QACL,CAAC,EA9BmB,OAAO,GAAP,gBAAO,KAAP,gBAAO,QA8B1B;IAAD,CAAC,EA9BU,QAAQ,GAAR,YAAQ,KAAR,YAAQ,QA8BlB;AAAD,CAAC,EA9BM,GAAG,KAAH,GAAG,QA8BT"}
\ No newline at end of file
diff --git a/src/Services/SearchAPIService.js b/src/Services/SearchAPIService.js
index 34b71d2..719b1de 100644
--- a/src/Services/SearchAPIService.js
+++ b/src/Services/SearchAPIService.js
@@ -16,7 +16,7 @@ var WiM;
                 this.selectedAreaOfInterest = aoi;
             }
             return SearchAPIEventArgs;
-        })(WiM.Event.EventArgs);
+        }(WiM.Event.EventArgs));
         Services.SearchAPIEventArgs = SearchAPIEventArgs;
         var SearchLocation = (function () {
             function SearchLocation(nm, ct, st, lat, long) {
@@ -28,12 +28,12 @@ var WiM;
                 this.crs = "4326";
             }
             return SearchLocation;
-        })();
+        }());
         var SearchConfig = (function () {
             function SearchConfig() {
             }
             return SearchConfig;
-        })();
+        }());
         var SearchAPIService = (function (_super) {
             __extends(SearchAPIService, _super);
             function SearchAPIService($http, $q, eventManager) {
@@ -124,7 +124,7 @@ var WiM;
                 this.config.state = '';
             };
             return SearchAPIService;
-        })(Services.HTTPServiceBase);
+        }(Services.HTTPServiceBase));
         factory.$inject = ['$http', '$q', 'WiM.Event.EventManager'];
         function factory($http, $q, eventManager) {
             return new SearchAPIService($http, $q, eventManager);
diff --git a/src/Services/SearchAPIService.js.map b/src/Services/SearchAPIService.js.map
index ca7a705..498672f 100644
--- a/src/Services/SearchAPIService.js.map
+++ b/src/Services/SearchAPIService.js.map
@@ -1 +1 @@
-{"version":3,"file":"SearchAPIService.js","sourceRoot":"","sources":["SearchAPIService.ts"],"names":["WiM","WiM.Services","WiM.Services.SearchAPIEventArgs","WiM.Services.SearchAPIEventArgs.constructor","WiM.Services.SearchLocation","WiM.Services.SearchLocation.constructor","WiM.Services.SearchConfig","WiM.Services.SearchConfig.constructor","WiM.Services.SearchAPIService","WiM.Services.SearchAPIService.constructor","WiM.Services.SearchAPIService.loadSearchAPI","WiM.Services.SearchAPIService.setSearchAPI","WiM.Services.SearchAPIService.getLocations","WiM.Services.SearchAPIService.init","WiM.Services.factory"],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"SearchAPIService.js","sourceRoot":"","sources":["SearchAPIService.ts"],"names":[],"mappings":"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"}
\ No newline at end of file