diff --git a/angular-material/angular-material-0.9.0.d.ts b/angular-material/angular-material-0.9.0.d.ts
index 06c1ecf25f..1383b0beb5 100644
--- a/angular-material/angular-material-0.9.0.d.ts
+++ b/angular-material/angular-material-0.9.0.d.ts
@@ -150,8 +150,8 @@ declare module angular.material {
         A400?: string;
         A700?: string;
         contrastDefaultColor?: string;
-        contrastDarkColors?: string;
-        contrastStrongLightColors?: string;
+        contrastDarkColors?: string|string[];
+        contrastLightColors?: string|string[];
     }
 
     interface MDThemeHues {
diff --git a/angular-material/angular-material.d.ts b/angular-material/angular-material.d.ts
index 17f8328e12..aba83a86f8 100644
--- a/angular-material/angular-material.d.ts
+++ b/angular-material/angular-material.d.ts
@@ -144,7 +144,7 @@ declare module angular.material {
 
     interface IToastService {
         show(optionsOrPreset: IToastOptions|IToastPreset<any>): angular.IPromise<any>;
-        showSimple(): angular.IPromise<any>;
+        showSimple(content: string): angular.IPromise<any>;
         simple(): ISimpleToastPreset;
         build(): IToastPreset<any>;
         updateContent(): void;
diff --git a/angular-ui-router/angular-ui-router.d.ts b/angular-ui-router/angular-ui-router.d.ts
index acc9342d92..ed2f36ccfc 100644
--- a/angular-ui-router/angular-ui-router.d.ts
+++ b/angular-ui-router/angular-ui-router.d.ts
@@ -20,7 +20,7 @@ declare module angular.ui {
         /**
          * Function, returns HTML content string
          */
-        templateProvider?: Function;
+        templateProvider?: Function | Array<any>;
         /**
          * A controller paired to the state. Function OR name as String
          */
@@ -41,7 +41,7 @@ declare module angular.ui {
         /**
          * A url with optional parameters. When a state is navigated or transitioned to, the $stateParams service will be populated with any parameters that were passed.
          */
-        url?: string;
+        url?: string | IUrlMatcher;
         /**
          * A map which optionally configures parameters declared in the url, or defines additional non-url parameters. Only use this within a state if you are not using url. Otherwise you can specify your parameters within the url. When a state is navigated or transitioned to, the $stateParams service will be populated with any parameters that were passed.
          */
@@ -88,6 +88,9 @@ declare module angular.ui {
         compile(pattern: string): IUrlMatcher;
         isMatcher(o: any): boolean;
         type(name: string, definition: any, definitionFn?: any): any;
+        caseInsensitive(value: boolean): void;
+        defaultSquashPolicy(value: string): void;
+        strictMode(value: boolean): void;
     }
 
     interface IUrlRouterProvider extends angular.IServiceProvider {
diff --git a/angular.throttle/angular.throttle-tests.ts b/angular.throttle/angular.throttle-tests.ts
new file mode 100644
index 0000000000..2234adbc37
--- /dev/null
+++ b/angular.throttle/angular.throttle-tests.ts
@@ -0,0 +1,8 @@
+/// <reference path="angular.throttle.d.ts" />
+/// <reference path='../angularjs/angular.d.ts' />
+
+var throttledFn = angular.throttle(function (someArg:any) {
+    return someArg;
+}, 100);
+
+var result = throttledFn(10);
diff --git a/angular.throttle/angular.throttle.d.ts b/angular.throttle/angular.throttle.d.ts
new file mode 100644
index 0000000000..0a3033e67a
--- /dev/null
+++ b/angular.throttle/angular.throttle.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for angular.throttle
+// Project: https://github.com/BaggersIO/angular.throttle
+// Definitions by: Stefan Steinhart <https://github.com/reppners>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path='../angularjs/angular.d.ts' />
+
+declare module angular {
+	interface IAngularStatic {
+		throttle:( fn:Function, throttle:number, options?:{leading?:boolean; trailing?:boolean;} ) => Function;
+	}
+}
diff --git a/angular2/angular2-2.0.0-alpha.30.d.ts b/angular2/angular2-2.0.0-alpha.30.d.ts
new file mode 100644
index 0000000000..ecbcae245c
--- /dev/null
+++ b/angular2/angular2-2.0.0-alpha.30.d.ts
@@ -0,0 +1,6875 @@
+// Type definitions for Angular v2.0.0-alpha.30
+// Project: http://angular.io/
+// Definitions by: angular team <https://github.com/angular/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// ***********************************************************
+// This file is generated by the Angular build process.
+// Please do not create manual edits or send pull requests
+// modifying this file.
+// ***********************************************************
+
+// Angular depends transitively on these libraries.
+// If you don't have them installed you can run
+// $ tsd query es6-promise rx rx-lite --action install --save
+///<reference path="../es6-promise/es6-promise.d.ts"/>
+///<reference path="../rx/rx.d.ts"/>
+
+interface List<T> extends Array<T> {}
+interface Map<K,V> {}
+interface StringMap<K,V> extends Map<K,V> {}
+
+declare module ng {
+  type SetterFn = typeof Function;
+  type int = number;
+  interface Type extends Function {
+    // new (...args);
+  }
+
+  // See https://github.com/Microsoft/TypeScript/issues/1168
+  class BaseException /* extends Error */ {
+    message: string;
+    stack: string;
+    toString(): string;
+  }
+}
+
+
+
+declare module ng {
+
+  /**
+   * `DependencyAnnotation` is used by the framework to extend DI.
+   * 
+   * Only annotations implementing `DependencyAnnotation` are added to the list of dependency
+   * properties.
+   * 
+   * For example:
+   * 
+   * ```
+   * class Parent extends DependencyAnnotation {}
+   * class NotDependencyProperty {}
+   * 
+   * class AComponent {
+   *   constructor(@Parent @NotDependencyProperty aService:AService) {}
+   * }
+   * ```
+   * 
+   * will create the following dependency:
+   * 
+   * ```
+   * new Dependency(Key.get(AService), [new Parent()])
+   * ```
+   * 
+   * The framework can use `new Parent()` to handle the `aService` dependency
+   * in a specific way.
+   * 
+   * @exportedAs angular2/di_annotations
+   */
+  class DependencyAnnotation {
+    
+     token: void;
+  }
+  
+
+  /**
+   * Lifecycle events are guaranteed to be called in the following order:
+   * - `onChange` (optional if any bindings have changed),
+   * - `onInit` (optional after the first check only),
+   * - `onCheck`,
+   * - `onAllChangesDone`
+   */
+  class LifecycleEvent {
+    
+     name: string;
+  }
+  
+
+  /**
+   * An interface that <a href='/angular2/angular2.api/NgFormModel'><code>NgFormModel</code></a> and <a href='/angular2/angular2.api/NgForm'><code>NgForm</code></a> implement.
+   * 
+   * Only used by the forms module.
+   */
+  interface Form {
+    
+     addControl(dir: NgControl): void;
+    
+     removeControl(dir: NgControl): void;
+    
+     getControl(dir: NgControl): Control;
+    
+     addControlGroup(dir: NgControlGroup): void;
+    
+     removeControlGroup(dir: NgControlGroup): void;
+    
+     updateModel(dir: NgControl, value: any): void;
+  }
+  
+
+  /**
+   * An interface implemented by all Angular type decorators, which allows them to be used as ES7
+   * decorators as well as
+   * Angular DSL syntax.
+   * 
+   * DSL syntax:
+   * 
+   * ```
+   * var MyClass = ng
+   *   .Component({...})
+   *   .View({...})
+   *   .Class({...});
+   * ```
+   * 
+   * ES7 syntax:
+   * 
+   * ```
+   * @ng.Component({...})
+   * @ng.View({...})
+   * class MyClass {...}
+   * ```
+   */
+  interface TypeDecorator {
+    
+
+    /**
+     * Invoke as ES7 decorator.
+     */
+     <T extends Type>(type: T): T;
+  
+    
+
+    /**
+     * Storage for the accumulated annotations so far used by the DSL syntax.
+     * 
+     * Used by <a href='/angular2/angular2.api/Class'><code>Class</code></a> to annotate the generated class.
+     */
+     annotations: Array<any>;
+    
+
+    /**
+     * Generate a class from the definition and annotate it with <a href='/angular2/angular2.api/TypeDecorator#annotations'><code>TypeDecorator</code></a>.
+     */
+     Class(obj: ClassDefinition): Type;
+  }
+  
+
+  /**
+   * Declares the interface to be used with <a href='/angular2/angular2.api/Class'><code>Class</code></a>.
+   */
+  interface ClassDefinition {
+    
+
+    /**
+     * Optional argument for specifying the superclass.
+     */
+     extends?: Type;
+    
+
+    /**
+     * Required constructor function for a class.
+     * 
+     * The function may be optionall wrapped in an `Array`, in which case additional parameter
+     * annotations may be
+     * specified. The number of arguments and the number of paramater annotations must match.
+     * 
+     * See <a href='/angular2/angular2.api/Class'><code>Class</code></a> for example of usage.
+     */
+     constructor: (Function | Array<any>);
+  }
+  
+
+  /**
+   * Specifies that a <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a> should be injected.
+   * 
+   * See <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a> for usage and example.
+   * 
+   * @exportedAs angular2/annotations
+   */
+  class Query extends DependencyAnnotation {
+    
+     descendants: boolean;
+    
+     selector: void;
+    
+     isVarBindingQuery: boolean;
+    
+     varBindings: List<string>;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * A directive that contains a group of [NgControl].
+   * 
+   * Only used by the forms module.
+   */
+  class ControlContainer {
+    
+     name: string;
+    
+     formDirective: Form;
+    
+     path: List<string>;
+  }
+  
+
+  /**
+   * A marker annotation that marks a class as available to `Injector` for creation. Used by tooling
+   * for generating constructor stubs.
+   * 
+   * ```
+   * class NeedsService {
+   *   constructor(svc:UsefulService) {}
+   * }
+   * 
+   * @Injectable
+   * class UsefulService {}
+   * ```
+   * @exportedAs angular2/di_annotations
+   */
+  class Injectable {
+    
+     visibility: Visibility;
+  }
+  
+
+  /**
+   * Specifies how injector should resolve a dependency.
+   * 
+   * See <a href='/angular2/angular2.api/Self'><code>Self</code></a>, <a href='/angular2/angular2.api/Parent'><code>Parent</code></a>, <a href='/angular2/angular2.api/Ancestor'><code>Ancestor</code></a>, <a href='/angular2/angular2.api/Unbounded'><code>Unbounded</code></a>.
+   * 
+   * @exportedAs angular2/di_annotations
+   */
+  class Visibility {
+    
+     depth: number;
+    
+     crossBoundaries: boolean;
+    
+     includeSelf: boolean;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Injectable Objects that contains a live list of child directives in the light Dom of a directive.
+   * The directives are kept in depth-first pre-order traversal of the DOM.
+   * 
+   * In the future this class will implement an Observable interface.
+   * For now it uses a plain list of observable callbacks.
+   * 
+   * @exportedAs angular2/view
+   */
+  class BaseQueryList<T> {
+    
+     reset(newList: any): void;
+    
+     add(obj: any): void;
+    
+     fireCallbacks(): void;
+    
+     onChange(callback: any): void;
+    
+     removeCallback(callback: any): void;
+    
+     length: void;
+    
+     first: void;
+    
+     last: void;
+  }
+  
+  class AppProtoView {
+    
+     elementBinders: List<ElementBinder>;
+    
+     protoLocals: Map<string, any>;
+    
+     render: RenderProtoViewRef;
+    
+     protoChangeDetector: ProtoChangeDetector;
+    
+     variableBindings: Map<string, string>;
+    
+     variableLocations: Map<string, number>;
+    
+     bindElement(parent: ElementBinder, distanceToParent: int, protoElementInjector: ProtoElementInjector, componentDirective?: DirectiveBinding): ElementBinder;
+    
+
+    /**
+     * Adds an event binding for the last created ElementBinder via bindElement.
+     * 
+     * If the directive index is a positive integer, the event is evaluated in the context of
+     * the given directive.
+     * 
+     * If the directive index is -1, the event is evaluated in the context of the enclosing view.
+     * 
+     * @param {string} eventName
+     * @param {AST} expression
+     * @param {int} directiveIndex The directive index in the binder or -1 when the event is not bound
+     *                             to a directive
+     */
+     bindEvent(eventBindings: List<EventBinding>, boundElementIndex: number, directiveIndex?: int): void;
+  }
+  
+
+  /**
+   * Cost of making objects: http://jsperf.com/instantiate-size-of-object
+   */
+  class AppView implements ChangeDispatcher,  EventDispatcher {
+    
+     render: RenderViewRef;
+    
+     rootElementInjectors: List<ElementInjector>;
+    
+     elementInjectors: List<ElementInjector>;
+    
+     changeDetector: ChangeDetector;
+    
+     componentChildViews: List<AppView>;
+    
+     viewContainers: List<AppViewContainer>;
+    
+     preBuiltObjects: List<PreBuiltObjects>;
+    
+     elementRefs: List<ElementRef>;
+    
+     ref: ViewRef;
+    
+
+    /**
+     * The context against which data-binding expressions in this view are evaluated against.
+     * This is always a component instance.
+     */
+     context: any;
+    
+
+    /**
+     * Variables, local to this view, that can be used in binding expressions (in addition to the
+     * context). This is used for thing like `<video #player>` or
+     * `<li template="for #item of items">`, where "player" and "item" are locals, respectively.
+     */
+     locals: Locals;
+    
+     renderer: Renderer;
+    
+     proto: AppProtoView;
+    
+     init(changeDetector: ChangeDetector, elementInjectors: List<ElementInjector>, rootElementInjectors: List<ElementInjector>, preBuiltObjects: List<PreBuiltObjects>, componentChildViews: List<AppView>): void;
+    
+     setLocal(contextName: string, value: any): void;
+    
+     hydrated(): boolean;
+    
+
+    /**
+     * Triggers the event handlers for the element and the directives.
+     * 
+     * This method is intended to be called from directive EventEmitters.
+     * 
+     * @param {string} eventName
+     * @param {*} eventObj
+     * @param {int} binderIndex
+     */
+     triggerEventHandlers(eventName: string, eventObj: any, binderIndex: int): void;
+    
+     notifyOnBinding(b: BindingRecord, currentValue: any): void;
+    
+     notifyOnAllChangesDone(): void;
+    
+     getDirectiveFor(directive: DirectiveIndex): any;
+    
+     getDetectorFor(directive: DirectiveIndex): any;
+    
+     invokeElementMethod(elementIndex: number, methodName: string, args: List<any>): void;
+    
+     dispatchEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
+  }
+  
+  class AppViewContainer {
+    
+     views: List<AppView>;
+  }
+  
+  class DehydratedException extends BaseException {
+  }
+  
+  class ExpressionChangedAfterItHasBeenChecked extends BaseException {
+  }
+  
+  class ChangeDetectionError extends BaseException {
+    
+     location: string;
+  }
+  
+
+  /**
+   * Interface used by Angular to control the change detection strategy for an application.
+   * 
+   * Angular implements the following change detection strategies by default:
+   * 
+   * - <a href='/angular2/angular2.api/DynamicChangeDetection'><code>DynamicChangeDetection</code></a>: slower, but does not require `eval()`.
+   * - <a href='/angular2/angular2.api/JitChangeDetection'><code>JitChangeDetection</code></a>: faster, but requires `eval()`.
+   * 
+   * In JavaScript, you should always use `JitChangeDetection`, unless you are in an environment that
+   * has
+   * [CSP](https://developer.mozilla.org/en-US/docs/Web/Security/CSP), such as a Chrome Extension.
+   * 
+   * In Dart, use `DynamicChangeDetection` during development. The Angular transformer generates an
+   * analog to the
+   * `JitChangeDetection` strategy at compile time.
+   * 
+   * 
+   * See: <a href='/angular2/angular2.api/DynamicChangeDetection'><code>DynamicChangeDetection</code></a>, <a href='/angular2/angular2.api/JitChangeDetection'><code>JitChangeDetection</code></a>,
+   * <a href='/angular2/angular2.api/PreGeneratedChangeDetection'><code>PreGeneratedChangeDetection</code></a>
+   * 
+   * # Example
+   * ```javascript
+   * bootstrap(MyApp, [bind(ChangeDetection).toClass(DynamicChangeDetection)]);
+   * ```
+   * @exportedAs angular2/change_detection
+   */
+  class ChangeDetection {
+    
+     createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
+  }
+  
+
+  /**
+   * ON_PUSH means that the change detector's mode will be set to CHECK_ONCE during hydration.
+   */
+  var ON_PUSH:any;
+  
+
+  /**
+   * DEFAULT means that the change detector's mode will be set to CHECK_ALWAYS during hydration.
+   */
+  var DEFAULT:any;
+  
+
+  /**
+   * Controls change detection.
+   * 
+   * <a href='/angular2/angular2.api/ChangeDetectorRef'><code>ChangeDetectorRef</code></a> allows requesting checks for detectors that rely on observables. It
+   * also allows detaching and
+   * attaching change detector subtrees.
+   * 
+   * @exportedAs angular2/change_detection
+   */
+  class ChangeDetectorRef {
+    
+
+    /**
+     * Request to check all ON_PUSH ancestors.
+     */
+     requestCheck(): void;
+    
+
+    /**
+     * Detaches the change detector from the change detector tree.
+     * 
+     * The detached change detector will not be checked until it is reattached.
+     */
+     detach(): void;
+    
+
+    /**
+     * Reattach the change detector to the change detector tree.
+     * 
+     * This also requests a check of this change detector. This reattached change detector will be
+     * checked during the
+     * next change detection run.
+     */
+     reattach(): void;
+  }
+  
+  class PipeRegistry {
+    
+     config: void;
+    
+     get(type: string, obj: any, cdRef?: ChangeDetectorRef, existingPipe?: Pipe): Pipe;
+  }
+  
+
+  /**
+   * Indicates that the result of a <a href='/angular2/angular2.api/Pipe'><code>Pipe</code></a> transformation has changed even though the reference
+   * has not changed.
+   * 
+   * The wrapped value will be unwrapped by change detection, and the unwrapped value will be stored.
+   * 
+   * @exportedAs angular2/pipes
+   */
+  class WrappedValue {
+    
+     wrapped: any;
+  }
+  
+
+  /**
+   * An interface for extending the list of pipes known to Angular.
+   * 
+   * If you are writing a custom <a href='/angular2/angular2.api/Pipe'><code>Pipe</code></a>, you must extend this interface.
+   * 
+   * #Example
+   * 
+   * ```
+   * class DoublePipe implements Pipe {
+   *  supports(obj) {
+   *    return true;
+   *  }
+   * 
+   *  onDestroy() {}
+   * 
+   *  transform(value, args = []) {
+   *    return `${value}${value}`;
+   *  }
+   * }
+   * ```
+   * 
+   * @exportedAs angular2/pipes
+   */
+  interface Pipe {
+    
+     supports(obj: any): boolean;
+    
+     onDestroy(): void;
+    
+     transform(value: any, args: List<any>): any;
+  }
+  
+  interface PipeFactory {
+    
+     supports(obs: any): boolean;
+    
+     create(cdRef: ChangeDetectorRef): Pipe;
+  }
+  
+
+  /**
+   * @exportedAs angular2/pipes
+   */
+  class NullPipe extends BasePipe {
+    
+     called: boolean;
+    
+     supports(obj: any): boolean;
+    
+     transform(value: any, args?: List<any>): WrappedValue;
+  }
+  
+
+  /**
+   * @exportedAs angular2/pipes
+   */
+  class NullPipeFactory implements PipeFactory {
+    
+     supports(obj: any): boolean;
+    
+     create(cdRef: ChangeDetectorRef): Pipe;
+  }
+  
+  var defaultPipes:any;
+  
+
+  /**
+   * Implements change detection that does not require `eval()`.
+   * 
+   * This is slower than <a href='/angular2/angular2.api/JitChangeDetection'><code>JitChangeDetection</code></a>.
+   * 
+   * @exportedAs angular2/change_detection
+   */
+  class DynamicChangeDetection extends ChangeDetection {
+    
+     registry: PipeRegistry;
+    
+     createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
+  }
+  
+
+  /**
+   * Implements faster change detection by generating source code.
+   * 
+   * This requires `eval()`. For change detection that does not require `eval()`, see
+   * <a href='/angular2/angular2.api/DynamicChangeDetection'><code>DynamicChangeDetection</code></a> and <a href='/angular2/angular2.api/PreGeneratedChangeDetection'><code>PreGeneratedChangeDetection</code></a>.
+   * 
+   * @exportedAs angular2/change_detection
+   */
+  class JitChangeDetection extends ChangeDetection {
+    
+     registry: PipeRegistry;
+    
+     createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
+  }
+  
+
+  /**
+   * Implements change detection using a map of pregenerated proto detectors.
+   * 
+   * @exportedAs angular2/change_detection
+   */
+  class PreGeneratedChangeDetection extends ChangeDetection {
+    
+     registry: PipeRegistry;
+    
+     createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
+  }
+  
+
+  /**
+   * Map from <a href='/angular2/angular2.api/ChangeDetectorDefinition#id'><code>ChangeDetectorDefinition</code></a> to a factory method which takes a
+   * <a href='/angular2/angular2.api/PipeRegistry'><code>PipeRegistry</code></a> and a <a href='/angular2/angular2.api/ChangeDetectorDefinition'><code>ChangeDetectorDefinition</code></a> and generates a
+   * <a href='/angular2/angular2.api/ProtoChangeDetector'><code>ProtoChangeDetector</code></a> associated with the definition.
+   */
+  var preGeneratedProtoDetectors : StringMap<string, Function> ;
+  
+  var defaultPipeRegistry : PipeRegistry ;
+  
+  class DirectiveIndex {
+    
+     elementIndex: number;
+    
+     directiveIndex: number;
+    
+     name: void;
+  }
+  
+  class BindingRecord {
+    
+     mode: string;
+    
+     implicitReceiver: any;
+    
+     ast: AST;
+    
+     elementIndex: number;
+    
+     propertyName: string;
+    
+     propertyUnit: string;
+    
+     setter: SetterFn;
+    
+     lifecycleEvent: string;
+    
+     directiveRecord: DirectiveRecord;
+    
+     callOnChange(): boolean;
+    
+     isOnPushChangeDetection(): boolean;
+    
+     isDirective(): boolean;
+    
+     isDirectiveLifecycle(): boolean;
+    
+     isElementProperty(): boolean;
+    
+     isElementAttribute(): boolean;
+    
+     isElementClass(): boolean;
+    
+     isElementStyle(): boolean;
+    
+     isTextNode(): boolean;
+  }
+  
+  interface ProtoChangeDetector {
+    
+     instantiate(dispatcher: any): ChangeDetector;
+  }
+  
+  interface ChangeDispatcher {
+    
+     notifyOnBinding(bindingRecord: BindingRecord, value: any): void;
+    
+     notifyOnAllChangesDone(): void;
+  }
+  
+  interface ChangeDetector {
+    
+     parent: ChangeDetector;
+    
+     mode: string;
+    
+     addChild(cd: ChangeDetector): void;
+    
+     addShadowDomChild(cd: ChangeDetector): void;
+    
+     removeChild(cd: ChangeDetector): void;
+    
+     removeShadowDomChild(cd: ChangeDetector): void;
+    
+     remove(): void;
+    
+     hydrate(context: any, locals: Locals, directives: any): void;
+    
+     dehydrate(): void;
+    
+     markPathToRootAsCheckOnce(): void;
+    
+     detectChanges(): void;
+    
+     checkNoChanges(): void;
+  }
+  
+  class Locals {
+    
+     parent: Locals;
+    
+     current: Map<any, any>;
+    
+     contains(name: string): boolean;
+    
+     get(name: string): any;
+    
+     set(name: string, value: any): void;
+    
+     clearValues(): void;
+  }
+  
+  class ChangeDetectorDefinition {
+    
+     id: string;
+    
+     strategy: string;
+    
+     variableNames: List<string>;
+    
+     bindingRecords: List<BindingRecord>;
+    
+     directiveRecords: List<DirectiveRecord>;
+  }
+  
+
+  /**
+   * Provides default implementation of supports and onDestroy.
+   * 
+   * #Example
+   * 
+   * ```
+   * class DoublePipe extends BasePipe {*
+   *  transform(value) {
+   *    return `${value}${value}`;
+   *  }
+   * }
+   * ```
+   */
+  class BasePipe implements Pipe {
+    
+     supports(obj: any): boolean;
+    
+     onDestroy(): void;
+    
+     transform(value: any, args: List<any>): any;
+  }
+  
+  class DirectiveRecord {
+    
+     directiveIndex: DirectiveIndex;
+    
+     callOnAllChangesDone: boolean;
+    
+     callOnChange: boolean;
+    
+     callOnCheck: boolean;
+    
+     callOnInit: boolean;
+    
+     changeDetection: string;
+    
+     isOnPushChangeDetection(): boolean;
+  }
+  
+  var Inject:any;
+  
+  var Optional:any;
+  
+
+  /**
+   * Allows to refer to references which are not yet defined.
+   * 
+   * This situation arises when the key which we need te refer to for the purposes of DI is declared,
+   * but not yet defined.
+   * 
+   * ## Example:
+   * 
+   * ```
+   * class Door {
+   *   // Incorrect way to refer to a reference which is defined later.
+   *   // This fails because `Lock` is undefined at this point.
+   *   constructor(lock:Lock) { }
+   * 
+   *   // Correct way to refer to a reference which is defined later.
+   *   // The reference needs to be captured in a closure.
+   *   constructor(@Inject(forwardRef(() => Lock)) lock:Lock) { }
+   * }
+   * 
+   * // Only at this point the lock is defined.
+   * class Lock {
+   * }
+   * ```
+   * 
+   * @exportedAs angular2/di
+   */
+  function forwardRef(forwardRefFn: ForwardRefFn) : Type ;
+  
+
+  /**
+   * Lazily retrieve the reference value.
+   * 
+   * See: <a href='/angular2/angular2.api/forwardRef'><code>forwardRef</code></a>
+   * 
+   * @exportedAs angular2/di
+   */
+  function resolveForwardRef(type: any) : any ;
+  
+  interface ForwardRefFn {
+    
+     (): any;
+  
+  }
+  
+
+  /**
+   * A dependency injection container used for resolving dependencies.
+   * 
+   * An `Injector` is a replacement for a `new` operator, which can automatically resolve the
+   * constructor dependencies.
+   * In typical use, application code asks for the dependencies in the constructor and they are
+   * resolved by the `Injector`.
+   * 
+   * ## Example:
+   * 
+   * Suppose that we want to inject an `Engine` into class `Car`, we would define it like this:
+   * 
+   * ```javascript
+   * class Engine {
+   * }
+   * 
+   * class Car {
+   *   constructor(@Inject(Engine) engine) {
+   *   }
+   * }
+   * 
+   * ```
+   * 
+   * Next we need to write the code that creates and instantiates the `Injector`. We then ask for the
+   * `root` object, `Car`, so that the `Injector` can recursively build all of that object's
+   * dependencies.
+   * 
+   * ```javascript
+   * main() {
+   *   var injector = Injector.resolveAndCreate([Car, Engine]);
+   * 
+   *   // Get a reference to the `root` object, which will recursively instantiate the tree.
+   *   var car = injector.get(Car);
+   * }
+   * ```
+   * Notice that we don't use the `new` operator because we explicitly want to have the `Injector`
+   * resolve all of the object's dependencies automatically.
+   * 
+   * @exportedAs angular2/di
+   */
+  class Injector {
+    
+
+    /**
+     * Retrieves an instance from the injector.
+     * 
+     * @param `token`: usually the `Type` of an object. (Same as the token used while setting up a
+     * binding).
+     * @returns an instance represented by the token. Throws if not found.
+     */
+     get(token: any): any;
+    
+
+    /**
+     * Retrieves an instance from the injector.
+     * 
+     * @param `token`: usually a `Type`. (Same as the token used while setting up a binding).
+     * @returns an instance represented by the token. Returns `null` if not found.
+     */
+     getOptional(token: any): any;
+    
+
+    /**
+     * Retrieves an instance from the injector.
+     * 
+     * @param `index`: index of an instance.
+     * @returns an instance represented by the index. Throws if not found.
+     */
+     getAt(index: number): any;
+    
+
+    /**
+     * Direct parent of this injector.
+     */
+     parent: Injector;
+    
+
+    /**
+     * Internal. Do not use.
+     * 
+     * We return `any` not to export the InjectorStrategy type.
+     */
+     internalStrategy: any;
+    
+
+    /**
+     * Creates a child injector and loads a new set of bindings into it.
+     * 
+     * A resolution is a process of flattening multiple nested lists and converting individual
+     * bindings into a list of <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>s. The resolution can be cached by `resolve`
+     * for the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> for performance-sensitive code.
+     * 
+     * @param `bindings` can be a list of `Type`, <a href='/angular2/angular2.api/Binding'><code>Binding</code></a>, <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>, or a
+     * recursive list of more bindings.
+     * @param `depProvider`
+     */
+     resolveAndCreateChild(bindings: List<Type | Binding | List<any>>, depProvider?: DependencyProvider): Injector;
+    
+
+    /**
+     * Creates a child injector and loads a new set of <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>s into it.
+     * 
+     * @param `bindings`: A sparse list of <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>s.
+     * See `resolve` for the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+     * @param `depProvider`
+     * @returns a new child <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+     */
+     createChildFromResolved(bindings: List<ResolvedBinding>, depProvider?: DependencyProvider): Injector;
+  }
+  
+  class ProtoInjector {
+    
+     distanceToParent: number;
+    
+     getBindingAtIndex(index: number): any;
+  }
+  
+
+  /**
+   * Describes how the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> should instantiate a given token.
+   * 
+   * See <a href='/angular2/angular2.api/bind'><code>bind</code></a>.
+   * 
+   * ## Example
+   * 
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   new Binding(String, { toValue: 'Hello' })
+   * ]);
+   * 
+   * expect(injector.get(String)).toEqual('Hello');
+   * ```
+   * 
+   * @exportedAs angular2/di
+   */
+  class Binding {
+    
+
+    /**
+     * Token used when retrieving this binding. Usually the `Type`.
+     */
+     token: void;
+    
+
+    /**
+     * Binds an interface to an implementation / subclass.
+     * 
+     * ## Example
+     * 
+     * Becuse `toAlias` and `toClass` are often confused, the example contains both use cases for easy
+     * comparison.
+     * 
+     * ```javascript
+     * 
+     * class Vehicle {}
+     * 
+     * class Car extends Vehicle {}
+     * 
+     * var injectorClass = Injector.resolveAndCreate([
+     *   Car,
+     *   new Binding(Vehicle, { toClass: Car })
+     * ]);
+     * var injectorAlias = Injector.resolveAndCreate([
+     *   Car,
+     *   new Binding(Vehicle, { toAlias: Car })
+     * ]);
+     * 
+     * expect(injectorClass.get(Vehicle)).not.toBe(injectorClass.get(Car));
+     * expect(injectorClass.get(Vehicle) instanceof Car).toBe(true);
+     * 
+     * expect(injectorAlias.get(Vehicle)).toBe(injectorAlias.get(Car));
+     * expect(injectorAlias.get(Vehicle) instanceof Car).toBe(true);
+     * ```
+     */
+     toClass: Type;
+    
+
+    /**
+     * Binds a key to a value.
+     * 
+     * ## Example
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(String, { toValue: 'Hello' })
+     * ]);
+     * 
+     * expect(injector.get(String)).toEqual('Hello');
+     * ```
+     */
+     toValue: void;
+    
+
+    /**
+     * Binds a key to the alias for an existing key.
+     * 
+     * An alias means that <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> returns the same instance as if the alias token was used.
+     * This is in contrast to `toClass` where a separate instance of `toClass` is returned.
+     * 
+     * ## Example
+     * 
+     * Becuse `toAlias` and `toClass` are often confused the example contains both use cases for easy
+     * comparison.
+     * 
+     * ```javascript
+     * 
+     * class Vehicle {}
+     * 
+     * class Car extends Vehicle {}
+     * 
+     * var injectorAlias = Injector.resolveAndCreate([
+     *   Car,
+     *   new Binding(Vehicle, { toAlias: Car })
+     * ]);
+     * var injectorClass = Injector.resolveAndCreate([
+     *   Car,
+     *   new Binding(Vehicle, { toClass: Car })
+     * ]);
+     * 
+     * expect(injectorAlias.get(Vehicle)).toBe(injectorAlias.get(Car));
+     * expect(injectorAlias.get(Vehicle) instanceof Car).toBe(true);
+     * 
+     * expect(injectorClass.get(Vehicle)).not.toBe(injectorClass.get(Car));
+     * expect(injectorClass.get(Vehicle) instanceof Car).toBe(true);
+     * ```
+     */
+     toAlias: void;
+    
+
+    /**
+     * Binds a key to a function which computes the value.
+     * 
+     * ## Example
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                         dependencies: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     */
+     toFactory: Function;
+    
+
+    /**
+     * Used in conjunction with `toFactory` and specifies a set of dependencies
+     * (as `token`s) which should be injected into the factory function.
+     * 
+     * ## Example
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   new Binding(Number, { toFactory: () => { return 1+2; }}),
+     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
+     *                         dependencies: [Number] })
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     */
+     dependencies: List<any>;
+    
+
+    /**
+     * Converts the <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> into <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>.
+     * 
+     * <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> internally only uses <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>, <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> contains
+     * convenience binding syntax.
+     */
+     resolve(): ResolvedBinding;
+  }
+  
+
+  /**
+   * Provides an API for imperatively constructing <a href='/angular2/angular2.api/Binding'><code>Binding</code></a>s.
+   * 
+   * This is only relevant for JavaScript. See <a href='/angular2/angular2.api/BindingBuilder'><code>BindingBuilder</code></a>.
+   * 
+   * ## Example
+   * 
+   * ```javascript
+   * bind(MyInterface).toClass(MyClass)
+   * 
+   * ```
+   * 
+   * @exportedAs angular2/di
+   */
+  function bind(token: any) : BindingBuilder ;
+  
+
+  /**
+   * A unique object used for retrieving items from the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+   * 
+   * Keys have:
+   * - a system-wide unique `id`.
+   * - a `token`, usually the `Type` of the instance.
+   * 
+   * Keys are used internally by the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> because their system-wide unique `id`s allow the
+   * injector to index in arrays rather than looking up items in maps.
+   * 
+   * @exportedAs angular2/di
+   */
+  class Key {
+    
+     token: Object;
+    
+     id: number;
+    
+     displayName: string;
+  }
+  
+
+  /**
+   * Thrown when trying to retrieve a dependency by `Key` from <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>, but the
+   * <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> does not have a <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> for <a href='/angular2/angular2.api/Key'><code>Key</code></a>.
+   * 
+   * @exportedAs angular2/di_errors
+   */
+  class NoBindingError extends AbstractBindingError {
+  }
+  
+
+  /**
+   * Base class for all errors arising from misconfigured bindings.
+   * 
+   * @exportedAs angular2/di_errors
+   */
+  class AbstractBindingError extends BaseException {
+    
+     name: string;
+    
+     message: string;
+    
+     keys: List<any>;
+    
+     constructResolvingMessage: Function;
+    
+     addKey(key: any): void;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Thrown when trying to retrieve an async <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> using the sync API.
+   * 
+   * ## Example
+   * 
+   * ```javascript
+   * var injector = Injector.resolveAndCreate([
+   *   bind(Number).toAsyncFactory(() => {
+   *     return new Promise((resolve) => resolve(1 + 2));
+   *   }),
+   *   bind(String).toFactory((v) => { return "Value: " + v; }, [String])
+   * ]);
+   * 
+   * injector.asyncGet(String).then((v) => expect(v).toBe('Value: 3'));
+   * expect(() => {
+   *   injector.get(String);
+   * }).toThrowError(AsycBindingError);
+   * ```
+   * 
+   * The above example throws because `String` depends on `Number` which is async. If any binding in
+   * the dependency graph is async then the graph can only be retrieved using the `asyncGet` API.
+   * 
+   * @exportedAs angular2/di_errors
+   */
+  class AsyncBindingError extends AbstractBindingError {
+  }
+  
+
+  /**
+   * Thrown when dependencies form a cycle.
+   * 
+   * ## Example:
+   * 
+   * ```javascript
+   * class A {
+   *   constructor(b:B) {}
+   * }
+   * class B {
+   *   constructor(a:A) {}
+   * }
+   * ```
+   * 
+   * Retrieving `A` or `B` throws a `CyclicDependencyError` as the graph above cannot be constructed.
+   * 
+   * @exportedAs angular2/di_errors
+   */
+  class CyclicDependencyError extends AbstractBindingError {
+  }
+  
+
+  /**
+   * Thrown when a constructing type returns with an Error.
+   * 
+   * The `InstantiationError` class contains the original error plus the dependency graph which caused
+   * this object to be instantiated.
+   * 
+   * @exportedAs angular2/di_errors
+   */
+  class InstantiationError extends AbstractBindingError {
+    
+     causeKey: void;
+  }
+  
+
+  /**
+   * Thrown when an object other then <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> (or `Type`) is passed to <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>
+   * creation.
+   * 
+   * @exportedAs angular2/di_errors
+   */
+  class InvalidBindingError extends BaseException {
+    
+     message: string;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Thrown when the class has no annotation information.
+   * 
+   * Lack of annotation information prevents the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> from determining which dependencies
+   * need to be injected into the constructor.
+   * 
+   * @exportedAs angular2/di_errors
+   */
+  class NoAnnotationError extends BaseException {
+    
+     name: string;
+    
+     message: string;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * @exportedAs angular2/di
+   */
+  class OpaqueToken {
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * An internal resolved representation of a <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> used by the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+   * 
+   * A <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> is resolved when it has a factory function. Binding to a class, alias, or
+   * value, are just convenience methods, as <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> only operates on calling factory
+   * functions.
+   * 
+   * @exportedAs angular2/di
+   */
+  class ResolvedBinding {
+    
+
+    /**
+     * A key, usually a `Type`.
+     */
+     key: Key;
+    
+
+    /**
+     * Factory function which can return an instance of an object represented by a key.
+     */
+     factory: Function;
+    
+
+    /**
+     * Arguments (dependencies) to the `factory` function.
+     */
+     dependencies: List<Dependency>;
+  }
+  
+
+  /**
+   * Helper class for the <a href='/angular2/angular2.api/bind'><code>bind</code></a> function.
+   * 
+   * @exportedAs angular2/di
+   */
+  class BindingBuilder {
+    
+     token: void;
+    
+
+    /**
+     * Binds an interface to an implementation / subclass.
+     * 
+     * ## Example
+     * 
+     * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
+     * easy comparison.
+     * 
+     * ```javascript
+     * 
+     * class Vehicle {}
+     * 
+     * class Car extends Vehicle {}
+     * 
+     * var injectorClass = Injector.resolveAndCreate([
+     *   Car,
+     *   bind(Vehicle).toClass(Car)
+     * ]);
+     * var injectorAlias = Injector.resolveAndCreate([
+     *   Car,
+     *   bind(Vehicle).toAlias(Car)
+     * ]);
+     * 
+     * expect(injectorClass.get(Vehicle)).not.toBe(injectorClass.get(Car));
+     * expect(injectorClass.get(Vehicle) instanceof Car).toBe(true);
+     * 
+     * expect(injectorAlias.get(Vehicle)).toBe(injectorAlias.get(Car));
+     * expect(injectorAlias.get(Vehicle) instanceof Car).toBe(true);
+     * ```
+     */
+     toClass(type: Type): Binding;
+    
+
+    /**
+     * Binds a key to a value.
+     * 
+     * ## Example
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   bind(String).toValue('Hello')
+     * ]);
+     * 
+     * expect(injector.get(String)).toEqual('Hello');
+     * ```
+     */
+     toValue(value: any): Binding;
+    
+
+    /**
+     * Binds a key to the alias for an existing key.
+     * 
+     * An alias means that we will return the same instance as if the alias token was used. (This is
+     * in contrast to `toClass` where a separet instance of `toClass` will be returned.)
+     * 
+     * ## Example
+     * 
+     * Becuse `toAlias` and `toClass` are often confused, the example contains both use cases for easy
+     * comparison.
+     * 
+     * ```javascript
+     * 
+     * class Vehicle {}
+     * 
+     * class Car extends Vehicle {}
+     * 
+     * var injectorAlias = Injector.resolveAndCreate([
+     *   Car,
+     *   bind(Vehicle).toAlias(Car)
+     * ]);
+     * var injectorClass = Injector.resolveAndCreate([
+     *   Car,
+     *   bind(Vehicle).toClass(Car)
+     * ]);
+     * 
+     * expect(injectorAlias.get(Vehicle)).toBe(injectorAlias.get(Car));
+     * expect(injectorAlias.get(Vehicle) instanceof Car).toBe(true);
+     * 
+     * expect(injectorClass.get(Vehicle)).not.toBe(injectorClass.get(Car));
+     * expect(injectorClass.get(Vehicle) instanceof Car).toBe(true);
+     * ```
+     */
+     toAlias(aliasToken: any): Binding;
+    
+
+    /**
+     * Binds a key to a function which computes the value.
+     * 
+     * ## Example
+     * 
+     * ```javascript
+     * var injector = Injector.resolveAndCreate([
+     *   bind(Number).toFactory(() => { return 1+2; }),
+     *   bind(String).toFactory((v) => { return "Value: " + v; }, [Number])
+     * ]);
+     * 
+     * expect(injector.get(Number)).toEqual(3);
+     * expect(injector.get(String)).toEqual('Value: 3');
+     * ```
+     */
+     toFactory(factoryFunction: Function, dependencies?: List<any>): Binding;
+  }
+  
+
+  /**
+   * @private
+   */
+  class Dependency {
+    
+     key: Key;
+    
+     optional: boolean;
+    
+     visibility: Visibility;
+    
+     properties: List<any>;
+  }
+  
+  var Self:any;
+  
+  var Parent:any;
+  
+  var Ancestor:any;
+  
+  var Unbounded:any;
+  
+
+  /**
+   * Used to provide dependencies that cannot be easily expressed as bindings.
+   */
+  interface DependencyProvider {
+    
+     getDependency(injector: Injector, binding: ResolvedBinding, dependency: Dependency): any;
+  }
+  
+
+  interface AbstractControl_markAsDirtyArgs {
+    onlySelf?: boolean;
+  }
+  
+  interface AbstractControl_updateValidityArgs {
+    onlySelf?: boolean;
+  }
+  
+  interface AbstractControl_updateValueAndValidityArgs {
+    onlySelf?: boolean;
+    emitEvent?: boolean;
+  }
+  
+  /**
+   * Omitting from external API doc as this is really an abstract internal concept.
+   */
+  class AbstractControl {
+    
+     validator: Function;
+    
+     value: any;
+    
+     status: string;
+    
+     valid: boolean;
+    
+     errors: StringMap<string, any>;
+    
+     pristine: boolean;
+    
+     dirty: boolean;
+    
+     touched: boolean;
+    
+     untouched: boolean;
+    
+     valueChanges: Observable;
+    
+     markAsTouched(): void;
+    
+     markAsDirty(args?: AbstractControl_markAsDirtyArgs): void;
+    
+     setParent(parent: any): void;
+    
+     updateValidity(args?: AbstractControl_updateValidityArgs): void;
+    
+     updateValueAndValidity(args?: AbstractControl_updateValueAndValidityArgs): void;
+    
+     find(path: List<string | number>| string): AbstractControl;
+    
+     getError(errorCode: string, path?: List<string>): any;
+    
+     hasError(errorCode: string, path?: List<string>): boolean;
+  }
+  
+  interface Control_updateValueOptions {
+    onlySelf?: boolean;
+    emitEvent?: boolean;
+  }
+  
+  /**
+   * Defines a part of a form that cannot be divided into other controls.
+   * 
+   * `Control` is one of the three fundamental building blocks used to define forms in Angular, along
+   * with
+   * <a href='/angular2/angular2.api/ControlGroup'><code>ControlGroup</code></a> and <a href='/angular2/angular2.api/ControlArray'><code>ControlArray</code></a>.
+   * 
+   * @exportedAs angular2/forms
+   */
+  class Control extends AbstractControl {
+    
+     updateValue(value: any, options?: Control_updateValueOptions): void;
+    
+     registerOnChange(fn: Function): void;
+  }
+  
+
+  /**
+   * Defines a part of a form, of fixed length, that can contain other controls.
+   * 
+   * A ControlGroup aggregates the values and errors of each <a href='/angular2/angular2.api/Control'><code>Control</code></a> in the group. Thus, if
+   * one of the controls
+   * in a group is invalid, the entire group is invalid. Similarly, if a control changes its value,
+   * the entire group
+   * changes as well.
+   * 
+   * `ControlGroup` is one of the three fundamental building blocks used to define forms in Angular,
+   * along with
+   * <a href='/angular2/angular2.api/Control'><code>Control</code></a> and <a href='/angular2/angular2.api/ControlArray'><code>ControlArray</code></a>. <a href='/angular2/angular2.api/ControlArray'><code>ControlArray</code></a> can also contain other controls,
+   * but is of variable
+   * length.
+   * 
+   * @exportedAs angular2/forms
+   */
+  class ControlGroup extends AbstractControl {
+    
+     controls: StringMap<string, AbstractControl>;
+    
+     addControl(name: string, c: AbstractControl): void;
+    
+     removeControl(name: string): void;
+    
+     include(controlName: string): void;
+    
+     exclude(controlName: string): void;
+    
+     contains(controlName: string): boolean;
+  }
+  
+
+  /**
+   * Defines a part of a form, of variable length, that can contain other controls.
+   * 
+   * A `ControlArray` aggregates the values and errors of each <a href='/angular2/angular2.api/Control'><code>Control</code></a> in the group. Thus, if
+   * one of the controls
+   * in a group is invalid, the entire group is invalid. Similarly, if a control changes its value,
+   * the entire group
+   * changes as well.
+   * 
+   * `ControlArray` is one of the three fundamental building blocks used to define forms in Angular,
+   * along with
+   * <a href='/angular2/angular2.api/Control'><code>Control</code></a> and <a href='/angular2/angular2.api/ControlGroup'><code>ControlGroup</code></a>. <a href='/angular2/angular2.api/ControlGroup'><code>ControlGroup</code></a> can also contain other controls,
+   * but is of fixed
+   * length.
+   * 
+   * @exportedAs angular2/forms
+   */
+  class ControlArray extends AbstractControl {
+    
+     controls: List<AbstractControl>;
+    
+     at(index: number): AbstractControl;
+    
+     push(control: AbstractControl): void;
+    
+     insert(index: number, control: AbstractControl): void;
+    
+     removeAt(index: number): void;
+    
+     length: number;
+  }
+  
+
+  /**
+   * Creates and binds a control with a specified name to a DOM element.
+   * 
+   * This directive can only be used as a child of <a href='/angular2/angular2.api/NgForm'><code>NgForm</code></a> or <a href='/angular2/angular2.api/NgFormModel'><code>NgFormModel</code></a>.
+   * 
+   * # Example
+   * 
+   * In this example, we create the login and password controls.
+   * We can work with each control separately: check its validity, get its value, listen to its
+   *  changes.
+   * 
+   *  ```
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [formDirectives],
+   *      template: `
+   *              <form #f="form" (submit)='onLogIn(f.value)'>
+   *                Login <input type='text' ng-control='login' #l="form">
+   *                <div *ng-if="!l.valid">Login is invalid</div>
+   * 
+   *                Password <input type='password' ng-control='password'>
+   * 
+   *                <button type='submit'>Log in!</button>
+   *              </form>
+   *      `})
+   * class LoginComp {
+   *  onLogIn(value) {
+   *    // value === {login: 'some login', password: 'some password'}
+   *  }
+   * }
+   *  ```
+   * 
+   * We can also use ng-model to bind a domain model to the form.
+   * 
+   *  ```
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [formDirectives],
+   *      template: `
+   *              <form (submit)='onLogIn()'>
+   *                Login <input type='text' ng-control='login' [(ng-model)]="credentials.login">
+   *                Password <input type='password' ng-control='password'
+   *  [(ng-model)]="credentials.password">
+   *                <button type='submit'>Log in!</button>
+   *              </form>
+   *      `})
+   * class LoginComp {
+   *  credentials: {login:string, password:string};
+   * 
+   *  onLogIn() {
+   *    // this.credentials.login === "some login"
+   *    // this.credentials.password === "some password"
+   *  }
+   * }
+   *  ```
+   * 
+   * @exportedAs angular2/forms
+   */
+  class NgControlName extends NgControl {
+    
+     update: void;
+    
+     model: any;
+    
+     ngValidators: QueryList<NgValidator>;
+    
+     onChange(c: StringMap<string, any>): void;
+    
+     onDestroy(): void;
+    
+     viewToModelUpdate(newValue: any): void;
+    
+     path: List<string>;
+    
+     formDirective: any;
+    
+     control: Control;
+    
+     validator: Function;
+  }
+  
+
+  /**
+   * Binds an existing control to a DOM element.
+   * 
+   * # Example
+   * 
+   * In this example, we bind the control to an input element. When the value of the input element
+   * changes, the value of
+   * the control will reflect that change. Likewise, if the value of the control changes, the input
+   * element reflects that
+   * change.
+   * 
+   *  ```
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [formDirectives],
+   *      template: "<input type='text' [ng-form-control]='loginControl'>"
+   *      })
+   * class LoginComp {
+   *  loginControl:Control;
+   * 
+   *  constructor() {
+   *    this.loginControl = new Control('');
+   *  }
+   * }
+   * 
+   *  ```
+   * 
+   * We can also use ng-model to bind a domain model to the form.
+   * 
+   *  ```
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [formDirectives],
+   *      template: "<input type='text' [ng-form-control]='loginControl' [(ng-model)]='login'>"
+   *      })
+   * class LoginComp {
+   *  loginControl:Control;
+   *  login:string;
+   * 
+   *  constructor() {
+   *    this.loginControl = new Control('');
+   *  }
+   * }
+   *  ```
+   * 
+   * @exportedAs angular2/forms
+   */
+  class NgFormControl extends NgControl {
+    
+     form: Control;
+    
+     update: void;
+    
+     model: any;
+    
+     ngValidators: QueryList<NgValidator>;
+    
+     onChange(c: any): void;
+    
+     path: List<string>;
+    
+     control: Control;
+    
+     validator: Function;
+    
+     viewToModelUpdate(newValue: any): void;
+  }
+  
+
+  /**
+   * Binds a domain model to the form.
+   * 
+   * # Example
+   *  ```
+   * @Component({selector: "search-comp"})
+   * @View({
+   *      directives: [formDirectives],
+   *      template: `
+   *               <input type='text' [(ng-model)]="searchQuery">
+   *      `})
+   * class SearchComp {
+   *  searchQuery: string;
+   * }
+   *  ```
+   * 
+   * @exportedAs angular2/forms
+   */
+  class NgModel extends NgControl {
+    
+     update: void;
+    
+     model: any;
+    
+     ngValidators: QueryList<NgValidator>;
+    
+     onChange(c: any): void;
+    
+     control: Control;
+    
+     path: List<string>;
+    
+     validator: Function;
+    
+     viewToModelUpdate(newValue: any): void;
+  }
+  
+
+  /**
+   * An abstract class that all control directive extend.
+   * 
+   * It binds a <a href='/angular2/angular2.api/Control'><code>Control</code></a> object to a DOM element.
+   * 
+   * @exportedAs angular2/forms
+   */
+  class NgControl {
+    
+     name: string;
+    
+     valueAccessor: ControlValueAccessor;
+    
+     validator: Function;
+    
+     path: List<string>;
+    
+     control: Control;
+    
+     viewToModelUpdate(newValue: any): void;
+  }
+  
+
+  /**
+   * Creates and binds a control group to a DOM element.
+   * 
+   * This directive can only be used as a child of <a href='/angular2/angular2.api/NgForm'><code>NgForm</code></a> or <a href='/angular2/angular2.api/NgFormModel'><code>NgFormModel</code></a>.
+   * 
+   * # Example
+   * 
+   * In this example, we create the credentials and personal control groups.
+   * We can work with each group separately: check its validity, get its value, listen to its changes.
+   * 
+   *  ```
+   * @Component({selector: "signup-comp"})
+   * @View({
+   *      directives: [formDirectives],
+   *      template: `
+   *              <form #f="form" (submit)='onSignUp(f.value)'>
+   *                <div ng-control-group='credentials' #credentials="form">
+   *                  Login <input type='text' ng-control='login'>
+   *                  Password <input type='password' ng-control='password'>
+   *                </div>
+   *                <div *ng-if="!credentials.valid">Credentials are invalid</div>
+   * 
+   *                <div ng-control-group='personal'>
+   *                  Name <input type='text' ng-control='name'>
+   *                </div>
+   *                <button type='submit'>Sign Up!</button>
+   *              </form>
+   *      `})
+   * class SignupComp {
+   *  onSignUp(value) {
+   *    // value === {personal: {name: 'some name'},
+   *    //  credentials: {login: 'some login', password: 'some password'}}
+   *  }
+   * }
+   * 
+   *  ```
+   * 
+   * @exportedAs angular2/forms
+   */
+  class NgControlGroup extends ControlContainer {
+    
+     onInit(): void;
+    
+     onDestroy(): void;
+    
+     path: List<string>;
+    
+     formDirective: any;
+  }
+  
+
+  /**
+   * Binds an existing control group to a DOM element.
+   * 
+   * # Example
+   * 
+   * In this example, we bind the control group to the form element, and we bind the login and
+   * password controls to the
+   * login and password elements.
+   * 
+   *  ```
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [formDirectives],
+   *      template: "<form [ng-form-model]='loginForm'>" +
+   *              "Login <input type='text' ng-control='login'>" +
+   *              "Password <input type='password' ng-control='password'>" +
+   *              "<button (click)="onLogin()">Login</button>" +
+   *              "</form>"
+   *      })
+   * class LoginComp {
+   *  loginForm:ControlGroup;
+   * 
+   *  constructor() {
+   *    this.loginForm = new ControlGroup({
+   *      login: new Control(""),
+   *      password: new Control("")
+   *    });
+   *  }
+   * 
+   *  onLogin() {
+   *    // this.loginForm.value
+   *  }
+   * }
+   * 
+   *  ```
+   * 
+   * We can also use ng-model to bind a domain model to the form.
+   * 
+   *  ```
+   * @Component({selector: "login-comp"})
+   * @View({
+   *      directives: [formDirectives],
+   *      template: "<form [ng-form-model]='loginForm'>" +
+   *              "Login <input type='text' ng-control='login' [(ng-model)]='login'>" +
+   *              "Password <input type='password' ng-control='password' [(ng-model)]='password'>" +
+   *              "<button (click)="onLogin()">Login</button>" +
+   *              "</form>"
+   *      })
+   * class LoginComp {
+   *  credentials:{login:string, password:string}
+   *  loginForm:ControlGroup;
+   * 
+   *  constructor() {
+   *    this.loginForm = new ControlGroup({
+   *      login: new Control(""),
+   *      password: new Control("")
+   *    });
+   *  }
+   * 
+   *  onLogin() {
+   *    // this.credentials.login === 'some login'
+   *    // this.credentials.password === 'some password'
+   *  }
+   * }
+   *  ```
+   * 
+   * @exportedAs angular2/forms
+   */
+  class NgFormModel extends ControlContainer implements Form {
+    
+     form: ControlGroup;
+    
+     directives: List<NgControl>;
+    
+     ngSubmit: void;
+    
+     onChange(_: any): void;
+    
+     formDirective: Form;
+    
+     path: List<string>;
+    
+     addControl(dir: NgControl): void;
+    
+     getControl(dir: NgControl): Control;
+    
+     removeControl(dir: NgControl): void;
+    
+     addControlGroup(dir: NgControlGroup): void;
+    
+     removeControlGroup(dir: NgControlGroup): void;
+    
+     updateModel(dir: NgControl, value: any): void;
+    
+     onSubmit(): boolean;
+  }
+  
+
+  /**
+   * Creates and binds a form object to a DOM element.
+   * 
+   * # Example
+   * 
+   *  ```
+   * @Component({selector: "signup-comp"})
+   * @View({
+   *      directives: [formDirectives],
+   *      template: `
+   *              <form #f="form" (submit)='onSignUp(f.value)'>
+   *                <div ng-control-group='credentials' #credentials="form">
+   *                  Login <input type='text' ng-control='login'>
+   *                  Password <input type='password' ng-control='password'>
+   *                </div>
+   *                <div *ng-if="!credentials.valid">Credentials are invalid</div>
+   * 
+   *                <div ng-control-group='personal'>
+   *                  Name <input type='text' ng-control='name'>
+   *                </div>
+   *                <button type='submit'>Sign Up!</button>
+   *              </form>
+   *      `})
+   * class SignupComp {
+   *  onSignUp(value) {
+   *    // value === {personal: {name: 'some name'},
+   *    //  credentials: {login: 'some login', password: 'some password'}}
+   *  }
+   * }
+   * 
+   *  ```
+   * 
+   * @exportedAs angular2/forms
+   */
+  class NgForm extends ControlContainer implements Form {
+    
+     form: ControlGroup;
+    
+     ngSubmit: void;
+    
+     formDirective: Form;
+    
+     path: List<string>;
+    
+     controls: StringMap<string, AbstractControl>;
+    
+     value: any;
+    
+     errors: any;
+    
+     addControl(dir: NgControl): void;
+    
+     getControl(dir: NgControl): Control;
+    
+     removeControl(dir: NgControl): void;
+    
+     addControlGroup(dir: NgControlGroup): void;
+    
+     removeControlGroup(dir: NgControlGroup): void;
+    
+     updateModel(dir: NgControl, value: any): void;
+    
+     onSubmit(): boolean;
+  }
+  
+
+  /**
+   * A bridge between a control and a native element.
+   * 
+   * Please see <a href='/angular2/angular2.api/DefaultValueAccessor'><code>DefaultValueAccessor</code></a> for more information.
+   */
+  interface ControlValueAccessor {
+    
+     writeValue(obj: any): void;
+    
+     registerOnChange(fn: any): void;
+    
+     registerOnTouched(fn: any): void;
+  }
+  
+
+  /**
+   * The default accessor for writing a value and listening to changes that is used by the
+   * <a href='/angular2/angular2.api/NgModel'><code>NgModel</code></a>, <a href='/angular2/angular2.api/NgFormControl'><code>NgFormControl</code></a>, and <a href='/angular2/angular2.api/NgControlName'><code>NgControlName</code></a> directives.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="text" [(ng-model)]="searchQuery">
+   *  ```
+   * 
+   * @exportedAs angular2/forms
+   */
+  class DefaultValueAccessor implements ControlValueAccessor {
+    
+     value: string;
+    
+     onChange: void;
+    
+     onTouched: void;
+    
+     cd: NgControl;
+    
+     renderer: Renderer;
+    
+     elementRef: ElementRef;
+    
+     writeValue(value: any): void;
+    
+     ngClassUntouched: boolean;
+    
+     ngClassTouched: boolean;
+    
+     ngClassPristine: boolean;
+    
+     ngClassDirty: boolean;
+    
+     ngClassValid: boolean;
+    
+     ngClassInvalid: boolean;
+    
+     registerOnChange(fn: any): void;
+    
+     registerOnTouched(fn: any): void;
+  }
+  
+
+  /**
+   * The accessor for writing a value and listening to changes on a checkbox input element.
+   * 
+   *  # Example
+   *  ```
+   *  <input type="checkbox" [ng-control]="rememberLogin">
+   *  ```
+   * 
+   * @exportedAs angular2/forms
+   */
+  class CheckboxControlValueAccessor implements ControlValueAccessor {
+    
+     checked: boolean;
+    
+     onChange: void;
+    
+     onTouched: void;
+    
+     cd: NgControl;
+    
+     renderer: Renderer;
+    
+     elementRef: ElementRef;
+    
+     writeValue(value: any): void;
+    
+     ngClassUntouched: boolean;
+    
+     ngClassTouched: boolean;
+    
+     ngClassPristine: boolean;
+    
+     ngClassDirty: boolean;
+    
+     ngClassValid: boolean;
+    
+     ngClassInvalid: boolean;
+    
+     registerOnChange(fn: any): void;
+    
+     registerOnTouched(fn: any): void;
+  }
+  
+
+  /**
+   * The accessor for writing a value and listening to changes on a select element.
+   * 
+   * @exportedAs angular2/forms
+   */
+  class SelectControlValueAccessor implements ControlValueAccessor {
+    
+     value: void;
+    
+     onChange: void;
+    
+     onTouched: void;
+    
+     cd: NgControl;
+    
+     renderer: Renderer;
+    
+     elementRef: ElementRef;
+    
+     writeValue(value: any): void;
+    
+     ngClassUntouched: boolean;
+    
+     ngClassTouched: boolean;
+    
+     ngClassPristine: boolean;
+    
+     ngClassDirty: boolean;
+    
+     ngClassValid: boolean;
+    
+     ngClassInvalid: boolean;
+    
+     registerOnChange(fn: any): void;
+    
+     registerOnTouched(fn: any): void;
+  }
+  
+
+  /**
+   * A list of all the form directives used as part of a `@View` annotation.
+   * 
+   *  This is a shorthand for importing them each individually.
+   * 
+   * @exportedAs angular2/forms
+   */
+  var formDirectives : List<Type> ;
+  
+
+  /**
+   * Provides a set of validators used by form controls.
+   * 
+   * # Example
+   * 
+   * ```
+   * var loginControl = new Control("", Validators.required)
+   * ```
+   * 
+   * @exportedAs angular2/forms
+   */
+  class Validators {
+  }
+  
+  class NgValidator {
+    
+     validator: Function;
+  }
+  
+  class NgRequiredValidator extends NgValidator {
+    
+     validator: Function;
+  }
+  
+
+  /**
+   * Creates a form object from a user-specified configuration.
+   * 
+   * # Example
+   * 
+   * ```
+   * import {Component, View, bootstrap} from 'angular2/angular2';
+   * import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
+   * 
+   * @Component({
+   *   selector: 'login-comp',
+   *   viewInjector: [
+   *     FormBuilder
+   *   ]
+   * })
+   * @View({
+   *   template: `
+   *     <form [control-group]="loginForm">
+   *       Login <input control="login">
+   * 
+   *       <div control-group="passwordRetry">
+   *         Password <input type="password" control="password">
+   *         Confirm password <input type="password" control="passwordConfirmation">
+   *       </div>
+   *     </form>
+   *   `,
+   *   directives: [
+   *     formDirectives
+   *   ]
+   * })
+   * class LoginComp {
+   *   loginForm: ControlGroup;
+   * 
+   *   constructor(builder: FormBuilder) {
+   *     this.loginForm = builder.group({
+   *       login: ["", Validators.required],
+   * 
+   *       passwordRetry: builder.group({
+   *         password: ["", Validators.required],
+   *         passwordConfirmation: ["", Validators.required]
+   *       })
+   *     });
+   *   }
+   * }
+   * 
+   * bootstrap(LoginComp)
+   * ```
+   * 
+   * This example creates a <a href='/angular2/angular2.api/ControlGroup'><code>ControlGroup</code></a> that consists of a `login` <a href='/angular2/angular2.api/Control'><code>Control</code></a>, and a
+   * nested
+   * <a href='/angular2/angular2.api/ControlGroup'><code>ControlGroup</code></a> that defines a `password` and a `passwordConfirmation` <a href='/angular2/angular2.api/Control'><code>Control</code></a>:
+   * 
+   * ```
+   *  var loginForm = builder.group({
+   *    login: ["", Validators.required],
+   * 
+   *    passwordRetry: builder.group({
+   *      password: ["", Validators.required],
+   *      passwordConfirmation: ["", Validators.required]
+   *    })
+   *  });
+   * 
+   *  ```
+   * @exportedAs angular2/forms
+   */
+  class FormBuilder {
+    
+     group(controlsConfig: StringMap<string, any>, extra?: StringMap<string, any>): ControlGroup;
+    
+     control(value: Object, validator?: Function): Control;
+    
+     array(controlsConfig: List<any>, validator?: Function): ControlArray;
+  }
+  
+  var formInjectables : List<Type> ;
+  
+  class DomRenderer extends Renderer {
+    
+     createRootHostView(hostProtoViewRef: RenderProtoViewRef, hostElementSelector: string): RenderViewRef;
+    
+     createView(protoViewRef: RenderProtoViewRef): RenderViewRef;
+    
+     destroyView(view: RenderViewRef): void;
+    
+     getNativeElementSync(location: RenderElementRef): any;
+    
+     attachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): void;
+    
+     setComponentViewRootNodes(componentViewRef: RenderViewRef, rootNodes: List</*node*/ any>): void;
+    
+     getRootNodes(viewRef: RenderViewRef): List</*node*/ any>;
+    
+     detachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): void;
+    
+     attachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): void;
+    
+     detachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): void;
+    
+     hydrateView(viewRef: RenderViewRef): void;
+    
+     dehydrateView(viewRef: RenderViewRef): void;
+    
+     setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
+    
+     setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
+    
+     setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
+    
+     setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
+    
+     invokeElementMethod(location: RenderElementRef, methodName: string, args: List<any>): void;
+    
+     setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+    
+     setEventDispatcher(viewRef: RenderViewRef, dispatcher: any): void;
+  }
+  
+  var DOCUMENT_TOKEN:any;
+  
+
+  /**
+   * Declare reusable UI building blocks for an application.
+   * 
+   * Each Angular component requires a single `@Component` and at least one `@View` annotation. The
+   * `@Component`
+   * annotation specifies when a component is instantiated, and which properties and hostListeners it
+   * binds to.
+   * 
+   * When a component is instantiated, Angular
+   * - creates a shadow DOM for the component.
+   * - loads the selected template into the shadow DOM.
+   * - creates all the injectable objects configured with `hostInjector` and `viewInjector`.
+   * 
+   * All template expressions and statements are then evaluated against the component instance.
+   * 
+   * For details on the `@View` annotation, see <a href='/angular2/angular2.api/View'><code>View</code></a>.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!'
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   * 
+   * 
+   * @exportedAs angular2/annotations
+   */
+  class ComponentAnnotation extends DirectiveAnnotation {
+    
+
+    /**
+     * Defines the used change detection strategy.
+     * 
+     * When a component is instantiated, Angular creates a change detector, which is responsible for
+     * propagating
+     * the component's bindings.
+     * 
+     * The `changeDetection` property defines, whether the change detection will be checked every time
+     * or only when the component
+     * tells it to do so.
+     */
+     changeDetection: string;
+    
+
+    /**
+     * Defines the set of injectable objects that are visible to its view dom children.
+     * 
+     * ## Simple Example
+     * 
+     * Here is an example of a class that can be injected:
+     * 
+     * ```
+     * class Greeter {
+     *    greet(name:string) {
+     *      return 'Hello ' + name + '!';
+     *    }
+     * }
+     * 
+     * @Directive({
+     *   selector: 'needs-greeter'
+     * })
+     * class NeedsGreeter {
+     *   greeter:Greeter;
+     * 
+     *   constructor(greeter:Greeter) {
+     *     this.greeter = greeter;
+     *   }
+     * }
+     * 
+     * @Component({
+     *   selector: 'greet',
+     *   viewInjector: [
+     *     Greeter
+     *   ]
+     * })
+     * @View({
+     *   template: `<needs-greeter></needs-greeter>`,
+     *   directives: [NeedsGreeter]
+     * })
+     * class HelloWorld {
+     * }
+     * 
+     * ```
+     */
+     viewInjector: List<any>;
+  }
+  
+
+  /**
+   * Directives allow you to attach behavior to elements in the DOM.
+   * 
+   * <a href='/angular2/angular2.api/Directive'><code>Directive</code></a>s with an embedded view are called <a href='/angular2/angular2.api/Component'><code>Component</code></a>s.
+   * 
+   * A directive consists of a single directive annotation and a controller class. When the
+   * directive's `selector` matches
+   * elements in the DOM, the following steps occur:
+   * 
+   * 1. For each directive, the `ElementInjector` attempts to resolve the directive's constructor
+   * arguments.
+   * 2. Angular instantiates directives for each matched element using `ElementInjector` in a
+   * depth-first order,
+   *    as declared in the HTML.
+   * 
+   * ## Understanding How Injection Works
+   * 
+   * There are three stages of injection resolution.
+   * - *Pre-existing Injectors*:
+   *   - The terminal <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> cannot resolve dependencies. It either throws an error or, if
+   * the dependency was
+   *     specified as `@Optional`, returns `null`.
+   *   - The platform injector resolves browser singleton resources, such as: cookies, title,
+   * location, and others.
+   * - *Component Injectors*: Each component instance has its own <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>, and they follow
+   * the same parent-child hierarchy
+   *     as the component instances in the DOM.
+   * - *Element Injectors*: Each component instance has a Shadow DOM. Within the Shadow DOM each
+   * element has an `ElementInjector`
+   *     which follow the same parent-child hierarchy as the DOM elements themselves.
+   * 
+   * When a template is instantiated, it also must instantiate the corresponding directives in a
+   * depth-first order. The
+   * current `ElementInjector` resolves the constructor dependencies for each directive.
+   * 
+   * Angular then resolves dependencies as follows, according to the order in which they appear in the
+   * <a href='/angular2/angular2.api/View'><code>View</code></a>:
+   * 
+   * 1. Dependencies on the current element
+   * 2. Dependencies on element injectors and their parents until it encounters a Shadow DOM boundary
+   * 3. Dependencies on component injectors and their parents until it encounters the root component
+   * 4. Dependencies on pre-existing injectors
+   * 
+   * 
+   * The `ElementInjector` can inject other directives, element-specific special objects, or it can
+   * delegate to the parent
+   * injector.
+   * 
+   * To inject other directives, declare the constructor parameter as:
+   * - `directive:DirectiveType`: a directive on the current element only
+   * - `@Ancestor() directive:DirectiveType`: any directive that matches the type between the current
+   * element and the
+   *    Shadow DOM root. Current element is not included in the resolution, therefore even if it could
+   * resolve it, it will
+   *    be ignored.
+   * - `@Parent() directive:DirectiveType`: any directive that matches the type on a direct parent
+   * element only.
+   * - `@Query(DirectiveType) query:QueryList<DirectiveType>`: A live collection of direct child
+   * directives.
+   * - `@QueryDescendants(DirectiveType) query:QueryList<DirectiveType>`: A live collection of any
+   * child directives.
+   * 
+   * To inject element-specific special objects, declare the constructor parameter as:
+   * - `element: ElementRef` to obtain a reference to logical element in the view.
+   * - `viewContainer: ViewContainerRef` to control child template instantiation, for
+   * <a href='/angular2/angular2.api/Directive'><code>Directive</code></a> directives only
+   * - `bindingPropagation: BindingPropagation` to control change detection in a more granular way.
+   * 
+   * ## Example
+   * 
+   * The following example demonstrates how dependency injection resolves constructor arguments in
+   * practice.
+   * 
+   * 
+   * Assume this HTML template:
+   * 
+   * ```
+   * <div dependency="1">
+   *   <div dependency="2">
+   *     <div dependency="3" my-directive>
+   *       <div dependency="4">
+   *         <div dependency="5"></div>
+   *       </div>
+   *       <div dependency="6"></div>
+   *     </div>
+   *   </div>
+   * </div>
+   * ```
+   * 
+   * With the following `dependency` decorator and `SomeService` injectable class.
+   * 
+   * ```
+   * @Injectable()
+   * class SomeService {
+   * }
+   * 
+   * @Directive({
+   *   selector: '[dependency]',
+   *   properties: [
+   *     'id: dependency'
+   *   ]
+   * })
+   * class Dependency {
+   *   id:string;
+   * }
+   * ```
+   * 
+   * Let's step through the different ways in which `MyDirective` could be declared...
+   * 
+   * 
+   * ### No injection
+   * 
+   * Here the constructor is declared with no arguments, therefore nothing is injected into
+   * `MyDirective`.
+   * 
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor() {
+   *   }
+   * }
+   * ```
+   * 
+   * This directive would be instantiated with no dependencies.
+   * 
+   * 
+   * ### Component-level injection
+   * 
+   * Directives can inject any injectable instance from the closest component injector or any of its
+   * parents.
+   * 
+   * Here, the constructor declares a parameter, `someService`, and injects the `SomeService` type
+   * from the parent
+   * component's injector.
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(someService: SomeService) {
+   *   }
+   * }
+   * ```
+   * 
+   * This directive would be instantiated with a dependency on `SomeService`.
+   * 
+   * 
+   * ### Injecting a directive from the current element
+   * 
+   * Directives can inject other directives declared on the current element.
+   * 
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(dependency: Dependency) {
+   *     expect(dependency.id).toEqual(3);
+   *   }
+   * }
+   * ```
+   * This directive would be instantiated with `Dependency` declared at the same element, in this case
+   * `dependency="3"`.
+   * 
+   * 
+   * ### Injecting a directive from a direct parent element
+   * 
+   * Directives can inject other directives declared on a direct parent element. By definition, a
+   * directive with a
+   * `@Parent` annotation does not attempt to resolve dependencies for the current element, even if
+   * this would satisfy
+   * the dependency.
+   * 
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Parent() dependency: Dependency) {
+   *     expect(dependency.id).toEqual(2);
+   *   }
+   * }
+   * ```
+   * This directive would be instantiated with `Dependency` declared at the parent element, in this
+   * case `dependency="2"`.
+   * 
+   * 
+   * ### Injecting a directive from any ancestor elements
+   * 
+   * Directives can inject other directives declared on any ancestor element (in the current Shadow
+   * DOM), i.e. on the
+   * parent element and its parents. By definition, a directive with an `@Ancestor` annotation does
+   * not attempt to
+   * resolve dependencies for the current element, even if this would satisfy the dependency.
+   * 
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Ancestor() dependency: Dependency) {
+   *     expect(dependency.id).toEqual(2);
+   *   }
+   * }
+   * ```
+   * 
+   * Unlike the `@Parent` which only checks the parent, `@Ancestor` checks the parent, as well as its
+   * parents recursively. If `dependency="2"` didn't exist on the direct parent, this injection would
+   * have returned
+   * `dependency="1"`.
+   * 
+   * 
+   * ### Injecting a live collection of direct child directives
+   * 
+   * 
+   * A directive can also query for other child directives. Since parent directives are instantiated
+   * before child directives, a directive can't simply inject the list of child directives. Instead,
+   * the directive injects a <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a>, which updates its contents as children are added,
+   * removed, or moved by a directive that uses a <a href='/angular2/angular2.api/ViewContainerRef'><code>ViewContainerRef</code></a> such as a `ng-for`, an
+   * `ng-if`, or an `ng-switch`.
+   * 
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Query(Dependency) dependencies:QueryList<Dependency>) {
+   *   }
+   * }
+   * ```
+   * 
+   * This directive would be instantiated with a <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a> which contains `Dependency` 4 and
+   * 6. Here, `Dependency` 5 would not be included, because it is not a direct child.
+   * 
+   * ### Injecting a live collection of descendant directives
+   * 
+   * By passing the descendant flag to `@Query` above, we can include the children of the child
+   * elements.
+   * 
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Query(Dependency, {descendants: true}) dependencies:QueryList<Dependency>) {
+   *   }
+   * }
+   * ```
+   * 
+   * This directive would be instantiated with a Query which would contain `Dependency` 4, 5 and 6.
+   * 
+   * ### Optional injection
+   * 
+   * The normal behavior of directives is to return an error when a specified dependency cannot be
+   * resolved. If you
+   * would like to inject `null` on unresolved dependency instead, you can annotate that dependency
+   * with `@Optional()`.
+   * This explicitly permits the author of a template to treat some of the surrounding directives as
+   * optional.
+   * 
+   * ```
+   * @Directive({ selector: '[my-directive]' })
+   * class MyDirective {
+   *   constructor(@Optional() dependency:Dependency) {
+   *   }
+   * }
+   * ```
+   * 
+   * This directive would be instantiated with a `Dependency` directive found on the current element.
+   * If none can be
+   * found, the injector supplies `null` instead of throwing an error.
+   * 
+   * ## Example
+   * 
+   * Here we use a decorator directive to simply define basic tool-tip behavior.
+   * 
+   * ```
+   * @Directive({
+   *   selector: '[tooltip]',
+   *   properties: [
+   *     'text: tooltip'
+   *   ],
+   *   hostListeners: {
+   *     'onmouseenter': 'onMouseEnter()',
+   *     'onmouseleave': 'onMouseLeave()'
+   *   }
+   * })
+   * class Tooltip{
+   *   text:string;
+   *   overlay:Overlay; // NOT YET IMPLEMENTED
+   *   overlayManager:OverlayManager; // NOT YET IMPLEMENTED
+   * 
+   *   constructor(overlayManager:OverlayManager) {
+   *     this.overlay = overlay;
+   *   }
+   * 
+   *   onMouseEnter() {
+   *     // exact signature to be determined
+   *     this.overlay = this.overlayManager.open(text, ...);
+   *   }
+   * 
+   *   onMouseLeave() {
+   *     this.overlay.close();
+   *     this.overlay = null;
+   *   }
+   * }
+   * ```
+   * In our HTML template, we can then add this behavior to a `<div>` or any other element with the
+   * `tooltip` selector,
+   * like so:
+   * 
+   * ```
+   * <div tooltip="some text here"></div>
+   * ```
+   * 
+   * Directives can also control the instantiation, destruction, and positioning of inline template
+   * elements:
+   * 
+   * A directive uses a <a href='/angular2/angular2.api/ViewContainerRef'><code>ViewContainerRef</code></a> to instantiate, insert, move, and destroy views at
+   * runtime.
+   * The <a href='/angular2/angular2.api/ViewContainerRef'><code>ViewContainerRef</code></a> is created as a result of `<template>` element, and represents a
+   * location in the current view
+   * where these actions are performed.
+   * 
+   * Views are always created as children of the current <a href='/angular2/angular2.api/View'><code>View</code></a>, and as siblings of the
+   * `<template>` element. Thus a
+   * directive in a child view cannot inject the directive that created it.
+   * 
+   * Since directives that create views via ViewContainers are common in Angular, and using the full
+   * `<template>` element syntax is wordy, Angular
+   * also supports a shorthand notation: `<li *foo="bar">` and `<li template="foo: bar">` are
+   * equivalent.
+   * 
+   * Thus,
+   * 
+   * ```
+   * <ul>
+   *   <li *foo="bar" title="text"></li>
+   * </ul>
+   * ```
+   * 
+   * Expands in use to:
+   * 
+   * ```
+   * <ul>
+   *   <template [foo]="bar">
+   *     <li title="text"></li>
+   *   </template>
+   * </ul>
+   * ```
+   * 
+   * Notice that although the shorthand places `*foo="bar"` within the `<li>` element, the binding for
+   * the directive
+   * controller is correctly instantiated on the `<template>` element rather than the `<li>` element.
+   * 
+   * 
+   * ## Example
+   * 
+   * Let's suppose we want to implement the `unless` behavior, to conditionally include a template.
+   * 
+   * Here is a simple directive that triggers on an `unless` selector:
+   * 
+   * ```
+   * @Directive({
+   *   selector: '[unless]',
+   *   properties: ['unless']
+   * })
+   * export class Unless {
+   *   viewContainer: ViewContainerRef;
+   *   protoViewRef: ProtoViewRef;
+   *   prevCondition: boolean;
+   * 
+   *   constructor(viewContainer: ViewContainerRef, protoViewRef: ProtoViewRef) {
+   *     this.viewContainer = viewContainer;
+   *     this.protoViewRef = protoViewRef;
+   *     this.prevCondition = null;
+   *   }
+   * 
+   *   set unless(newCondition) {
+   *     if (newCondition && (isBlank(this.prevCondition) || !this.prevCondition)) {
+   *       this.prevCondition = true;
+   *       this.viewContainer.clear();
+   *     } else if (!newCondition && (isBlank(this.prevCondition) || this.prevCondition)) {
+   *       this.prevCondition = false;
+   *       this.viewContainer.create(this.protoViewRef);
+   *     }
+   *   }
+   * }
+   * ```
+   * 
+   * We can then use this `unless` selector in a template:
+   * ```
+   * <ul>
+   *   <li *unless="expr"></li>
+   * </ul>
+   * ```
+   * 
+   * Once the directive instantiates the child view, the shorthand notation for the template expands
+   * and the result is:
+   * 
+   * ```
+   * <ul>
+   *   <template [unless]="exp">
+   *     <li></li>
+   *   </template>
+   *   <li></li>
+   * </ul>
+   * ```
+   * 
+   * Note also that although the `<li></li>` template still exists inside the `<template></template>`,
+   * the instantiated
+   * view occurs on the second `<li></li>` which is a sibling to the `<template>` element.
+   * 
+   * @exportedAs angular2/annotations
+   */
+  class DirectiveAnnotation extends Injectable {
+    
+
+    /**
+     * The CSS selector that triggers the instantiation of a directive.
+     * 
+     * Angular only allows directives to trigger on CSS selectors that do not cross element
+     * boundaries.
+     * 
+     * `selector` may be declared as one of the following:
+     * 
+     * - `element-name`: select by element name.
+     * - `.class`: select by class name.
+     * - `[attribute]`: select by attribute name.
+     * - `[attribute=value]`: select by attribute name and value.
+     * - `:not(sub_selector)`: select only if the element does not match the `sub_selector`.
+     * - `selector1, selector2`: select if either `selector1` or `selector2` matches.
+     * 
+     * 
+     * ## Example
+     * 
+     * Suppose we have a directive with an `input[type=text]` selector.
+     * 
+     * And the following HTML:
+     * 
+     * ```html
+     * <form>
+     *   <input type="text">
+     *   <input type="radio">
+     * <form>
+     * ```
+     * 
+     * The directive would only be instantiated on the `<input type="text">` element.
+     */
+     selector: string;
+    
+
+    /**
+     * Enumerates the set of properties that accept data binding for a directive.
+     * 
+     * The `properties` property defines a set of `directiveProperty` to `bindingProperty`
+     * configuration:
+     * 
+     * - `directiveProperty` specifies the component property where the value is written.
+     * - `bindingProperty` specifies the DOM property where the value is read from.
+     * 
+     * You can include a <a href='/angular2/angular2.api/Pipe'><code>Pipe</code></a> when specifying a `bindingProperty` to allow for data
+     * transformation and structural change detection of the value. These pipes will be evaluated in
+     * the context of this component.
+     * 
+     * ## Syntax
+     * 
+     * There is no need to specify both `directiveProperty` and `bindingProperty` when they both have
+     * the same value.
+     * 
+     * ```
+     * @Directive({
+     *   properties: [
+     *     'propertyName', // shorthand notation for 'propertyName: propertyName'
+     *     'directiveProperty1: bindingProperty1',
+     *     'directiveProperty2: bindingProperty2 | pipe1 | ...',
+     *     ...
+     *   ]
+     * }
+     * ```
+     * 
+     * 
+     * ## Basic Property Binding
+     * 
+     * We can easily build a simple `Tooltip` directive that exposes a `tooltip` property, which can
+     * be used in templates with standard Angular syntax. For example:
+     * 
+     * ```
+     * @Directive({
+     *   selector: '[tooltip]',
+     *   properties: [
+     *     'text: tooltip'
+     *   ]
+     * })
+     * class Tooltip {
+     *   set text(value: string) {
+     *     // This will get called every time with the new value when the 'tooltip' property changes
+     *   }
+     * }
+     * ```
+     * 
+     * We can then bind to the `tooltip' property as either an expression (`someExpression`) or as a
+     * string literal, as shown in the HTML template below:
+     * 
+     * ```html
+     * <div [tooltip]="someExpression">...</div>
+     * <div tooltip="Some Text">...</div>
+     * ```
+     * 
+     * Whenever the `someExpression` expression changes, the `properties` declaration instructs
+     * Angular to update the `Tooltip`'s `text` property.
+     * 
+     * ## Bindings With Pipes
+     * 
+     * You can also use pipes when writing binding definitions for a directive.
+     * 
+     * For example, we could write a binding that updates the directive on structural changes, rather
+     * than on reference changes, as normally occurs in change detection.
+     * 
+     * See <a href='/angular2/angular2.api/Pipe'><code>Pipe</code></a> and <a href='/angular2/pipes/KeyValueChanges'><code>KeyValueChanges</code></a> documentation for more details.
+     * 
+     * ```
+     * @Directive({
+     *   selector: '[class-set]',
+     *   properties: [
+     *     'classChanges: classSet | keyValDiff'
+     *   ]
+     * })
+     * class ClassSet {
+     *   set classChanges(changes: KeyValueChanges) {
+     *     // This will get called every time the `class-set` expressions changes its structure.
+     *   }
+     * }
+     * ```
+     * 
+     * The template that this directive is used in may also contain its own pipes. For example:
+     * 
+     * ```html
+     * <div [class-set]="someExpression | somePipe">
+     * ```
+     * 
+     * In this case, the two pipes compose as if they were inlined: `someExpression | somePipe |
+     * keyValDiff`.
+     */
+     properties: List<string>;
+    
+
+    /**
+     * Enumerates the set of emitted events.
+     * 
+     * ## Syntax
+     * 
+     * ```
+     * @Component({
+     *   events: ['statusChange']
+     * })
+     * class TaskComponent {
+     *   statusChange: EventEmitter;
+     * 
+     *   constructor() {
+     *     this.statusChange = new EventEmitter();
+     *   }
+     * 
+     *   onComplete() {
+     *     this.statusChange.next('completed');
+     *   }
+     * }
+     * ```
+     * 
+     * Use `propertyName: eventName` when the event emitter property name is different from the name
+     * of the emitted event:
+     * 
+     * ```
+     * @Component({
+     *   events: ['status: statusChange']
+     * })
+     * class TaskComponent {
+     *   status: EventEmitter;
+     * 
+     *   constructor() {
+     *     this.status = new EventEmitter();
+     *   }
+     * 
+     *   onComplete() {
+     *     this.status.next('completed');
+     *   }
+     * }
+     * ```
+     */
+     events: List<string>;
+    
+
+    /**
+     * Specifiy the events, actions, properties and attributes related to the host element.
+     * 
+     * ## Events
+     * 
+     * Specifies which DOM hostListeners a directive listens to via a set of `(event)` to `method`
+     * key-value pairs:
+     * 
+     * - `event1`: the DOM event that the directive listens to.
+     * - `statement`: the statement to execute when the event occurs.
+     * If the evalutation of the statement returns `false`, then `preventDefault`is applied on the DOM
+     * event.
+     * 
+     * To listen to global events, a target must be added to the event name.
+     * The target can be `window`, `document` or `body`.
+     * 
+     * When writing a directive event binding, you can also refer to the following local variables:
+     * - `$event`: Current event object which triggered the event.
+     * - `$target`: The source of the event. This will be either a DOM element or an Angular
+     * directive. (will be implemented in later release)
+     * 
+     * ## Syntax
+     * 
+     * ```
+     * @Directive({
+     *   host: {
+     *     '(event1)': 'onMethod1(arguments)',
+     *     '(target:event2)': 'onMethod2(arguments)',
+     *     ...
+     *   }
+     * }
+     * ```
+     * 
+     * ## Basic Event Binding:
+     * 
+     * Suppose you want to write a directive that reacts to `change` events in the DOM and on
+     * `resize` events in window.
+     * You would define the event binding as follows:
+     * 
+     * ```
+     * @Directive({
+     *   selector: 'input',
+     *   host: {
+     *     '(change)': 'onChange($event)',
+     *     '(window:resize)': 'onResize($event)'
+     *   }
+     * })
+     * class InputDirective {
+     *   onChange(event:Event) {
+     *     // invoked when the input element fires the 'change' event
+     *   }
+     *   onResize(event:Event) {
+     *     // invoked when the window fires the 'resize' event
+     *   }
+     * }
+     * ```
+     * 
+     * ## Properties
+     * 
+     * Specifies which DOM properties a directives updates.
+     * 
+     * ## Syntax
+     * 
+     * ```
+     * @Directive({
+     *   selector: 'input',
+     *   host: {
+     *     '[prop]': 'expression'
+     *   }
+     * })
+     * class InputDirective {
+     *   value:string;
+     * }
+     * ```
+     * 
+     * In this example the prop property of the host element is updated with the expression value
+     * every time it changes.
+     * 
+     * ## Attributes
+     * 
+     * Specifies static attributes that should be propagated to a host element. Attributes specified
+     * in `hostAttributes` are propagated only if a given attribute is not present on a host element.
+     * 
+     * ## Syntax
+     * 
+     * ```
+     * @Directive({
+     *   selector: '[my-button]',
+     *   host: {
+     *     'role': 'button'
+     *   }
+     * })
+     * class MyButton {
+     * }
+     * ```
+     * 
+     * In this example using `my-button` directive (ex.: `<div my-button></div>`) on a host element
+     * (here: `<div>` ) will ensure that this element will get the "button" role.
+     * 
+     * ## Actions
+     * 
+     * Specifies which DOM methods a directive can invoke.
+     * 
+     * ## Syntax
+     * 
+     * ```
+     * @Directive({
+     *   selector: 'input',
+     *   host: {
+     *     '@emitFocus': 'focus()'
+     *   }
+     * })
+     * class InputDirective {
+     *   constructor() {
+     *     this.emitFocus = new EventEmitter();
+     *   }
+     * 
+     *   focus() {
+     *     this.emitFocus.next();
+     *   }
+     * }
+     * ```
+     * 
+     * In this example calling focus on InputDirective will result in calling focus on the input.
+     */
+     host: StringMap<string, string>;
+    
+
+    /**
+     * Specifies which lifecycle should be notified to the directive.
+     * 
+     * See <a href='/angular2/angular2.api/LifecycleEvent'><code>LifecycleEvent</code></a> for details.
+     */
+     lifecycle: List<LifecycleEvent>;
+    
+
+    /**
+     * If set to false the compiler does not compile the children of this directive.
+     */
+     compileChildren: boolean;
+    
+
+    /**
+     * Defines the set of injectable objects that are visible to a Directive and its light dom
+     * children.
+     * 
+     * ## Simple Example
+     * 
+     * Here is an example of a class that can be injected:
+     * 
+     * ```
+     * class Greeter {
+     *    greet(name:string) {
+     *      return 'Hello ' + name + '!';
+     *    }
+     * }
+     * 
+     * @Directive({
+     *   selector: 'greet',
+     *   hostInjector: [
+     *     Greeter
+     *   ]
+     * })
+     * class HelloWorld {
+     *   greeter:Greeter;
+     * 
+     *   constructor(greeter:Greeter) {
+     *     this.greeter = greeter;
+     *   }
+     * }
+     * ```
+     */
+     hostInjector: List<any>;
+    
+
+    /**
+     * Defines the name that can be used in the template to assign this directive to a variable.
+     * 
+     * ## Simple Example
+     * 
+     * ```
+     * @Directive({
+     *   selector: 'child-dir',
+     *   exportAs: 'child'
+     * })
+     * class ChildDir {
+     * }
+     * 
+     * @Component({
+     *   selector: 'main',
+     * })
+     * @View({
+     *   template: `<child-dir #c="child"></child-dir>`,
+     *   directives: [ChildDir]
+     * })
+     * class MainComponent {
+     * }
+     * 
+     * ```
+     */
+     exportAs: string;
+  }
+  
+
+  /**
+   * Notify a directive whenever a <a href='/angular2/angular2.api/View'><code>View</code></a> that contains it is destroyed.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Directive({
+   *   ...,
+   *   lifecycle: [onDestroy]
+   * })
+   * class ClassSet {
+   *   onDestroy() {
+   *     // invoked to notify directive of the containing view destruction.
+   *   }
+   * }
+   * ```
+   * @exportedAs angular2/annotations
+   */
+  var onDestroy : LifecycleEvent ;
+  
+
+  /**
+   * Notify a directive when any of its bindings have changed.
+   * 
+   * This method is called right after the directive's bindings have been checked,
+   * and before any of its children's bindings have been checked.
+   * 
+   * It is invoked only if at least one of the directive's bindings has changed.
+   * 
+   * ## Example:
+   * 
+   * ```
+   * @Directive({
+   *   selector: '[class-set]',
+   *   properties: [
+   *     'propA',
+   *     'propB'
+   *   ],
+   *   lifecycle: [onChange]
+   * })
+   * class ClassSet {
+   *   propA;
+   *   propB;
+   *   onChange(changes:{[idx: string, PropertyUpdate]}) {
+   *     // This will get called after any of the properties have been updated.
+   *     if (changes['propA']) {
+   *       // if propA was updated
+   *     }
+   *     if (changes['propA']) {
+   *       // if propB was updated
+   *     }
+   *   }
+   * }
+   *  ```
+   * @exportedAs angular2/annotations
+   */
+  var onChange : LifecycleEvent ;
+  
+
+  /**
+   * Notify a directive when it has been checked.
+   * 
+   * This method is called right after the directive's bindings have been checked,
+   * and before any of its children's bindings have been checked.
+   * 
+   * It is invoked every time even when none of the directive's bindings has changed.
+   * 
+   * ## Example:
+   * 
+   * ```
+   * @Directive({
+   *   selector: '[class-set]',
+   *   lifecycle: [onCheck]
+   * })
+   * class ClassSet {
+   *   onCheck() {
+   *   }
+   * }
+   *  ```
+   * @exportedAs angular2/annotations
+   */
+  var onCheck : LifecycleEvent ;
+  
+
+  /**
+   * Notify a directive when it has been checked the first itme.
+   * 
+   * This method is called right after the directive's bindings have been checked,
+   * and before any of its children's bindings have been checked.
+   * 
+   * It is invoked only once.
+   * 
+   * ## Example:
+   * 
+   * ```
+   * @Directive({
+   *   selector: '[class-set]',
+   *   lifecycle: [onInit]
+   * })
+   * class ClassSet {
+   *   onInit() {
+   *   }
+   * }
+   *  ```
+   * @exportedAs angular2/annotations
+   */
+  var onInit : LifecycleEvent ;
+  
+
+  /**
+   * Notify a directive when the bindings of all its children have been checked (whether they have
+   * changed or not).
+   * 
+   * ## Example:
+   * 
+   * ```
+   * @Directive({
+   *   selector: '[class-set]',
+   *   lifecycle: [onAllChangesDone]
+   * })
+   * class ClassSet {
+   * 
+   *   onAllChangesDone() {
+   *   }
+   * 
+   * }
+   *  ```
+   * @exportedAs angular2/annotations
+   */
+  var onAllChangesDone : LifecycleEvent ;
+  
+
+  /**
+   * Declares the available HTML templates for an application.
+   * 
+   * Each angular component requires a single `@Component` and at least one `@View` annotation. The
+   * `@View` annotation specifies the HTML template to use, and lists the directives that are active
+   * within the template.
+   * 
+   * When a component is instantiated, the template is loaded into the component's shadow root, and
+   * the expressions and statements in the template are evaluated against the component.
+   * 
+   * For details on the `@Component` annotation, see <a href='/angular2/angular2.api/Component'><code>Component</code></a>.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!',
+   *   directives: [GreetUser, Bold]
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   * 
+   * @exportedAs angular2/annotations
+   */
+  class ViewAnnotation {
+    
+
+    /**
+     * Specifies an inline template for an angular component.
+     * 
+     * NOTE: either `templateUrl` or `template` should be used, but not both.
+     */
+     templateUrl: string;
+    
+
+    /**
+     * Specifies a template URL for an angular component.
+     * 
+     * NOTE: either `templateUrl` or `template` should be used, but not both.
+     */
+     template: string;
+    
+
+    /**
+     * Specifies stylesheet URLs for an angular component.
+     */
+     styleUrls: List<string>;
+    
+
+    /**
+     * Specifies an inline stylesheet for an angular component.
+     */
+     styles: List<string>;
+    
+
+    /**
+     * Specifies a list of directives that can be used within a template.
+     * 
+     * Directives must be listed explicitly to provide proper component encapsulation.
+     * 
+     * ## Example
+     * 
+     * ```javascript
+     * @Component({
+     *     selector: 'my-component'
+     *   })
+     * @View({
+     *   directives: [For]
+     *   template: '
+     *   <ul>
+     *     <li *ng-for="#item of items">{{item}}</li>
+     *   </ul>'
+     * })
+     * class MyComponent {
+     * }
+     * ```
+     */
+     directives: List<Type | any | List<any>>;
+    
+
+    /**
+     * Specify a custom renderer for this View.
+     * If this is set, neither `template`, `templateUrl`, `styles`, `styleUrls` nor `directives` are
+     * used.
+     */
+     renderer: string;
+  }
+  
+
+  /**
+   * Specifies that a <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a> should be injected.
+   * 
+   * See <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a> for usage and example.
+   * 
+   * @exportedAs angular2/annotations
+   */
+  class QueryAnnotation extends DependencyAnnotation {
+    
+     descendants: boolean;
+    
+     selector: void;
+    
+     isVarBindingQuery: boolean;
+    
+     varBindings: List<string>;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Specifies that a constant attribute value should be injected.
+   * 
+   * The directive can inject constant string literals of host element attributes.
+   * 
+   * ## Example
+   * 
+   * Suppose we have an `<input>` element and want to know its `type`.
+   * 
+   * ```html
+   * <input type="text">
+   * ```
+   * 
+   * A decorator can inject string literal `text` like so:
+   * 
+   * ```javascript
+   * @Directive({
+   *   selector: `input'
+   * })
+   * class InputDirective {
+   *   constructor(@Attribute('type') type) {
+   *     // type would be `text` in this example
+   *   }
+   * }
+   * ```
+   * 
+   * @exportedAs angular2/annotations
+   */
+  class AttributeAnnotation extends DependencyAnnotation {
+    
+     attributeName: string;
+    
+     token: void;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Defines lifecycle method [onAllChangesDone ] called when the bindings of all its children have
+   * been changed.
+   */
+  interface OnAllChangesDone {
+    
+     onAllChangesDone(): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method [onChange] called after all of component's bound
+   * properties are updated.
+   */
+  interface OnChange {
+    
+     onChange(changes: StringMap<string, any>): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method [onDestroy] called when a directive is being destroyed.
+   */
+  interface OnDestroy {
+    
+     onDestroy(): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method [onInit] called when a directive is being checked the first time.
+   */
+  interface OnInit {
+    
+     onInit(): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method [onCheck] called when a directive is being checked.
+   */
+  interface OnCheck {
+    
+     onCheck(): void;
+  }
+  
+
+  /**
+   * Provides a way for expressing ES6 classes with parameter annotations in ES5.
+   * 
+   * ## Basic Example
+   * 
+   * ```
+   * var Greeter = ng.Class({
+   *   constructor: function(name) {
+   *     this.name = name;
+   *   },
+   * 
+   *   greet: function() {
+   *     alert('Hello ' + this.name + '!');
+   *   }
+   * });
+   * ```
+   * 
+   * is equivalent to ES6:
+   * 
+   * ```
+   * class Greeter {
+   *   constructor(name) {
+   *     this.name = name;
+   *   }
+   * 
+   *   greet() {
+   *     alert('Hello ' + this.name + '!');
+   *   }
+   * }
+   * ```
+   * 
+   * or equivalent to ES5:
+   * 
+   * ```
+   * var Greeter = function (name) {
+   *   this.name = name;
+   * }
+   * 
+   * Greeter.prototype.greet = function () {
+   *   alert('Hello ' + this.name + '!');
+   * }
+   * ```
+   * 
+   * ## Example with parameter annotations
+   * 
+   * ```
+   * var MyService = neg.Class({
+   *   constructor: [String, [new Query(), QueryList], function(name, queryList) {
+   *     ...
+   *   }];
+   * });
+   * ```
+   * 
+   * is equivalent to ES6:
+   * 
+   * ```
+   * class MyService {
+   *   constructor(name: string, @Query() queryList: QueryList) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example with inheritance
+   * 
+   * ```
+   * var Shape = ng.Class({
+   *   constructor: (color) {
+   *     this.color = color;
+   *   }
+   * });
+   * 
+   * var Square = ng.Class({
+   *   extends: Shape,
+   *   constructor: function(color, size) {
+   *     Shape.call(this, color);
+   *     this.size = size;
+   *   }
+   * });
+   * ```
+   */
+  function Class(clsDef: ClassDefinition) : Type ;
+  
+
+  /**
+   * An interface implemented by all Angular parameter decorators, which allows them to be used as ES7
+   * decorators.
+   */
+  interface ParameterDecorator {
+    
+
+    /**
+     * Invoke as ES7 decorator.
+     */
+     (cls: Type, unusedKey: any, index: number): void;
+  
+  }
+  
+
+  /**
+   * <a href='/angular2/angular2.api/Attribute'><code>Attribute</code></a> factory function.
+   */
+  var Attribute : AttributeFactory ;
+  
+
+  /**
+   * <a href='/angular2/angular2.api/Attribute'><code>Attribute</code></a> factory for creating annotations, decorators or DSL.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Attribute, Component, View} from "angular2/angular2";
+   * 
+   * @Component({...})
+   * @View({...})
+   * class MyComponent {
+   *   constructor(@Attribute('title') title: string) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example as ES5 DSL
+   * 
+   * ```
+   * var MyComponent = ng
+   *   .Component({...})
+   *   .View({...})
+   *   .Class({
+   *     constructor: [new ng.Attribute('title'), function(title) {
+   *       ...
+   *     }]
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyComponent = function(title) {
+   *   ...
+   * };
+   * 
+   * MyComponent.annotations = [
+   *   new ng.Component({...})
+   *   new ng.View({...})
+   * ]
+   * MyComponent.parameters = [
+   *   [new ng.Attribute('title')]
+   * ]
+   * ```
+   */
+  interface AttributeFactory {
+    
+     new(name: string): AttributeAnnotation;
+  
+    
+     (name: string): TypeDecorator;
+  
+  }
+  
+
+  /**
+   * <a href='/angular2/angular2.api/Component'><code>Component</code></a> factory function.
+   */
+  var Component : ComponentFactory ;
+  
+  interface ViewArgs {
+    templateUrl?: string;
+    template?: string;
+    directives?: List<Type | any | List<any>>;
+    renderer?: string;
+    styles?: List<string>;
+    styleUrls?: List<string>;
+  }
+  
+  /**
+   * Interface for the <a href='/angular2/angular2.api/Component'><code>Component</code></a> decorator function.
+   * 
+   * See <a href='/angular2/angular2.api/ComponentFactory'><code>ComponentFactory</code></a>.
+   */
+   
+  interface ComponentDecorator extends TypeDecorator {
+    
+
+    /**
+     * Chain <a href='/angular2/angular2.api/View'><code>View</code></a> annotation.
+     */
+     View(obj: ViewArgs): ViewDecorator;
+  }
+  
+  interface ComponentFactoryArgs {
+    selector?: string;
+    properties?: List<string>;
+    events?: List<string>;
+    host?: StringMap<string, string>;
+    lifecycle?: List<LifecycleEvent>;
+    hostInjector?: List<any>;
+    exportAs?: string;
+    compileChildren?: boolean;
+    viewInjector?: List<any>;
+    changeDetection?: string;
+  }
+  
+  /**
+   * <a href='/angular2/angular2.api/ComponentAnnotation'><code>ComponentAnnotation</code></a> factory for creating annotations, decorators or DSL.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Component, View} from "angular2/angular2";
+   * 
+   * @Component({...})
+   * @View({...})
+   * class MyComponent {
+   *   constructor() {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example as ES5 DSL
+   * 
+   * ```
+   * var MyComponent = ng
+   *   .Component({...})
+   *   .View({...})
+   *   .Class({
+   *     constructor: function() {
+   *       ...
+   *     }
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyComponent = function() {
+   *   ...
+   * };
+   * 
+   * MyComponent.annotations = [
+   *   new ng.Component({...})
+   *   new ng.View({...})
+   * ]
+   * ```
+   */
+  interface ComponentFactory {
+    
+    new(obj: ComponentFactoryArgs): ComponentAnnotation;
+    (obj: ComponentFactoryArgs): ComponentDecorator;
+  
+  }
+  
+
+  /**
+   * <a href='/angular2/angular2.api/Directive'><code>Directive</code></a> factory function.
+   */
+  var Directive : DirectiveFactory ;
+  
+
+  /**
+   * Interface for the <a href='/angular2/angular2.api/Directive'><code>Directive</code></a> decorator function.
+   * 
+   * See <a href='/angular2/angular2.api/DirectiveFactory'><code>DirectiveFactory</code></a>.
+   */
+  interface DirectiveDecorator extends TypeDecorator {
+  }
+  
+  interface DirectiveFactoryArgs {
+    selector?: string; 
+    properties?: List<string>; 
+    events?: List<string>;
+    host?: StringMap<string, string>; 
+    lifecycle?: List<LifecycleEvent>;
+    hostInjector?: List<any>;
+    exportAs?: string;
+    compileChildren?: boolean;
+  }
+  /**
+   * <a href='/angular2/angular2.api/Directive'><code>Directive</code></a> factory for creating annotations, decorators or DSL.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Directive} from "angular2/angular2";
+   * 
+   * @Directive({...})
+   * class MyDirective {
+   *   constructor() {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example as ES5 DSL
+   * 
+   * ```
+   * var MyDirective = ng
+   *   .Directive({...})
+   *   .Class({
+   *     constructor: function() {
+   *       ...
+   *     }
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyDirective = function() {
+   *   ...
+   * };
+   * 
+   * MyDirective.annotations = [
+   *   new ng.Directive({...})
+   * ]
+   * ```
+   */
+  interface DirectiveFactory {
+     new(obj: DirectiveFactoryArgs): DirectiveAnnotation;
+     (obj: DirectiveFactoryArgs): DirectiveDecorator;
+  }
+  
+
+  /**
+   * <a href='/angular2/angular2.api/View'><code>View</code></a> factory function.
+   */
+  var View : ViewFactory ;
+  
+  interface ViewDecoratorArgs {
+    templateUrl?: string;
+    template?: string;
+    directives?: List<Type | any | List<any>>;
+    renderer?: string;
+    styles?: List<string>;
+    styleUrls?: List<string>;
+  }
+  
+  /**
+   * Interface for the <a href='/angular2/angular2.api/View'><code>View</code></a> decorator function.
+   * 
+   * See <a href='/angular2/angular2.api/ViewFactory'><code>ViewFactory</code></a>.
+   */
+  interface ViewDecorator extends TypeDecorator {
+    
+
+    /**
+     * Chain <a href='/angular2/angular2.api/View'><code>View</code></a> annotation.
+     */
+     View(obj: ViewDecoratorArgs): ViewDecorator;
+  }
+  
+  interface ViewFactoryArgs {
+    templateUrl?: string;
+    template?: string;
+    directives?: List<Type | any | List<any>>;
+    renderer?: string;
+    styles?: List<string>;
+    styleUrls?: List<string>;
+  }
+  
+  /**
+   * <a href='/angular2/angular2.api/ViewAnnotation'><code>ViewAnnotation</code></a> factory for creating annotations, decorators or DSL.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Component, View} from "angular2/angular2";
+   * 
+   * @Component({...})
+   * @View({...})
+   * class MyComponent {
+   *   constructor() {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example as ES5 DSL
+   * 
+   * ```
+   * var MyComponent = ng
+   *   .Component({...})
+   *   .View({...})
+   *   .Class({
+   *     constructor: function() {
+   *       ...
+   *     }
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyComponent = function() {
+   *   ...
+   * };
+   * 
+   * MyComponent.annotations = [
+   *   new ng.Component({...})
+   *   new ng.View({...})
+   * ]
+   * ```
+   */
+  interface ViewFactory {
+     new(obj: ViewFactoryArgs): ViewAnnotation;
+     (obj: ViewFactoryArgs): ViewDecorator;
+  }
+  
+  interface QueryFactoryOptions {
+    descendants?: boolean;
+  }
+  /**
+   * <a href='/angular2/angular2.api/Query'><code>Query</code></a> factory for creating annotations, decorators or DSL.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Query, QueryList, Component, View} from "angular2/angular2";
+   * 
+   * @Component({...})
+   * @View({...})
+   * class MyComponent {
+   *   constructor(@Query(SomeType) queryList: QueryList) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example as ES5 DSL
+   * 
+   * ```
+   * var MyComponent = ng
+   *   .Component({...})
+   *   .View({...})
+   *   .Class({
+   *     constructor: [new ng.Query(SomeType), function(queryList) {
+   *       ...
+   *     }]
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyComponent = function(queryList) {
+   *   ...
+   * };
+   * 
+   * MyComponent.annotations = [
+   *   new ng.Component({...})
+   *   new ng.View({...})
+   * ]
+   * MyComponent.parameters = [
+   *   [new ng.Query(SomeType)]
+   * ]
+   * ```
+   */
+  interface QueryFactory {
+     new(selector: Type | string, options?: QueryFactoryOptions): QueryAnnotation;  
+     (selector: Type | string, options?: QueryFactoryOptions): ParameterDecorator;
+  }
+  
+
+  /**
+   * Bootstrapping for Angular applications.
+   * 
+   * You instantiate an Angular application by explicitly specifying a component to use as the root
+   * component for your
+   * application via the `bootstrap()` method.
+   * 
+   * ## Simple Example
+   * 
+   * Assuming this `index.html`:
+   * 
+   * ```html
+   * <html>
+   *   <!-- load Angular script tags here. -->
+   *   <body>
+   *     <my-app>loading...</my-app>
+   *   </body>
+   * </html>
+   * ```
+   * 
+   * An application is bootstrapped inside an existing browser DOM, typically `index.html`. Unlike
+   * Angular 1, Angular 2
+   * does not compile/process bindings in `index.html`. This is mainly for security reasons, as well
+   * as architectural
+   * changes in Angular 2. This means that `index.html` can safely be processed using server-side
+   * technologies such as
+   * bindings. Bindings can thus use double-curly `{{ syntax }}` without collision from Angular 2
+   * component double-curly
+   * `{{ syntax }}`.
+   * 
+   * We can use this script code:
+   * 
+   * ```
+   * @Component({
+   *    selector: 'my-app'
+   * })
+   * @View({
+   *    template: 'Hello {{ name }}!'
+   * })
+   * class MyApp {
+   *   name:string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * 
+   * main() {
+   *   return bootstrap(MyApp);
+   * }
+   * ```
+   * 
+   * When the app developer invokes `bootstrap()` with the root component `MyApp` as its argument,
+   * Angular performs the
+   * following tasks:
+   * 
+   *  1. It uses the component's `selector` property to locate the DOM element which needs to be
+   * upgraded into
+   *     the angular component.
+   *  2. It creates a new child injector (from the platform injector). Optionally, you can also
+   * override the injector configuration for an app by
+   * invoking `bootstrap` with the `componentInjectableBindings` argument.
+   *  3. It creates a new `Zone` and connects it to the angular application's change detection domain
+   * instance.
+   *  4. It creates a shadow DOM on the selected component's host element and loads the template into
+   * it.
+   *  5. It instantiates the specified component.
+   *  6. Finally, Angular performs change detection to apply the initial data bindings for the
+   * application.
+   * 
+   * 
+   * ## Instantiating Multiple Applications on a Single Page
+   * 
+   * There are two ways to do this.
+   * 
+   * 
+   * ### Isolated Applications
+   * 
+   * Angular creates a new application each time that the `bootstrap()` method is invoked. When
+   * multiple applications
+   * are created for a page, Angular treats each application as independent within an isolated change
+   * detection and
+   * `Zone` domain. If you need to share data between applications, use the strategy described in the
+   * next
+   * section, "Applications That Share Change Detection."
+   * 
+   * 
+   * ### Applications That Share Change Detection
+   * 
+   * If you need to bootstrap multiple applications that share common data, the applications must
+   * share a common
+   * change detection and zone. To do that, create a meta-component that lists the application
+   * components in its template.
+   * By only invoking the `bootstrap()` method once, with the meta-component as its argument, you
+   * ensure that only a
+   * single change detection zone is created and therefore data can be shared across the applications.
+   * 
+   * 
+   * ## Platform Injector
+   * 
+   * When working within a browser window, there are many singleton resources: cookies, title,
+   * location, and others.
+   * Angular services that represent these resources must likewise be shared across all Angular
+   * applications that
+   * occupy the same browser window.  For this reason, Angular creates exactly one global platform
+   * injector which stores
+   * all shared services, and each angular application injector has the platform injector as its
+   * parent.
+   * 
+   * Each application has its own private injector as well. When there are multiple applications on a
+   * page, Angular treats
+   * each application injector's services as private to that application.
+   * 
+   * 
+   * # API
+   * - `appComponentType`: The root component which should act as the application. This is a reference
+   * to a `Type`
+   *   which is annotated with `@Component(...)`.
+   * - `componentInjectableBindings`: An additional set of bindings that can be added to the app
+   * injector
+   * to override default injection behavior.
+   * - `errorReporter`: `function(exception:any, stackTrace:string)` a default error reporter for
+   * unhandled exceptions.
+   * 
+   * Returns a `Promise` of <a href='/angular2/angular2.api/ApplicationRef'><code>ApplicationRef</code></a>.
+   * 
+   * @exportedAs angular2/core
+   */
+  function bootstrap(appComponentType: Type, componentInjectableBindings?: List<Type | Binding | List<any>>, errorReporter?: Function) : Promise<ApplicationRef> ;
+  
+
+  /**
+   * Represents a Angular's representation of an Application.
+   * 
+   * `ApplicationRef` represents a running application instance. Use it to retrieve the host
+   * component, injector,
+   * or dispose of an application.
+   */
+  class ApplicationRef {
+    
+
+    /**
+     * Returns the current <a href='/angular2/angular2.api/Component'><code>Component</code></a> type.
+     */
+     hostComponentType: Type;
+    
+
+    /**
+     * Returns the current <a href='/angular2/angular2.api/Component'><code>Component</code></a> instance.
+     */
+     hostComponent: any;
+    
+
+    /**
+     * Dispose (un-load) the application.
+     */
+     dispose(): void;
+    
+
+    /**
+     * Returns the root application <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+     */
+     injector: Injector;
+  }
+  
+
+  /**
+   * An opaque token representing the application root type in the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+   * 
+   * ```
+   * @Component(...)
+   * @View(...)
+   * class MyApp {
+   *   ...
+   * }
+   * 
+   * bootstrap(MyApp).then((appRef:ApplicationRef) {
+   *   expect(appRef.injector.get(appComponentTypeToken)).toEqual(MyApp);
+   * });
+   * 
+   * ```
+   */
+  var appComponentTypeToken:any;
+  
+
+  /**
+   * Specifies app root url for the application.
+   * 
+   * Used by the <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a> when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a>
+   */
+  class AppRootUrl {
+    
+
+    /**
+     * Returns the base URL of the currently running application.
+     */
+     value: void;
+  }
+  
+
+  /**
+   * Used by the <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a> when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a>
+   */
+  class UrlResolver {
+    
+
+    /**
+     * Resolves the `url` given the `baseUrl`:
+     * - when the `url` is null, the `baseUrl` is returned,
+     * - if `url` is relative ('path/to/here', './path/to/here'), the resolved url is a combination of
+     * `baseUrl` and `url`,
+     * - if `url` is absolute (it has a scheme: 'http://', 'https://' or start with '/'), the `url` is
+     * returned as is (ignoring the `baseUrl`)
+     * 
+     * @param {string} baseUrl
+     * @param {string} url
+     * @returns {string} the resolved URL
+     */
+     resolve(baseUrl: string, url: string): string;
+  }
+  
+
+  /**
+   * Resolve a <a href='/angular2/src/facade/lang/Type'><code>Type</code></a> from a <a href='/angular2/angular2.api/Component'><code>Component</code></a> into a URL.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a>
+   */
+  class ComponentUrlMapper {
+    
+
+    /**
+     * Returns the base URL to the component source file.
+     * The returned URL could be:
+     * - an absolute URL,
+     * - a path relative to the application
+     */
+     getUrl(component: Type): string;
+  }
+  
+
+  /**
+   * Resolve a <a href='/angular2/src/facade/lang/Type'><code>Type</code></a> for <a href='/angular2/angular2.api/Directive'><code>Directive</code></a>.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a>
+   */
+  class DirectiveResolver {
+    
+
+    /**
+     * Return <a href='/angular2/angular2.api/Directive'><code>Directive</code></a> for a given <a href='/angular2/src/facade/lang/Type'><code>Type</code></a>.
+     */
+     resolve(type: Type): DirectiveAnnotation;
+  }
+  
+
+  /**
+   * ## URL Resolution
+   * 
+   * ```
+   * var appRootUrl: AppRootUrl = ...;
+   * var componentUrlMapper: ComponentUrlMapper = ...;
+   * var urlResolver: UrlResolver = ...;
+   * 
+   * var componentType: Type = ...;
+   * var componentAnnotation: ComponentAnnotation = ...;
+   * var viewAnnotation: ViewAnnotation = ...;
+   * 
+   * // Resolving a URL
+   * 
+   * var url = viewAnnotation.templateUrl;
+   * var componentUrl = componentUrlMapper.getUrl(componentType);
+   * var componentResolvedUrl = urlResolver.resolve(appRootUrl.value, componentUrl);
+   * var templateResolvedUrl = urlResolver.resolve(componetResolvedUrl, url);
+   * ```
+   * 
+   * @exportedAs angular2/view
+   */
+  class Compiler {
+    
+     compileInHost(componentTypeOrBinding: Type | Binding): Promise<ProtoViewRef>;
+  }
+  
+
+  /**
+   * Entry point for creating, moving views in the view hierarchy and destroying views.
+   * This manager contains all recursion and delegates to helper methods
+   * in AppViewManagerUtils and the Renderer, so unit tests get simpler.
+   */
+  class AppViewManager {
+    
+
+    /**
+     * Returns associated Component <a href='/angular2/angular2.api/ViewRef'><code>ViewRef</code></a> from <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a>.
+     * 
+     * If an <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a> is from an element which has a component, this method returns
+     * the component's <a href='/angular2/angular2.api/ViewRef'><code>ViewRef</code></a>.
+     */
+     getComponentView(hostLocation: ElementRef): ViewRef;
+    
+
+    /**
+     * Returns a <a href='/angular2/angular2.api/ViewContainerRef'><code>ViewContainerRef</code></a> at the <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a> location.
+     */
+     getViewContainer(location: ElementRef): ViewContainerRef;
+    
+
+    /**
+     * Return the first child element of the host element view.
+     */
+     getHostElement(hostViewRef: ViewRef): ElementRef;
+    
+
+    /**
+     * Returns an ElementRef for the element with the given variable name
+     * in the current view.
+     * 
+     * - `hostLocation`: <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a> of any element in the View which defines the scope of
+     *   search.
+     * - `variableName`: Name of the variable to locate.
+     * - Returns <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a> of the found element or null. (Throws if not found.)
+     */
+     getNamedElementInComponentView(hostLocation: ElementRef, variableName: string): ElementRef;
+    
+
+    /**
+     * Returns the component instance for a given element.
+     * 
+     * The component is the execution context as seen by an expression at that <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a>
+     * location.
+     */
+     getComponent(hostLocation: ElementRef): any;
+    
+
+    /**
+     * Load component view into existing element.
+     * 
+     * Use this if a host element is already in the DOM and it is necessary to upgrade
+     * the element into Angular component by attaching a view but reusing the existing element.
+     * 
+     * - `hostProtoViewRef`: <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a> Proto view to use in creating a view for this
+     *   component.
+     * - `overrideSelector`: (optional) selector to use in locating the existing element to load
+     *   the view into. If not specified use the selector in the component definition of the
+     *   `hostProtoView`.
+     * - injector: <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> to use as parent injector for the view.
+     * 
+     * See <a href='/angular2/angular2.api/AppViewManager#destroyRootHostView'><code>AppViewManager</code></a>.
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * 
+     * }
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<some-component></some-component>)
+     *   `
+     * })
+     * class MyApp {
+     *   viewRef: ng.ViewRef;
+     * 
+     *   constructor(public appViewManager: ng.AppViewManager, compiler: ng.Compiler) {
+     *     compiler.compileInHost(ChildComponent).then((protoView: ng.ProtoViewRef) => {
+     *       this.viewRef = appViewManager.createRootHostView(protoView, 'some-component', null);
+     *     })
+     *   }
+     * 
+     *   onDestroy() {
+     *     this.appViewManager.destroyRootHostView(this.viewRef);
+     *     this.viewRef = null;
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     */
+     createRootHostView(hostProtoViewRef: ProtoViewRef, overrideSelector: string, injector: Injector): ViewRef;
+    
+
+    /**
+     * Remove the View created with <a href='/angular2/angular2.api/AppViewManager#createRootHostView'><code>AppViewManager</code></a>.
+     */
+     destroyRootHostView(hostViewRef: ViewRef): void;
+    
+
+    /**
+     * See <a href='/angular2/angular2.api/AppViewManager#destroyViewInContainer'><code>AppViewManager</code></a>.
+     */
+     createViewInContainer(viewContainerLocation: ElementRef, atIndex: number, protoViewRef: ProtoViewRef, context?: ElementRef, bindings?: ResolvedBinding[]): ViewRef;
+    
+
+    /**
+     * See <a href='/angular2/angular2.api/AppViewManager#createViewInContainer'><code>AppViewManager</code></a>.
+     */
+     destroyViewInContainer(viewContainerLocation: ElementRef, atIndex: number): void;
+    
+
+    /**
+     * See <a href='/angular2/angular2.api/AppViewManager#detachViewInContainer'><code>AppViewManager</code></a>.
+     */
+     attachViewInContainer(viewContainerLocation: ElementRef, atIndex: number, viewRef: ViewRef): ViewRef;
+    
+
+    /**
+     * See <a href='/angular2/angular2.api/AppViewManager#attachViewInContainer'><code>AppViewManager</code></a>.
+     */
+     detachViewInContainer(viewContainerLocation: ElementRef, atIndex: number): ViewRef;
+  }
+  
+
+  /**
+   * An iterable live list of components in the Light DOM.
+   * 
+   * Injectable Objects that contains a live list of child directives in the light DOM of a directive.
+   * The directives are kept in depth-first pre-order traversal of the DOM.
+   * 
+   * The `QueryList` is iterable, therefore it can be used in both javascript code with `for..of` loop
+   * as well as in
+   * template with `*ng-for="of"` directive.
+   * 
+   * NOTE: In the future this class will implement an `Observable` interface. For now it uses a plain
+   * list of observable
+   * callbacks.
+   * 
+   * # Example:
+   * 
+   * Assume that `<tabs>` component would like to get a list its children which are `<pane>`
+   * components as shown in this
+   * example:
+   * 
+   * ```html
+   * <tabs>
+   *   <pane title="Overview">...</pane>
+   *   <pane *ng-for="#o of objects" [title]="o.title">{{o.text}}</pane>
+   * </tabs>
+   * ```
+   * 
+   * In the above example the list of `<tabs>` elements needs to get a list of `<pane>` elements so
+   * that it could render
+   * tabs with the correct titles and in the correct order.
+   * 
+   * A possible solution would be for a `<pane>` to inject `<tabs>` component and then register itself
+   * with `<tabs>`
+   * component's on `hydrate` and deregister on `dehydrate` event. While a reasonable approach, this
+   * would only work
+   * partialy since `*ng-for` could rearrange the list of `<pane>` components which would not be
+   * reported to `<tabs>`
+   * component and thus the list of `<pane>` components would be out of sync with respect to the list
+   * of `<pane>` elements.
+   * 
+   * A preferred solution is to inject a `QueryList` which is a live list of directives in the
+   * component`s light DOM.
+   * 
+   * ```javascript
+   * @Component({
+   *   selector: 'tabs'
+   * })
+   * @View({
+   *  template: `
+   *    <ul>
+   *      <li *ng-for="#pane of panes">{{pane.title}}</li>
+   *    </ul>
+   *    <content></content>
+   *  `
+   * })
+   * class Tabs {
+   *   panes: QueryList<Pane>
+   * 
+   *   constructor(@Query(Pane) panes:QueryList<Pane>) {
+   *     this.panes = panes;
+   *   }
+   * }
+   * 
+   * @Component({
+   *   selector: 'pane',
+   *   properties: ['title']
+   * })
+   * @View(...)
+   * class Pane {
+   *   title:string;
+   * }
+   * ```
+   * 
+   * @exportedAs angular2/view
+   */
+  class QueryList<T> extends BaseQueryList<T> {
+    
+     onChange(callback: any): void;
+    
+     removeCallback(callback: any): void;
+  }
+  
+
+  /**
+   * Reference to the element.
+   * 
+   * Represents an opeque refference to the underlying element. The element is a DOM ELement in
+   * a Browser, but may represent other types on other rendering platforms. In the browser the
+   * `ElementRef` can be sent to the web-worker. Web Workers can not have references to the
+   * DOM Elements.
+   * 
+   * @exportedAs angular2/view
+   */
+  class ElementRef implements RenderElementRef {
+    
+
+    /**
+     * Reference to the <a href='/angular2/angular2.api/ViewRef'><code>ViewRef</code></a> where the `ElementRef` is inside of.
+     */
+     parentView: ViewRef;
+    
+
+    /**
+     * Index of the element inside the <a href='/angular2/angular2.api/ViewRef'><code>ViewRef</code></a>.
+     * 
+     * This is used internally by the Angular framework to locate elements.
+     */
+     boundElementIndex: number;
+    
+     renderView: RenderViewRef;
+    
+
+    /**
+     * Returns the native Element implementation.
+     * 
+     * In the browser this represents the DOM Element.
+     * 
+     * The `nativeElement` can be used as an escape hatch when direct DOM manipulation is needed. Use
+     * this with caution, as it creates tight coupling between your application and the Browser, which
+     * will not work in WebWorkers.
+     * 
+     * NOTE: This method will return null in the webworker scenario!
+     */
+     nativeElement: any;
+  }
+  
+
+  /**
+   * Abstract reference to the element which can be marshaled across web-worker boundry.
+   * 
+   * This interface is used by the <a href='/angular2/angular2.api/Renderer'><code>Renderer</code></a> api.
+   */
+  interface RenderElementRef {
+    
+
+    /**
+     * Reference to the <a href='/angular2/angular2.api/RenderViewRef'><code>RenderViewRef</code></a> where the `RenderElementRef` is inside of.
+     */
+     renderView: RenderViewRef;
+    
+
+    /**
+     * Index of the element inside the <a href='/angular2/angular2.api/ViewRef'><code>ViewRef</code></a>.
+     * 
+     * This is used internally by the Angular framework to locate elements.
+     */
+     boundElementIndex: number;
+  }
+  
+
+  /**
+   * A reference to an Angular View.
+   * 
+   * A View is a fundemental building block of Application UI. A View is the smallest set of
+   * elements which are created and destroyed together. A View can chane properties on the elements
+   * within the view, but it can not change the structure of those elements.
+   * 
+   * To change structure of the elements, the Views can contain zero or more <a href='/angular2/angular2.api/ViewContainerRef'><code>ViewContainerRef</code></a>s
+   * which allow the views to be nested.
+   * 
+   * ## Example
+   * 
+   * Given this template
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * The above example we have two <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>s:
+   * 
+   * Outter <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separet <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>s.
+   * 
+   * The outter/inner <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>s are then assambled into views like so:
+   * 
+   * ```
+   * <!-- ViewRef: outter-0 -->
+   * Count: 2
+   * <ul>
+   *   <template view-container-ref></template>
+   *   <!-- ViewRef: inner-1 --><li>first</li><!-- /ViewRef: inner-1 -->
+   *   <!-- ViewRef: inner-2 --><li>second</li><!-- /ViewRef: inner-2 -->
+   * </ul>
+   * <!-- /ViewRef: outter-0 -->
+   * ```
+   * 
+   * @exportedAs angular2/view
+   */
+  class ViewRef {
+    
+
+    /**
+     * Return <a href='/angular2/angular2.api/RenderViewRef'><code>RenderViewRef</code></a>
+     */
+     render: RenderViewRef;
+    
+
+    /**
+     * Set local variable for a view.
+     */
+     setLocal(contextName: string, value: any): void;
+  }
+  
+
+  /**
+   * A reference to an an Angular ProtoView.
+   * 
+   * A ProtoView is a reference to a template for easy creation of views.
+   * (See <a href='/angular2/angular2.api/AppViewManager#createViewInContainer'><code>AppViewManager</code></a> and <a href='/angular2/angular2.api/AppViewManager#createRootHostView'><code>AppViewManager</code></a>).
+   * 
+   * A `ProtoView` is a foctary for creating `View`s.
+   * 
+   * ## Example
+   * 
+   * Given this template
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * The above example we have two <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>s:
+   * 
+   * Outter <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separet <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>s.
+   * 
+   * @exportedAs angular2/view
+   */
+  class ProtoViewRef {
+  }
+  
+
+  /**
+   * @exportedAs angular2/core
+   */
+  class ViewContainerRef {
+    
+     viewManager: AppViewManager;
+    
+     element: ElementRef;
+    
+     clear(): void;
+    
+     get(index: number): ViewRef;
+    
+     length: number;
+    
+     create(protoViewRef?: ProtoViewRef, atIndex?: number, context?: ElementRef, bindings?: ResolvedBinding[]): ViewRef;
+    
+     insert(viewRef: ViewRef, atIndex?: number): ViewRef;
+    
+     indexOf(viewRef: ViewRef): number;
+    
+     remove(atIndex?: number): void;
+    
+
+    /**
+     * The method can be used together with insert to implement a view move, i.e.
+     * moving the dom nodes while the directives in the view stay intact.
+     */
+     detach(atIndex?: number): ViewRef;
+  }
+  
+
+  /**
+   * Service for dynamically loading a Component into an arbitrary position in the internal Angular
+   * application tree.
+   * 
+   * @exportedAs angular2/view
+   */
+  class DynamicComponentLoader {
+    
+
+    /**
+     * Loads a root component that is placed at the first element that matches the component's
+     * selector.
+     * 
+     * The loaded component receives injection normally as a hosted view.
+     */
+     loadAsRoot(typeOrBinding: Type | Binding, overrideSelector: string, injector: Injector): Promise<ComponentRef>;
+    
+
+    /**
+     * Loads a component into the component view of the provided ElementRef
+     * next to the element with the given name
+     * The loaded component receives
+     * injection normally as a hosted view.
+     */
+     loadIntoLocation(typeOrBinding: Type | Binding, hostLocation: ElementRef, anchorName: string, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+
+    /**
+     * Loads a component next to the provided ElementRef. The loaded component receives
+     * injection normally as a hosted view.
+     */
+     loadNextToLocation(typeOrBinding: Type | Binding, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+  }
+  
+
+  /**
+   * @exportedAs angular2/view
+   */
+  class ComponentRef {
+    
+     location: ElementRef;
+    
+     instance: any;
+    
+     dispose: Function;
+    
+     hostView: ViewRef;
+  }
+  
+  interface NgZoneArgs {
+    onTurnStart?: /*() => void*/ Function;
+    onTurnDone?: /*() => void*/ Function;
+    onErrorHandler?: /*(error, stack) => void*/ Function;
+  }
+
+  /**
+   * A wrapper around zones that lets you schedule tasks after it has executed a task.
+   * 
+   * The wrapper maintains an "inner" and an "mount" `Zone`. The application code will executes
+   * in the "inner" zone unless `runOutsideAngular` is explicitely called.
+   * 
+   * A typical application will create a singleton `NgZone`. The outer `Zone` is a fork of the root
+   * `Zone`. The default `onTurnDone` runs the Angular change detection.
+   * 
+   * @exportedAs angular2/core
+   */
+  class NgZone {
+    
+
+  /**
+   * Initializes the zone hooks.
+   * 
+   * @param {() => void} onTurnStart called before code executes in the inner zone for each VM turn
+   * @param {() => void} onTurnDone called at the end of a VM turn if code has executed in the inner
+   * zone
+   * @param {(error, stack) => void} onErrorHandler called when an exception is thrown by a macro or
+   * micro task
+   */
+  initCallbacks(args?: NgZoneArgs): void;
+    
+
+    /**
+     * Runs `fn` in the inner zone and returns whatever it returns.
+     * 
+     * In a typical app where the inner zone is the Angular zone, this allows one to make use of the
+     * Angular's auto digest mechanism.
+     * 
+     * ```
+     * var zone: NgZone = [ref to the application zone];
+     * 
+     * zone.run(() => {
+     *   // the change detection will run after this function and the microtasks it enqueues have
+     * executed.
+     * });
+     * ```
+     */
+     run(fn: any): any;
+    
+
+    /**
+     * Runs `fn` in the outer zone and returns whatever it returns.
+     * 
+     * In a typical app where the inner zone is the Angular zone, this allows one to escape Angular's
+     * auto-digest mechanism.
+     * 
+     * ```
+     * var zone: NgZone = [ref to the application zone];
+     * 
+     * zone.runOusideAngular(() => {
+     *   element.onClick(() => {
+     *     // Clicking on the element would not trigger the change detection
+     *   });
+     * });
+     * ```
+     */
+     runOutsideAngular(fn: any): any;
+  }
+  
+  class Observable {
+    
+     observer(generator: any): Object;
+  }
+  
+
+  /**
+   * Use Rx.Observable but provides an adapter to make it work as specified here:
+   * https://github.com/jhusain/observable-spec
+   * 
+   * Once a reference implementation of the spec is available, switch to it.
+   */
+  class EventEmitter extends Observable {
+    
+     observer(generator: any): Rx.IDisposable;
+    
+     toRx(): Rx.Observable<any>;
+    
+     next(value: any): void;
+    
+     throw(error: any): void;
+    
+     return(value?: any): void;
+  }
+  
+  class ProtoViewFactory {
+    
+     createAppProtoViews(hostComponentBinding: DirectiveBinding, rootRenderProtoView:ProtoViewDto, allDirectives: List<DirectiveBinding>): List<AppProtoView>;
+  }
+  
+  class RenderCompiler {
+    
+
+    /**
+     * Creats a ProtoViewDto that contains a single nested component with the given componentId.
+     */
+     compileHost(directiveMetadata: DirectiveMetadata): Promise<ProtoViewDto>;
+    
+
+    /**
+     * Compiles a single DomProtoView. Non recursive so that
+     * we don't need to serialize all possible components over the wire,
+     * but only the needed ones based on previous calls.
+     */
+     compile(view: ViewDefinition): Promise<ProtoViewDto>;
+  }
+  
+
+  /**
+   * Cache that stores the AppProtoView of the template of a component.
+   * Used to prevent duplicate work and resolve cyclic dependencies.
+   */
+  class CompilerCache {
+    
+     set(component: Type, protoView: AppProtoView): void;
+    
+     get(component: Type): AppProtoView;
+    
+     setHost(component: Type, protoView: AppProtoView): void;
+    
+     getHost(component: Type): AppProtoView;
+    
+     clear(): void;
+  }
+  
+
+  /**
+   * A collection of the Angular core directives that are likely to be used in each and every Angular
+   * application.
+   * 
+   * This collection can be used to quickly enumerate all the built-in directives in the `@View`
+   * annotation. For example,
+   * instead of writing:
+   * 
+   * ```
+   * import {If, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
+   * import {OtherDirective} from 'myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [If, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   * one could enumerate all the core directives at once:
+   * 
+   * ```
+   * import {coreDirectives} from 'angular2/angular2';
+   * import {OtherDirective} from 'myDirectives';
+   * 
+   * @Component({
+   *  selector: 'my-component'
+   * })
+   * @View({
+   *   templateUrl: 'myComponent.html',
+   *   directives: [coreDirectives, OtherDirective]
+   * })
+   * export class MyComponent {
+   *   ...
+   * }
+   * ```
+   */
+  var coreDirectives : List<Type> ;
+  
+  class CSSClass {
+    
+     rawClass: void;
+    
+     onCheck(): void;
+  }
+  
+
+  /**
+   * The `NgFor` directive instantiates a template once per item from an iterable. The context for
+   * each instantiated template inherits from the outer context with the given loop variable set
+   * to the current item from the iterable.
+   * 
+   * It is possible to alias the `index` to a local variable that will be set to the current loop
+   * iteration in the template context.
+   * 
+   * When the contents of the iterator changes, `NgFor` makes the corresponding changes to the DOM:
+   * 
+   * * When an item is added, a new instance of the template is added to the DOM.
+   * * When an item is removed, its template instance is removed from the DOM.
+   * * When items are reordered, their respective templates are reordered in the DOM.
+   * 
+   * # Example
+   * 
+   * ```
+   * <ul>
+   *   <li *ng-for="#error of errors; #i = index">
+   *     Error {{i}} of {{errors.length}}: {{error.message}}
+   *   </li>
+   * </ul>
+   * ```
+   * 
+   * # Syntax
+   * 
+   * - `<li *ng-for="#item of items; #i = index">...</li>`
+   * - `<li template="ng-for #item of items; #i = index">...</li>`
+   * - `<template ng-for #item [ng-for-of]="items" #i="index"><li>...</li></template>`
+   * 
+   * @exportedAs angular2/directives
+   */
+  class NgFor {
+    
+     viewContainer: ViewContainerRef;
+    
+     protoViewRef: ProtoViewRef;
+    
+     pipes: PipeRegistry;
+    
+     ngForOf: void;
+    
+     onCheck(): void;
+  }
+  
+
+  /**
+   * Removes or recreates a portion of the DOM tree based on an {expression}.
+   * 
+   * If the expression assigned to `ng-if` evaluates to a false value then the element
+   * is removed from the DOM, otherwise a clone of the element is reinserted into the DOM.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <div *ng-if="errorCount > 0" class="error">
+   *   <!-- Error message displayed when the errorCount property on the current context is greater
+   * than 0. -->
+   *   {{errorCount}} errors detected
+   * </div>
+   * ```
+   * 
+   * # Syntax
+   * 
+   * - `<div *ng-if="condition">...</div>`
+   * - `<div template="ng-if condition">...</div>`
+   * - `<template [ng-if]="condition"><div>...</div></template>`
+   * 
+   * @exportedAs angular2/directives
+   */
+  class NgIf {
+    
+     viewContainer: ViewContainerRef;
+    
+     protoViewRef: ProtoViewRef;
+    
+     prevCondition: boolean;
+    
+     ngIf: void;
+  }
+  
+
+  /**
+   * The `NgNonBindable` directive tells Angular not to compile or bind the contents of the current
+   * DOM element. This is useful if the element contains what appears to be Angular directives and
+   * bindings but which should be ignored by Angular. This could be the case if you have a site that
+   * displays snippets of code, for instance.
+   * 
+   * Example:
+   * 
+   * ```
+   * <div>Normal: {{1 + 2}}</div> // output "Normal: 3"
+   * <div non-bindable>Ignored: {{1 + 2}}</div> // output "Ignored: {{1 + 2}}"
+   * ```
+   * 
+   * @exportedAs angular2/directives
+   */
+  class NgNonBindable {
+  }
+  
+  class NgStyle {
+    
+     rawStyle: void;
+    
+     onCheck(): void;
+  }
+  
+  class SwitchView {
+    
+     create(): void;
+    
+     destroy(): void;
+  }
+  
+
+  /**
+   * The `NgSwitch` directive is used to conditionally swap DOM structure on your template based on a
+   * scope expression.
+   * Elements within `NgSwitch` but without `NgSwitchWhen` or `NgSwitchDefault` directives will be
+   * preserved at the location as specified in the template.
+   * 
+   * `NgSwitch` simply chooses nested elements and makes them visible based on which element matches
+   * the value obtained from the evaluated expression. In other words, you define a container element
+   * (where you place the directive), place an expression on the **`[ng-switch]="..."` attribute**),
+   * define any inner elements inside of the directive and place a `[ng-switch-when]` attribute per
+   * element.
+   * The when attribute is used to inform NgSwitch which element to display when the expression is
+   * evaluated. If a matching expression is not found via a when attribute then an element with the
+   * default attribute is displayed.
+   * 
+   * # Example:
+   * 
+   * ```
+   * <ANY [ng-switch]="expression">
+   *   <template [ng-switch-when]="whenExpression1">...</template>
+   *   <template [ng-switch-when]="whenExpression1">...</template>
+   *   <template ng-switch-default>...</template>
+   * </ANY>
+   * ```
+   * 
+   * @exportedAs angular2/directives
+   */
+  class NgSwitch {
+    
+     ngSwitch: void;
+  }
+  
+
+  /**
+   * Defines a case statement as an expression.
+   * 
+   * If multiple `NgSwitchWhen` match the `NgSwitch` value, all of them are displayed.
+   * 
+   * Example:
+   * 
+   * ```
+   * // match against a context variable
+   * <template [ng-switch-when]="contextVariable">...</template>
+   * 
+   * // match against a constant string
+   * <template ng-switch-when="stringValue">...</template>
+   * ```
+   * 
+   * @exportedAs angular2/directives
+   */
+  class NgSwitchWhen {
+    
+     onDestroy(): void;
+    
+     ngSwitchWhen: void;
+  }
+  
+
+  /**
+   * Defines a default case statement.
+   * 
+   * Default case statements are displayed when no `NgSwitchWhen` match the `ng-switch` value.
+   * 
+   * Example:
+   * 
+   * ```
+   * <template ng-switch-default>...</template>
+   * ```
+   * 
+   * @exportedAs angular2/directives
+   */
+  class NgSwitchDefault {
+  }
+  
+
+  /**
+   * Mock Connection to represent a <a href='/angular2/angular2.api/Connection'><code>Connection</code></a> for tests.
+   */
+  class MockConnection {
+    
+
+    /**
+     * Describes the state of the connection, based on `XMLHttpRequest.readyState`, but with
+     * additional states. For example, state 5 indicates an aborted connection.
+     */
+     readyState: ReadyStates;
+    
+
+    /**
+     * <a href='/angular2/angular2.api/Request'><code>Request</code></a> instance used to create the connection.
+     */
+     request: Request;
+    
+
+    /**
+     * <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> of <a href='/angular2/angular2.api/Response'><code>Response</code></a>. Can be subscribed to in order to be notified when a
+     * response is available.
+     */
+     response: EventEmitter;
+    
+
+    /**
+     * Changes the `readyState` of the connection to a custom state of 5 (cancelled).
+     */
+     dispose(): void;
+    
+
+    /**
+     * Sends a mock response to the connection. This response is the value that is emitted to the
+     * <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> returned by <a href='/angular2/angular2.api/Http'><code>Http</code></a>.
+     * 
+     * #Example
+     * 
+     * ```
+     * var connection;
+     * backend.connections.subscribe(c => connection = c);
+     * http.request('data.json').subscribe(res => console.log(res.text()));
+     * connection.mockRespond(new Response('fake response')); //logs 'fake response'
+     * ```
+     */
+     mockRespond(res: Response): void;
+    
+
+    /**
+     * Not yet implemented!
+     * 
+     * Sends the provided <a href='/angular2/angular2.api/Response'><code>Response</code></a> to the `downloadObserver` of the `Request`
+     * associated with this connection.
+     */
+     mockDownload(res: Response): void;
+    
+
+    /**
+     * Emits the provided error object as an error to the <a href='/angular2/angular2.api/Response'><code>Response</code></a> <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a>
+     * returned
+     * from <a href='/angular2/angular2.api/Http'><code>Http</code></a>.
+     */
+     mockError(err?: any): void;
+  }
+  
+
+  /**
+   * A mock backend for testing the <a href='/angular2/angular2.api/Http'><code>Http</code></a> service.
+   * 
+   * This class can be injected in tests, and should be used to override bindings
+   * to other backends, such as <a href='/angular2/angular2.api/XHRBackend'><code>XHRBackend</code></a>.
+   * 
+   * #Example
+   * 
+   * ```
+   * import {MockBackend, DefaultOptions, Http} from 'angular2/http';
+   * it('should get some data', inject([AsyncTestCompleter], (async) => {
+   *   var connection;
+   *   var injector = Injector.resolveAndCreate([
+   *     MockBackend,
+   *     bind(Http).toFactory((backend, defaultOptions) => {
+   *       return new Http(backend, defaultOptions)
+   *     }, [MockBackend, DefaultOptions])]);
+   *   var http = injector.get(Http);
+   *   var backend = injector.get(MockBackend);
+   *   //Assign any newly-created connection to local variable
+   *   backend.connections.subscribe(c => connection = c);
+   *   http.request('data.json').subscribe((res) => {
+   *     expect(res.text()).toBe('awesome');
+   *     async.done();
+   *   });
+   *   connection.mockRespond(new Response('awesome'));
+   * }));
+   * ```
+   * 
+   * This method only exists in the mock implementation, not in real Backends.
+   */
+  class MockBackend {
+    
+
+    /**
+     * <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a>
+     * of <a href='/angular2/angular2.api/MockConnection'><code>MockConnection</code></a> instances that have been created by this backend. Can be subscribed
+     * to in order to respond to connections.
+     * 
+     * #Example
+     * 
+     * ```
+     * import {MockBackend, Http, BaseRequestOptions} from 'angular2/http';
+     * import {Injector} from 'angular2/di';
+     * 
+     * it('should get a response', () => {
+     *   var connection; //this will be set when a new connection is emitted from the backend.
+     *   var text; //this will be set from mock response
+     *   var injector = Injector.resolveAndCreate([
+     *     MockBackend,
+     *     bind(Http).toFactory(backend, options) {
+     *       return new Http(backend, options);
+     *     }, [MockBackend, BaseRequestOptions]]);
+     *   var backend = injector.get(MockBackend);
+     *   var http = injector.get(Http);
+     *   backend.connections.subscribe(c => connection = c);
+     *   http.request('something.json').subscribe(res => {
+     *     text = res.text();
+     *   });
+     *   connection.mockRespond(new Response({body: 'Something'}));
+     *   expect(text).toBe('Something');
+     * });
+     * ```
+     * 
+     * This property only exists in the mock implementation, not in real Backends.
+     */
+     connections: EventEmitter;
+    
+
+    /**
+     * An array representation of `connections`. This array will be updated with each connection that
+     * is created by this backend.
+     * 
+     * This property only exists in the mock implementation, not in real Backends.
+     */
+     connectionsArray: Array<MockConnection>;
+    
+
+    /**
+     * <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> of <a href='/angular2/angular2.api/MockConnection'><code>MockConnection</code></a> instances that haven't yet been resolved (i.e.
+     * with a `readyState`
+     * less than 4). Used internally to verify that no connections are pending via the
+     * `verifyNoPendingRequests` method.
+     * 
+     * This property only exists in the mock implementation, not in real Backends.
+     */
+     pendingConnections: EventEmitter;
+    
+
+    /**
+     * Checks all connections, and raises an exception if any connection has not received a response.
+     * 
+     * This method only exists in the mock implementation, not in real Backends.
+     */
+     verifyNoPendingRequests(): void;
+    
+
+    /**
+     * Can be used in conjunction with `verifyNoPendingRequests` to resolve any not-yet-resolve
+     * connections, if it's expected that there are connections that have not yet received a response.
+     * 
+     * This method only exists in the mock implementation, not in real Backends.
+     */
+     resolveAllConnections(): void;
+    
+
+    /**
+     * Creates a new <a href='/angular2/angular2.api/MockConnection'><code>MockConnection</code></a>. This is equivalent to calling `new
+     * MockConnection()`, except that it also will emit the new `Connection` to the `connections`
+     * emitter of this `MockBackend` instance. This method will usually only be used by tests
+     * against the framework itself, not by end-users.
+     */
+     createConnection(req: Request): Connection;
+  }
+  
+
+  /**
+   * Creates `Request` instances from provided values.
+   * 
+   * The Request's interface is inspired by the Request constructor defined in the [Fetch
+   * Spec](https://fetch.spec.whatwg.org/#request-class),
+   * but is considered a static value whose body can be accessed many times. There are other
+   * differences in the implementation, but this is the most significant.
+   */
+  class Request {
+    
+
+    /**
+     * Http method with which to perform the request.
+     * 
+     * Defaults to GET.
+     */
+     method: RequestMethods;
+    
+     mode: RequestModesOpts;
+    
+     credentials: RequestCredentialsOpts;
+    
+
+    /**
+     * Headers object based on the `Headers` class in the [Fetch
+     * Spec](https://fetch.spec.whatwg.org/#headers-class). <a href='/angular2/angular2.api/Headers'><code>Headers</code></a> class reference.
+     */
+     headers: Headers;
+    
+
+    /**
+     * Url of the remote resource
+     */
+     url: string;
+    
+     cache: RequestCacheOpts;
+    
+
+    /**
+     * Returns the request's body as string, assuming that body exists. If body is undefined, return
+     * empty
+     * string.
+     */
+     text(): String;
+  }
+  
+
+  /**
+   * Creates `Response` instances from provided values.
+   * 
+   * Though this object isn't
+   * usually instantiated by end-users, it is the primary object interacted with when it comes time to
+   * add data to a view.
+   * 
+   * #Example
+   * 
+   * ```
+   * http.request('my-friends.txt').subscribe(response => this.friends = response.text());
+   * ```
+   * 
+   * The Response's interface is inspired by the Response constructor defined in the [Fetch
+   * Spec](https://fetch.spec.whatwg.org/#response-class), but is considered a static value whose body
+   * can be accessed many times. There are other differences in the implementation, but this is the
+   * most significant.
+   */
+  class Response {
+    
+
+    /**
+     * One of "basic", "cors", "default", "error, or "opaque".
+     * 
+     * Defaults to "default".
+     */
+     type: ResponseTypes;
+    
+
+    /**
+     * True if the response's status is within 200-299
+     */
+     ok: boolean;
+    
+
+    /**
+     * URL of response.
+     * 
+     * Defaults to empty string.
+     */
+     url: string;
+    
+
+    /**
+     * Status code returned by server.
+     * 
+     * Defaults to 200.
+     */
+     status: number;
+    
+
+    /**
+     * Text representing the corresponding reason phrase to the `status`, as defined in [ietf rfc 2616
+     * section 6.1.1](https://tools.ietf.org/html/rfc2616#section-6.1.1)
+     * 
+     * Defaults to "OK"
+     */
+     statusText: string;
+    
+
+    /**
+     * Non-standard property
+     * 
+     * Denotes how many of the response body's bytes have been loaded, for example if the response is
+     * the result of a progress event.
+     */
+     bytesLoaded: number;
+    
+
+    /**
+     * Non-standard property
+     * 
+     * Denotes how many bytes are expected in the final response body.
+     */
+     totalBytes: number;
+    
+
+    /**
+     * Headers object based on the `Headers` class in the [Fetch
+     * Spec](https://fetch.spec.whatwg.org/#headers-class).
+     */
+     headers: Headers;
+    
+
+    /**
+     * Not yet implemented
+     */
+     blob(): any;
+    
+
+    /**
+     * Attempts to return body as parsed `JSON` object, or raises an exception.
+     */
+     json(): Object;
+    
+
+    /**
+     * Returns the body as a string, presuming `toString()` can be called on the response body.
+     */
+     text(): string;
+    
+
+    /**
+     * Not yet implemented
+     */
+     arrayBuffer(): any;
+  }
+  
+
+  /**
+   * Interface for options to construct a Request, based on
+   * [RequestInit](https://fetch.spec.whatwg.org/#requestinit) from the Fetch spec.
+   */
+  interface IRequestOptions {
+    
+     url?: string;
+    
+     method?: RequestMethods;
+    
+     headers?: Headers;
+    
+     body?: string;
+    
+     mode?: RequestModesOpts;
+    
+     credentials?: RequestCredentialsOpts;
+    
+     cache?: RequestCacheOpts;
+  }
+  
+
+  /**
+   * Interface for options to construct a Response, based on
+   * [ResponseInit](https://fetch.spec.whatwg.org/#responseinit) from the Fetch spec.
+   */
+  interface IResponseOptions {
+    
+     body?: string | Object | FormData;
+    
+     status?: number;
+    
+     statusText?: string;
+    
+     headers?: Headers;
+    
+     type?: ResponseTypes;
+    
+     url?: string;
+  }
+  
+
+  /**
+   * Abstract class from which real connections are derived.
+   */
+  class Connection {
+    
+     readyState: ReadyStates;
+    
+     request: Request;
+    
+     response: EventEmitter;
+    
+     dispose(): void;
+  }
+  
+
+  /**
+   * Abstract class from which real backends are derived.
+   * 
+   * The primary purpose of a `ConnectionBackend` is to create new connections to fulfill a given
+   * <a href='/angular2/angular2.api/Request'><code>Request</code></a>.
+   */
+  class ConnectionBackend {
+    
+     createConnection(request: any): Connection;
+  }
+  
+
+  /**
+   * Injectable version of <a href='/angular2/angular2.api/RequestOptions'><code>RequestOptions</code></a>, with overridable default values.
+   * 
+   * #Example
+   * 
+   * ```
+   * import {Http, BaseRequestOptions, Request} from 'angular2/http';
+   * ...
+   * class MyComponent {
+   *   constructor(baseRequestOptions:BaseRequestOptions, http:Http) {
+   *     var options = baseRequestOptions.merge({body: 'foobar', url: 'https://foo'});
+   *     var request = new Request(options);
+   *     http.request(request).subscribe(res => this.bars = res.json());
+   *   }
+   * }
+   * 
+   * ```
+   */
+  class BaseRequestOptions extends RequestOptions {
+  }
+  
+
+  /**
+   * Creates a request options object similar to the `RequestInit` description
+   * in the [Fetch
+   * Spec](https://fetch.spec.whatwg.org/#requestinit) to be optionally provided when instantiating a
+   * <a href='/angular2/angular2.api/Request'><code>Request</code></a>.
+   * 
+   * All values are null by default.
+   */
+  class RequestOptions implements IRequestOptions {
+    
+
+    /**
+     * Http method with which to execute the request.
+     * 
+     * Defaults to "GET".
+     */
+     method: RequestMethods;
+    
+
+    /**
+     * Headers object based on the `Headers` class in the [Fetch
+     * Spec](https://fetch.spec.whatwg.org/#headers-class).
+     */
+     headers: Headers;
+    
+
+    /**
+     * Body to be used when creating the request.
+     */
+     body: string;
+    
+     mode: RequestModesOpts;
+    
+     credentials: RequestCredentialsOpts;
+    
+     cache: RequestCacheOpts;
+    
+     url: string;
+    
+
+    /**
+     * Creates a copy of the `RequestOptions` instance, using the optional input as values to override
+     * existing values.
+     */
+     merge(options?: IRequestOptions): RequestOptions;
+  }
+  
+
+  /**
+   * Injectable version of <a href='/angular2/angular2.api/ResponseOptions'><code>ResponseOptions</code></a>, with overridable default values.
+   */
+  class BaseResponseOptions extends ResponseOptions {
+    
+     body: string | Object | ArrayBuffer | JSON | FormData | Blob;
+    
+     status: number;
+    
+     headers: Headers;
+    
+     statusText: string;
+    
+     type: ResponseTypes;
+    
+     url: string;
+  }
+  
+
+  /**
+   * Creates a response options object similar to the
+   * [ResponseInit](https://fetch.spec.whatwg.org/#responseinit) description
+   * in the Fetch
+   * Spec to be optionally provided when instantiating a
+   * <a href='/angular2/angular2.api/Response'><code>Response</code></a>.
+   * 
+   * All values are null by default.
+   */
+  class ResponseOptions implements IResponseOptions {
+    
+     body: string | Object;
+    
+     status: number;
+    
+     headers: Headers;
+    
+     statusText: string;
+    
+     type: ResponseTypes;
+    
+     url: string;
+    
+     merge(options?: IResponseOptions): ResponseOptions;
+  }
+  
+
+  /**
+   * Creates <a href='/angular2/angular2.api/XHRConnection'><code>XHRConnection</code></a> instances.
+   * 
+   * This class would typically not be used by end users, but could be
+   * overridden if a different backend implementation should be used,
+   * such as in a node backend.
+   * 
+   * #Example
+   * 
+   * ```
+   * import {Http, MyNodeBackend, httpInjectables, BaseRequestOptions} from 'angular2/http';
+   * @Component({
+   *   viewInjector: [
+   *     httpInjectables,
+   *     bind(Http).toFactory((backend, options) => {
+   *       return new Http(backend, options);
+   *     }, [MyNodeBackend, BaseRequestOptions])]
+   * })
+   * class MyComponent {
+   *   constructor(http:Http) {
+   *     http('people.json').subscribe(res => this.people = res.json());
+   *   }
+   * }
+   * ```
+   */
+  class XHRBackend implements ConnectionBackend {
+    
+     createConnection(request: Request): XHRConnection;
+  }
+  
+
+  /**
+   * Creates connections using `XMLHttpRequest`. Given a fully-qualified
+   * request, an `XHRConnection` will immediately create an `XMLHttpRequest` object and send the
+   * request.
+   * 
+   * This class would typically not be created or interacted with directly inside applications, though
+   * the <a href='/angular2/angular2.api/MockConnection'><code>MockConnection</code></a> may be interacted with in tests.
+   */
+  class XHRConnection implements Connection {
+    
+     request: Request;
+    
+
+    /**
+     * Response <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> which emits a single <a href='/angular2/angular2.api/Response'><code>Response</code></a> value on load event of
+     * `XMLHttpRequest`.
+     */
+     response: EventEmitter;
+    
+     readyState: ReadyStates;
+    
+
+    /**
+     * Calls abort on the underlying XMLHttpRequest.
+     */
+     dispose(): void;
+  }
+  
+
+  /**
+   * Performs http requests using `XMLHttpRequest` as the default backend.
+   * 
+   * `Http` is available as an injectable class, with methods to perform http requests. Calling
+   * `request` returns an <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> which will emit a single <a href='/angular2/angular2.api/Response'><code>Response</code></a> when a
+   * response is received.
+   * 
+   * 
+   * ## Breaking Change
+   * 
+   * Previously, methods of `Http` would return an RxJS Observable directly. For now,
+   * the `toRx()` method of <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> needs to be called in order to get the RxJS
+   * Subject. `EventEmitter` does not provide combinators like `map`, and has different semantics for
+   * subscribing/observing. This is temporary; the result of all `Http` method calls will be either an
+   * Observable
+   * or Dart Stream when [issue #2794](https://github.com/angular/angular/issues/2794) is resolved.
+   * 
+   * #Example
+   * 
+   * ```
+   * import {Http, httpInjectables} from 'angular2/http';
+   * @Component({selector: 'http-app', viewInjector: [httpInjectables]})
+   * @View({templateUrl: 'people.html'})
+   * class PeopleComponent {
+   *   constructor(http: Http) {
+   *     http.get('people.json')
+   *       //Get the RxJS Subject
+   *       .toRx()
+   *       // Call map on the response observable to get the parsed people object
+   *       .map(res => res.json())
+   *       // Subscribe to the observable to get the parsed people object and attach it to the
+   *       // component
+   *       .subscribe(people => this.people = people);
+   *   }
+   * }
+   * ```
+   * 
+   * To use the <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> returned by `Http`, simply pass a generator (See "interface
+   * Generator" in the Async Generator spec: https://github.com/jhusain/asyncgenerator) to the
+   * `observer` method of the returned emitter, with optional methods of `next`, `throw`, and `return`.
+   * 
+   * #Example
+   * 
+   * ```
+   * http.get('people.json').observer({next: (value) => this.people = people});
+   * ```
+   * 
+   * The default construct used to perform requests, `XMLHttpRequest`, is abstracted as a "Backend" (
+   * <a href='/angular2/angular2.api/XHRBackend'><code>XHRBackend</code></a> in this case), which could be mocked with dependency injection by replacing
+   * the <a href='/angular2/angular2.api/XHRBackend'><code>XHRBackend</code></a> binding, as in the following example:
+   * 
+   * #Example
+   * 
+   * ```
+   * import {MockBackend, BaseRequestOptions, Http} from 'angular2/http';
+   * var injector = Injector.resolveAndCreate([
+   *   BaseRequestOptions,
+   *   MockBackend,
+   *   bind(Http).toFactory(
+   *       function(backend, defaultOptions) {
+   *         return new Http(backend, defaultOptions);
+   *       },
+   *       [MockBackend, BaseRequestOptions])
+   * ]);
+   * var http = injector.get(Http);
+   * http.get('request-from-mock-backend.json').toRx().subscribe((res:Response) => doSomething(res));
+   * ```
+   */
+  class Http {
+    
+
+    /**
+     * Performs any type of http request. First argument is required, and can either be a url or
+     * a <a href='/angular2/angular2.api/Request'><code>Request</code></a> instance. If the first argument is a url, an optional <a href='/angular2/angular2.api/RequestOptions'><code>RequestOptions</code></a>
+     * object can be provided as the 2nd argument. The options object will be merged with the values
+     * of <a href='/angular2/angular2.api/BaseRequestOptions'><code>BaseRequestOptions</code></a> before performing the request.
+     */
+     request(url: string | Request, options?: IRequestOptions): EventEmitter;
+    
+
+    /**
+     * Performs a request with `get` http method.
+     */
+     get(url: string, options?: IRequestOptions): EventEmitter;
+    
+
+    /**
+     * Performs a request with `post` http method.
+     */
+     post(url: string, body: string, options?: IRequestOptions): EventEmitter;
+    
+
+    /**
+     * Performs a request with `put` http method.
+     */
+     put(url: string, body: string, options?: IRequestOptions): EventEmitter;
+    
+
+    /**
+     * Performs a request with `delete` http method.
+     */
+     delete(url: string, options?: IRequestOptions): EventEmitter;
+    
+
+    /**
+     * Performs a request with `patch` http method.
+     */
+     patch(url: string, body: string, options?: IRequestOptions): EventEmitter;
+    
+
+    /**
+     * Performs a request with `head` http method.
+     */
+     head(url: string, options?: IRequestOptions): EventEmitter;
+  }
+  
+
+  /**
+   * Polyfill for [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers/Headers), as
+   * specified in the [Fetch Spec](https://fetch.spec.whatwg.org/#headers-class). The only known
+   * difference from the spec is the lack of an `entries` method.
+   */
+  class Headers {
+    
+
+    /**
+     * Appends a header to existing list of header values for a given header name.
+     */
+     append(name: string, value: string): void;
+    
+
+    /**
+     * Deletes all header values for the given name.
+     */
+     delete(name: string): void;
+    
+     forEach(fn: Function): void;
+    
+
+    /**
+     * Returns first header that matches given name.
+     */
+     get(header: string): string;
+    
+
+    /**
+     * Check for existence of header by given name.
+     */
+     has(header: string): boolean;
+    
+
+    /**
+     * Provides names of set headers
+     */
+     keys(): List<string>;
+    
+
+    /**
+     * Sets or overrides header value for given name.
+     */
+     set(header: string, value: string | List<string>): void;
+    
+
+    /**
+     * Returns values of all headers.
+     */
+     values(): List<List<string>>;
+    
+
+    /**
+     * Returns list of header values for a given name.
+     */
+     getAll(header: string): Array<string>;
+    
+
+    /**
+     * This method is not implemented.
+     */
+     entries(): void;
+  }
+  
+
+  /**
+   * Acceptable response types to be associated with a <a href='/angular2/angular2.api/Response'><code>Response</code></a>, based on
+   * [ResponseType](https://fetch.spec.whatwg.org/#responsetype) from the Fetch spec.
+   */
+  enum ResponseTypes {
+    Basic,
+    Cors,
+    Default,
+    Error,
+    Opaque
+  }
+  
+
+  /**
+   * All possible states in which a connection can be, based on
+   * [States](http://www.w3.org/TR/XMLHttpRequest/#states) from the `XMLHttpRequest` spec, but with an
+   * additional "CANCELLED" state.
+   */
+  enum ReadyStates {
+    UNSENT,
+    OPEN,
+    HEADERS_RECEIVED,
+    LOADING,
+    DONE,
+    CANCELLED
+  }
+  
+
+  /**
+   * Supported http methods.
+   */
+  enum RequestMethods {
+    GET,
+    POST,
+    PUT,
+    DELETE,
+    OPTIONS,
+    HEAD,
+    PATCH
+  }
+  
+
+  /**
+   * Acceptable credentials option to be associated with a <a href='/angular2/angular2.api/Request'><code>Request</code></a>, based on
+   * [RequestCredentials](https://fetch.spec.whatwg.org/#requestcredentials) from the Fetch spec.
+   */
+  enum RequestCredentialsOpts {
+    Omit,
+    SameOrigin,
+    Include
+  }
+  
+
+  /**
+   * Acceptable cache option to be associated with a <a href='/angular2/angular2.api/Request'><code>Request</code></a>, based on
+   * [RequestCache](https://fetch.spec.whatwg.org/#requestcache) from the Fetch spec.
+   */
+  enum RequestCacheOpts {
+    Default,
+    NoStore,
+    Reload,
+    NoCache,
+    ForceCache,
+    OnlyIfCached
+  }
+  
+
+  /**
+   * Acceptable origin modes to be associated with a <a href='/angular2/angular2.api/Request'><code>Request</code></a>, based on
+   * [RequestMode](https://fetch.spec.whatwg.org/#requestmode) from the Fetch spec.
+   */
+  enum RequestModesOpts {
+    Cors,
+    NoCors,
+    SameOrigin
+  }
+  
+
+  /**
+   * Map-like representation of url search parameters, based on
+   * [URLSearchParams](https://url.spec.whatwg.org/#urlsearchparams) in the url living standard.
+   */
+  class URLSearchParams {
+    
+     paramsMap: Map<string, List<string>>;
+    
+     rawParams: string;
+    
+     has(param: string): boolean;
+    
+     get(param: string): string;
+    
+     getAll(param: string): List<string>;
+    
+     append(param: string, val: string): void;
+    
+     toString(): string;
+    
+     delete(param: any): void;
+  }
+  
+
+  /**
+   * Provides a basic set of injectables to use the <a href='/angular2/angular2.api/Http'><code>Http</code></a> service in any application.
+   * 
+   * #Example
+   * 
+   * ```
+   * import {httpInjectables, Http} from 'angular2/http';
+   * @Component({selector: 'http-app', viewInjector: [httpInjectables]})
+   * @View({template: '{{data}}'})
+   * class MyApp {
+   *   constructor(http:Http) {
+   *     http.request('data.txt').subscribe(res => this.data = res.text());
+   *   }
+   * }
+   * ```
+   */
+  var httpInjectables : List<any> ;
+  
+
+  /**
+   * General notes:
+   * 
+   * The methods for creating / destroying views in this API are used in the AppViewHydrator
+   * and RenderViewHydrator as well.
+   * 
+   * We are already parsing expressions on the render side:
+   * - this makes the ElementBinders more compact
+   *   (e.g. no need to distinguish interpolations from regular expressions from literals)
+   * - allows to retrieve which properties should be accessed from the event
+   *   by looking at the expression
+   * - we need the parse at least for the `template` attribute to match
+   *   directives in it
+   * - render compiler is not on the critical path as
+   *   its output will be stored in precompiled templates.
+   */
+  class EventBinding {
+    
+     fullName: string;
+    
+     source: ASTWithSource;
+  }
+  
+  enum PropertyBindingType {
+    PROPERTY,
+    ATTRIBUTE,
+    CLASS,
+    STYLE
+  }
+  
+  class ElementPropertyBinding {
+    
+     type: PropertyBindingType;
+    
+     astWithSource: ASTWithSource;
+    
+     property: string;
+    
+     unit: string;
+  }
+  
+  class ElementBinder {
+    
+     index: number;
+    
+     parentIndex: number;
+    
+     distanceToParent: number;
+    
+     directives: List<DirectiveBinder>;
+    
+     nestedProtoView: ProtoViewDto;
+    
+     propertyBindings: List<ElementPropertyBinding>;
+    
+     variableBindings: Map<string, string>;
+    
+     eventBindings: List<EventBinding>;
+    
+     textBindings: List<ASTWithSource>;
+    
+     readAttributes: Map<string, string>;
+  }
+  
+  class DirectiveBinder {
+    
+     directiveIndex: number;
+    
+     propertyBindings: Map<string, ASTWithSource>;
+    
+     eventBindings: List<EventBinding>;
+    
+     hostPropertyBindings: List<ElementPropertyBinding>;
+  }
+  
+  enum ViewType {
+    HOST,
+    COMPONENT,
+    EMBEDDED
+  }
+  
+  class ProtoViewDto {
+    
+     render: RenderProtoViewRef;
+    
+     elementBinders: List<ElementBinder>;
+    
+     variableBindings: Map<string, string>;
+    
+     type: ViewType;
+  }
+  
+  class DirectiveMetadata {
+    
+     id: any;
+    
+     selector: string;
+    
+     compileChildren: boolean;
+    
+     events: List<string>;
+    
+     properties: List<string>;
+    
+     readAttributes: List<string>;
+    
+     type: number;
+    
+     callOnDestroy: boolean;
+    
+     callOnChange: boolean;
+    
+     callOnCheck: boolean;
+    
+     callOnInit: boolean;
+    
+     callOnAllChangesDone: boolean;
+    
+     changeDetection: string;
+    
+     exportAs: string;
+    
+     hostListeners: Map<string, string>;
+    
+     hostProperties: Map<string, string>;
+    
+     hostAttributes: Map<string, string>;
+    
+     hostActions: Map<string, string>;
+  }
+  
+  class RenderProtoViewRef {
+  }
+  
+  class RenderViewRef {
+  }
+  
+  class ViewDefinition {
+    
+     componentId: string;
+    
+     templateAbsUrl: string;
+    
+     template: string;
+    
+     directives: List<DirectiveMetadata>;
+    
+     styleAbsUrls: List<string>;
+    
+     styles: List<string>;
+  }
+  
+  class Renderer {
+    
+
+    /**
+     * Creates a root host view that includes the given element.
+     * @param {RenderProtoViewRef} hostProtoViewRef a RenderProtoViewRef of type
+     * ProtoViewDto.HOST_VIEW_TYPE
+     * @param {any} hostElementSelector css selector for the host element (will be queried against the
+     * main document)
+     * @return {RenderViewRef} the created view
+     */
+     createRootHostView(hostProtoViewRef: RenderProtoViewRef, hostElementSelector: string): RenderViewRef;
+    
+
+    /**
+     * Creates a regular view out of the given ProtoView
+     */
+     createView(protoViewRef: RenderProtoViewRef): RenderViewRef;
+    
+
+    /**
+     * Destroys the given view after it has been dehydrated and detached
+     */
+     destroyView(viewRef: RenderViewRef): void;
+    
+
+    /**
+     * Attaches a componentView into the given hostView at the given element
+     */
+     attachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): void;
+    
+
+    /**
+     * Detaches a componentView into the given hostView at the given element
+     */
+     detachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): void;
+    
+
+    /**
+     * Attaches a view into a ViewContainer (in the given parentView at the given element) at the
+     * given index.
+     */
+     attachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): void;
+    
+
+    /**
+     * Detaches a view into a ViewContainer (in the given parentView at the given element) at the
+     * given index.
+     */
+     detachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): void;
+    
+
+    /**
+     * Hydrates a view after it has been attached. Hydration/dehydration is used for reusing views
+     * inside of the view pool.
+     */
+     hydrateView(viewRef: RenderViewRef): void;
+    
+
+    /**
+     * Dehydrates a view after it has been attached. Hydration/dehydration is used for reusing views
+     * inside of the view pool.
+     */
+     dehydrateView(viewRef: RenderViewRef): void;
+    
+
+    /**
+     * Returns the native element at the given location.
+     * Attention: In a WebWorker scenario, this should always return null!
+     */
+     getNativeElementSync(location: RenderElementRef): any;
+    
+
+    /**
+     * Sets a property on an element.
+     */
+     setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
+    
+
+    /**
+     * Sets an attribute on an element.
+     */
+     setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
+    
+
+    /**
+     * Sets a class on an element.
+     */
+     setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
+    
+
+    /**
+     * Sets a style on an element.
+     */
+     setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
+    
+
+    /**
+     * Calls a method on an element.
+     */
+     invokeElementMethod(location: RenderElementRef, methodName: string, args: List<any>): void;
+    
+
+    /**
+     * Sets the value of a text node.
+     */
+     setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+    
+
+    /**
+     * Sets the dispatcher for all events of the given view
+     */
+     setEventDispatcher(viewRef: RenderViewRef, dispatcher: EventDispatcher): void;
+  }
+  
+
+  /**
+   * A dispatcher for all events happening in a view.
+   */
+  interface EventDispatcher {
+    
+
+    /**
+     * Called when an event was triggered for a on-* attribute on an element.
+     * @param {Map<string, any>} locals Locals to be used to evaluate the
+     *   event expressions
+     */
+     dispatchEvent(elementIndex: number, eventName: string, locals: Map<string, any>): void;
+  }
+  
+  class TreeNode<T extends TreeNode<any>> {
+    
+
+    /**
+     * Adds a child to the parent node. The child MUST NOT be a part of a tree.
+     */
+     addChild(child: T): void;
+    
+
+    /**
+     * Adds a child to the parent node after a given sibling.
+     * The child MUST NOT be a part of a tree and the sibling must be present.
+     */
+     addChildAfter(child: T, prevSibling: T): void;
+    
+
+    /**
+     * Detaches a node from the parent's tree.
+     */
+     remove(): void;
+    
+     parent: void;
+    
+     children: T[];
+  }
+  
+  class DirectiveDependency extends Dependency {
+    
+     attributeName: string;
+    
+     queryDecorator: Query;
+  }
+  
+  class DirectiveBinding extends ResolvedBinding {
+    
+     resolvedHostInjectables: List<ResolvedBinding>;
+    
+     resolvedViewInjectables: List<ResolvedBinding>;
+    
+     metadata: DirectiveMetadata;
+    
+     callOnDestroy: boolean;
+    
+     callOnChange: boolean;
+    
+     callOnAllChangesDone: boolean;
+    
+     displayName: string;
+    
+     eventEmitters: List<string>;
+    
+     hostActions: Map<string, string>;
+    
+     changeDetection: void;
+  }
+  
+  class PreBuiltObjects {
+    
+     viewManager: AppViewManager;
+    
+     view: AppView;
+    
+     protoView: AppProtoView;
+  }
+  
+  class EventEmitterAccessor {
+    
+     eventName: string;
+    
+     getter: Function;
+    
+     subscribe(view:AppView, boundElementIndex: number, directive: Object): Object;
+  }
+  
+  class HostActionAccessor {
+    
+     methodName: string;
+    
+     getter: Function;
+    
+     subscribe(view:AppView, boundElementIndex: number, directive: Object): Object;
+  }
+  
+  class ProtoElementInjector {
+    
+     view: AppView;
+    
+     attributes: Map<string, string>;
+    
+     eventEmitterAccessors: List<List<EventEmitterAccessor>>;
+    
+     hostActionAccessors: List<List<HostActionAccessor>>;
+    
+     protoInjector: ProtoInjector;
+    
+     parent: ProtoElementInjector;
+    
+     index: int;
+    
+     distanceToParent: number;
+    
+     directiveVariableBindings: Map<string, number>;
+    
+     instantiate(parent: ElementInjector): ElementInjector;
+    
+     directParent(): ProtoElementInjector;
+    
+     hasBindings: boolean;
+    
+     getBindingAtIndex(index: number): any;
+  }
+  
+  class ElementInjector extends TreeNode<ElementInjector> implements DependencyProvider {
+    
+     hydrated: boolean;
+    
+     dehydrate(): void;
+    
+     onAllChangesDone(): void;
+    
+     hydrate(imperativelyCreatedInjector: Injector, host: ElementInjector, preBuiltObjects: PreBuiltObjects): void;
+    
+     hasVariableBinding(name: string): boolean;
+    
+     getVariableBinding(name: string): any;
+    
+     get(token: any): any;
+    
+     hasDirective(type: Type): boolean;
+    
+     getEventEmitterAccessors(): List<List<EventEmitterAccessor>>;
+    
+     getHostActionAccessors(): List<List<HostActionAccessor>>;
+    
+     getDirectiveVariableBindings(): Map<string, number>;
+    
+     getComponent(): any;
+    
+     getElementRef(): ElementRef;
+    
+     getViewContainerRef(): ViewContainerRef;
+    
+     directParent(): ElementInjector;
+    
+     isComponentKey(key: Key): boolean;
+    
+     getDependency(injector: Injector, binding: ResolvedBinding, dep: Dependency): any;
+    
+     addDirectivesMatchingQuery(query: Query, list: any[]): void;
+    
+     link(parent: ElementInjector): void;
+    
+     linkAfter(parent: ElementInjector, prevSibling: ElementInjector): void;
+    
+     unlink(): void;
+    
+     getDirectiveAtIndex(index: number): any;
+    
+     hasInstances(): boolean;
+    
+     getHost(): ElementInjector;
+    
+     getBoundElementIndex(): number;
+  }
+  
+  class QueryError extends BaseException {
+    
+     message: string;
+    
+     toString(): string;
+  }
+  
+  class QueryRef {
+    
+     query: Query;
+    
+     list: QueryList<any>;
+    
+     originator: ElementInjector;
+    
+     update(): void;
+    
+     visit(inj: ElementInjector, aggregator: any[]): void;
+  }
+  
+  class AST {
+    
+     eval(context: any, locals: Locals): void;
+    
+     isAssignable: boolean;
+    
+     assign(context: any, locals: Locals, value: any): void;
+    
+     visit(visitor: AstVisitor): any;
+    
+     toString(): string;
+  }
+  
+  class EmptyExpr extends AST {
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): void;
+  }
+  
+  class ImplicitReceiver extends AST {
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+
+  /**
+   * Multiple expressions separated by a semicolon.
+   */
+  class Chain extends AST {
+    
+     expressions: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class Conditional extends AST {
+    
+     condition: AST;
+    
+     trueExp: AST;
+    
+     falseExp: AST;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class If extends AST {
+    
+     condition: AST;
+    
+     trueExp: AST;
+    
+     falseExp: AST;
+    
+     eval(context: any, locals: any): void;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class AccessMember extends AST {
+    
+     receiver: AST;
+    
+     name: string;
+    
+     getter: Function;
+    
+     setter: Function;
+    
+     eval(context: any, locals: Locals): any;
+    
+     isAssignable: boolean;
+    
+     assign(context: any, locals: Locals, value: any): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class SafeAccessMember extends AST {
+    
+     receiver: AST;
+    
+     name: string;
+    
+     getter: Function;
+    
+     setter: Function;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class KeyedAccess extends AST {
+    
+     obj: AST;
+    
+     key: AST;
+    
+     eval(context: any, locals: Locals): any;
+    
+     isAssignable: boolean;
+    
+     assign(context: any, locals: Locals, value: any): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class BindingPipe extends AST {
+    
+     exp: AST;
+    
+     name: string;
+    
+     args: List<any>;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class LiteralPrimitive extends AST {
+    
+     value: void;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class LiteralArray extends AST {
+    
+     expressions: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class LiteralMap extends AST {
+    
+     keys: List<any>;
+    
+     values: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class Interpolation extends AST {
+    
+     strings: List<any>;
+    
+     expressions: List<any>;
+    
+     eval(context: any, locals: any): any;
+    
+     visit(visitor: AstVisitor): void;
+  }
+  
+  class Binary extends AST {
+    
+     operation: string;
+    
+     left: AST;
+    
+     right: AST;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class PrefixNot extends AST {
+    
+     expression: AST;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class Assignment extends AST {
+    
+     target: AST;
+    
+     value: AST;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class MethodCall extends AST {
+    
+     receiver: AST;
+    
+     name: string;
+    
+     fn: Function;
+    
+     args: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class SafeMethodCall extends AST {
+    
+     receiver: AST;
+    
+     name: string;
+    
+     fn: Function;
+    
+     args: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class FunctionCall extends AST {
+    
+     target: AST;
+    
+     args: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
+  }
+  
+  class ASTWithSource extends AST {
+    
+     ast: AST;
+    
+     source: string;
+    
+     location: string;
+    
+     eval(context: any, locals: Locals): any;
+    
+     isAssignable: boolean;
+    
+     assign(context: any, locals: Locals, value: any): any;
+    
+     visit(visitor: AstVisitor): any;
+    
+     toString(): string;
+  }
+  
+  class TemplateBinding {
+    
+     key: string;
+    
+     keyIsVar: boolean;
+    
+     name: string;
+    
+     expression: ASTWithSource;
+  }
+  
+  interface AstVisitor {
+    
+     visitAccessMember(ast: AccessMember): any;
+    
+     visitAssignment(ast: Assignment): any;
+    
+     visitBinary(ast: Binary): any;
+    
+     visitChain(ast: Chain): any;
+    
+     visitConditional(ast: Conditional): any;
+    
+     visitIf(ast: If): any;
+    
+     visitPipe(ast: BindingPipe): any;
+    
+     visitFunctionCall(ast: FunctionCall): any;
+    
+     visitImplicitReceiver(ast: ImplicitReceiver): any;
+    
+     visitInterpolation(ast: Interpolation): any;
+    
+     visitKeyedAccess(ast: KeyedAccess): any;
+    
+     visitLiteralArray(ast: LiteralArray): any;
+    
+     visitLiteralMap(ast: LiteralMap): any;
+    
+     visitLiteralPrimitive(ast: LiteralPrimitive): any;
+    
+     visitMethodCall(ast: MethodCall): any;
+    
+     visitPrefixNot(ast: PrefixNot): any;
+    
+     visitSafeAccessMember(ast: SafeAccessMember): any;
+    
+     visitSafeMethodCall(ast: SafeMethodCall): any;
+  }
+  
+  class AstTransformer implements AstVisitor {
+    
+     visitImplicitReceiver(ast: ImplicitReceiver): ImplicitReceiver;
+    
+     visitInterpolation(ast: Interpolation): Interpolation;
+    
+     visitLiteralPrimitive(ast: LiteralPrimitive): LiteralPrimitive;
+    
+     visitAccessMember(ast: AccessMember): AccessMember;
+    
+     visitSafeAccessMember(ast: SafeAccessMember): SafeAccessMember;
+    
+     visitMethodCall(ast: MethodCall): MethodCall;
+    
+     visitSafeMethodCall(ast: SafeMethodCall): SafeMethodCall;
+    
+     visitFunctionCall(ast: FunctionCall): FunctionCall;
+    
+     visitLiteralArray(ast: LiteralArray): LiteralArray;
+    
+     visitLiteralMap(ast: LiteralMap): LiteralMap;
+    
+     visitBinary(ast: Binary): Binary;
+    
+     visitPrefixNot(ast: PrefixNot): PrefixNot;
+    
+     visitConditional(ast: Conditional): Conditional;
+    
+     visitPipe(ast: BindingPipe): BindingPipe;
+    
+     visitKeyedAccess(ast: KeyedAccess): KeyedAccess;
+    
+     visitAll(asts: List<any>): List<any>;
+    
+     visitChain(ast: Chain): Chain;
+    
+     visitAssignment(ast: Assignment): Assignment;
+    
+     visitIf(ast: If): If;
+  }
+  
+}
+
+
+
+declare module "angular2/angular2" {
+  export = ng;
+}
diff --git a/angular2/angular2-tests.ts b/angular2/angular2-tests.ts
index 3cadc3b9a4..2f5dfbae01 100644
--- a/angular2/angular2-tests.ts
+++ b/angular2/angular2-tests.ts
@@ -1,4 +1,5 @@
 /// <reference path="angular2.d.ts"/>
+/// <reference path="router.d.ts"/>
 
 // Use Typescript 1.4 style imports
 import ng = require("angular2/angular2");
diff --git a/angular2/angular2.d.ts b/angular2/angular2.d.ts
index 8a9c0e26ea..ecbcae245c 100644
--- a/angular2/angular2.d.ts
+++ b/angular2/angular2.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Angular v2.0.0-alpha.28
+// Type definitions for Angular v2.0.0-alpha.30
 // Project: http://angular.io/
 // Definitions by: angular team <https://github.com/angular/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -18,11 +18,13 @@
 interface List<T> extends Array<T> {}
 interface Map<K,V> {}
 interface StringMap<K,V> extends Map<K,V> {}
-interface Type {}
 
-declare module "angular2/angular2" {
+declare module ng {
   type SetterFn = typeof Function;
   type int = number;
+  interface Type extends Function {
+    // new (...args);
+  }
 
   // See https://github.com/Microsoft/TypeScript/issues/1168
   class BaseException /* extends Error */ {
@@ -33,853 +35,42 @@ declare module "angular2/angular2" {
 }
 
 
-declare module "angular2/angular2" {
-  class ProtoRecord {
-    mode: RecordType;
-    name: string;
-    funcOrValue: any;
-    args: List<any>;
-    fixedArgs: List<any>;
-    contextIndex: number;
-    directiveIndex: DirectiveIndex;
-    selfIndex: number;
-    bindingRecord: BindingRecord;
-    expressionAsString: string;
-    lastInBinding: boolean;
-    lastInDirective: boolean;
-    isPureFunction(): boolean;
-    isPipeRecord(): boolean;
-    isLifeCycleRecord(): boolean;
-  }
-
-  enum RecordType {
-    SELF,
-    CONST,
-    PRIMITIVE_OP,
-    PROPERTY,
-    LOCAL,
-    INVOKE_METHOD,
-    INVOKE_CLOSURE,
-    KEYED_ACCESS,
-    PIPE,
-    INTERPOLATE,
-    SAFE_PROPERTY,
-    SAFE_INVOKE_METHOD,
-    DIRECTIVE_LIFECYCLE
-  }
 
+declare module ng {
 
   /**
    * `DependencyAnnotation` is used by the framework to extend DI.
-   *
+   * 
    * Only annotations implementing `DependencyAnnotation` are added to the list of dependency
    * properties.
-   *
+   * 
    * For example:
-   *
+   * 
    * ```
    * class Parent extends DependencyAnnotation {}
    * class NotDependencyProperty {}
-   *
+   * 
    * class AComponent {
    *   constructor(@Parent @NotDependencyProperty aService:AService) {}
    * }
    * ```
-   *
+   * 
    * will create the following dependency:
-   *
+   * 
    * ```
    * new Dependency(Key.get(AService), [new Parent()])
    * ```
-   *
+   * 
    * The framework can use `new Parent()` to handle the `aService` dependency
    * in a specific way.
-   *
+   * 
    * @exportedAs angular2/di_annotations
    */
   class DependencyAnnotation {
-    token: any;
+    
+     token: void;
   }
-
-
-  /**
-   * Directives allow you to attach behavior to elements in the DOM.
-   *
-   * <a href='/angular2/angular2/Directive'><code>Directive</code></a>s with an embedded view are called <a href='/angular2/angular2/Component'><code>Component</code></a>s.
-   *
-   * A directive consists of a single directive annotation and a controller class. When the
-   * directive's `selector` matches
-   * elements in the DOM, the following steps occur:
-   *
-   * 1. For each directive, the `ElementInjector` attempts to resolve the directive's constructor
-   * arguments.
-   * 2. Angular instantiates directives for each matched element using `ElementInjector` in a
-   * depth-first order,
-   *    as declared in the HTML.
-   *
-   * ## Understanding How Injection Works
-   *
-   * There are three stages of injection resolution.
-   * - *Pre-existing Injectors*:
-   *   - The terminal <a href='/angular2/angular2/Injector'><code>Injector</code></a> cannot resolve dependencies. It either throws an error or, if
-   * the dependency was
-   *     specified as `@Optional`, returns `null`.
-   *   - The platform injector resolves browser singleton resources, such as: cookies, title,
-   * location, and others.
-   * - *Component Injectors*: Each component instance has its own <a href='/angular2/angular2/Injector'><code>Injector</code></a>, and they follow
-   * the same parent-child hierarchy
-   *     as the component instances in the DOM.
-   * - *Element Injectors*: Each component instance has a Shadow DOM. Within the Shadow DOM each
-   * element has an `ElementInjector`
-   *     which follow the same parent-child hierarchy as the DOM elements themselves.
-   *
-   * When a template is instantiated, it also must instantiate the corresponding directives in a
-   * depth-first order. The
-   * current `ElementInjector` resolves the constructor dependencies for each directive.
-   *
-   * Angular then resolves dependencies as follows, according to the order in which they appear in the
-   * <a href='/angular2/angular2/View'><code>View</code></a>:
-   *
-   * 1. Dependencies on the current element
-   * 2. Dependencies on element injectors and their parents until it encounters a Shadow DOM boundary
-   * 3. Dependencies on component injectors and their parents until it encounters the root component
-   * 4. Dependencies on pre-existing injectors
-   *
-   *
-   * The `ElementInjector` can inject other directives, element-specific special objects, or it can
-   * delegate to the parent
-   * injector.
-   *
-   * To inject other directives, declare the constructor parameter as:
-   * - `directive:DirectiveType`: a directive on the current element only
-   * - `@Ancestor() directive:DirectiveType`: any directive that matches the type between the current
-   * element and the
-   *    Shadow DOM root. Current element is not included in the resolution, therefore even if it could
-   * resolve it, it will
-   *    be ignored.
-   * - `@Parent() directive:DirectiveType`: any directive that matches the type on a direct parent
-   * element only.
-   * - `@Query(DirectiveType) query:QueryList<DirectiveType>`: A live collection of direct child
-   * directives.
-   * - `@QueryDescendants(DirectiveType) query:QueryList<DirectiveType>`: A live collection of any
-   * child directives.
-   *
-   * To inject element-specific special objects, declare the constructor parameter as:
-   * - `element: ElementRef` to obtain a reference to logical element in the view.
-   * - `viewContainer: ViewContainerRef` to control child template instantiation, for
-   * <a href='/angular2/angular2/Directive'><code>Directive</code></a> directives only
-   * - `bindingPropagation: BindingPropagation` to control change detection in a more granular way.
-   *
-   * ## Example
-   *
-   * The following example demonstrates how dependency injection resolves constructor arguments in
-   * practice.
-   *
-   *
-   * Assume this HTML template:
-   *
-   * ```
-   * <div dependency="1">
-   *   <div dependency="2">
-   *     <div dependency="3" my-directive>
-   *       <div dependency="4">
-   *         <div dependency="5"></div>
-   *       </div>
-   *       <div dependency="6"></div>
-   *     </div>
-   *   </div>
-   * </div>
-   * ```
-   *
-   * With the following `dependency` decorator and `SomeService` injectable class.
-   *
-   * ```
-   * @Injectable()
-   * class SomeService {
-   * }
-   *
-   * @Directive({
-   *   selector: '[dependency]',
-   *   properties: [
-   *     'id: dependency'
-   *   ]
-   * })
-   * class Dependency {
-   *   id:string;
-   * }
-   * ```
-   *
-   * Let's step through the different ways in which `MyDirective` could be declared...
-   *
-   *
-   * ### No injection
-   *
-   * Here the constructor is declared with no arguments, therefore nothing is injected into
-   * `MyDirective`.
-   *
-   * ```
-   * @Directive({ selector: '[my-directive]' })
-   * class MyDirective {
-   *   constructor() {
-   *   }
-   * }
-   * ```
-   *
-   * This directive would be instantiated with no dependencies.
-   *
-   *
-   * ### Component-level injection
-   *
-   * Directives can inject any injectable instance from the closest component injector or any of its
-   * parents.
-   *
-   * Here, the constructor declares a parameter, `someService`, and injects the `SomeService` type
-   * from the parent
-   * component's injector.
-   * ```
-   * @Directive({ selector: '[my-directive]' })
-   * class MyDirective {
-   *   constructor(someService: SomeService) {
-   *   }
-   * }
-   * ```
-   *
-   * This directive would be instantiated with a dependency on `SomeService`.
-   *
-   *
-   * ### Injecting a directive from the current element
-   *
-   * Directives can inject other directives declared on the current element.
-   *
-   * ```
-   * @Directive({ selector: '[my-directive]' })
-   * class MyDirective {
-   *   constructor(dependency: Dependency) {
-   *     expect(dependency.id).toEqual(3);
-   *   }
-   * }
-   * ```
-   * This directive would be instantiated with `Dependency` declared at the same element, in this case
-   * `dependency="3"`.
-   *
-   *
-   * ### Injecting a directive from a direct parent element
-   *
-   * Directives can inject other directives declared on a direct parent element. By definition, a
-   * directive with a
-   * `@Parent` annotation does not attempt to resolve dependencies for the current element, even if
-   * this would satisfy
-   * the dependency.
-   *
-   * ```
-   * @Directive({ selector: '[my-directive]' })
-   * class MyDirective {
-   *   constructor(@Parent() dependency: Dependency) {
-   *     expect(dependency.id).toEqual(2);
-   *   }
-   * }
-   * ```
-   * This directive would be instantiated with `Dependency` declared at the parent element, in this
-   * case `dependency="2"`.
-   *
-   *
-   * ### Injecting a directive from any ancestor elements
-   *
-   * Directives can inject other directives declared on any ancestor element (in the current Shadow
-   * DOM), i.e. on the
-   * parent element and its parents. By definition, a directive with an `@Ancestor` annotation does
-   * not attempt to
-   * resolve dependencies for the current element, even if this would satisfy the dependency.
-   *
-   * ```
-   * @Directive({ selector: '[my-directive]' })
-   * class MyDirective {
-   *   constructor(@Ancestor() dependency: Dependency) {
-   *     expect(dependency.id).toEqual(2);
-   *   }
-   * }
-   * ```
-   *
-   * Unlike the `@Parent` which only checks the parent, `@Ancestor` checks the parent, as well as its
-   * parents recursively. If `dependency="2"` didn't exist on the direct parent, this injection would
-   * have returned
-   * `dependency="1"`.
-   *
-   *
-   * ### Injecting a live collection of direct child directives
-   *
-   *
-   * A directive can also query for other child directives. Since parent directives are instantiated
-   * before child directives, a directive can't simply inject the list of child directives. Instead,
-   * the directive injects a <a href='/angular2/angular2/QueryList'><code>QueryList</code></a>, which updates its contents as children are added,
-   * removed, or moved by a directive that uses a <a href='/angular2/angular2/ViewContainerRef'><code>ViewContainerRef</code></a> such as a `ng-for`, an
-   * `ng-if`, or an `ng-switch`.
-   *
-   * ```
-   * @Directive({ selector: '[my-directive]' })
-   * class MyDirective {
-   *   constructor(@Query(Dependency) dependencies:QueryList<Dependency>) {
-   *   }
-   * }
-   * ```
-   *
-   * This directive would be instantiated with a <a href='/angular2/angular2/QueryList'><code>QueryList</code></a> which contains `Dependency` 4 and
-   * 6. Here, `Dependency` 5 would not be included, because it is not a direct child.
-   *
-   * ### Injecting a live collection of descendant directives
-   *
-   * By passing the descendant flag to `@Query` above, we can include the children of the child
-   * elements.
-   *
-   * ```
-   * @Directive({ selector: '[my-directive]' })
-   * class MyDirective {
-   *   constructor(@Query(Dependency, {descendants: true}) dependencies:QueryList<Dependency>) {
-   *   }
-   * }
-   * ```
-   *
-   * This directive would be instantiated with a Query which would contain `Dependency` 4, 5 and 6.
-   *
-   * ### Optional injection
-   *
-   * The normal behavior of directives is to return an error when a specified dependency cannot be
-   * resolved. If you
-   * would like to inject `null` on unresolved dependency instead, you can annotate that dependency
-   * with `@Optional()`.
-   * This explicitly permits the author of a template to treat some of the surrounding directives as
-   * optional.
-   *
-   * ```
-   * @Directive({ selector: '[my-directive]' })
-   * class MyDirective {
-   *   constructor(@Optional() dependency:Dependency) {
-   *   }
-   * }
-   * ```
-   *
-   * This directive would be instantiated with a `Dependency` directive found on the current element.
-   * If none can be
-   * found, the injector supplies `null` instead of throwing an error.
-   *
-   * ## Example
-   *
-   * Here we use a decorator directive to simply define basic tool-tip behavior.
-   *
-   * ```
-   * @Directive({
-   *   selector: '[tooltip]',
-   *   properties: [
-   *     'text: tooltip'
-   *   ],
-   *   hostListeners: {
-   *     'onmouseenter': 'onMouseEnter()',
-   *     'onmouseleave': 'onMouseLeave()'
-   *   }
-   * })
-   * class Tooltip{
-   *   text:string;
-   *   overlay:Overlay; // NOT YET IMPLEMENTED
-   *   overlayManager:OverlayManager; // NOT YET IMPLEMENTED
-   *
-   *   constructor(overlayManager:OverlayManager) {
-   *     this.overlay = overlay;
-   *   }
-   *
-   *   onMouseEnter() {
-   *     // exact signature to be determined
-   *     this.overlay = this.overlayManager.open(text, ...);
-   *   }
-   *
-   *   onMouseLeave() {
-   *     this.overlay.close();
-   *     this.overlay = null;
-   *   }
-   * }
-   * ```
-   * In our HTML template, we can then add this behavior to a `<div>` or any other element with the
-   * `tooltip` selector,
-   * like so:
-   *
-   * ```
-   * <div tooltip="some text here"></div>
-   * ```
-   *
-   * Directives can also control the instantiation, destruction, and positioning of inline template
-   * elements:
-   *
-   * A directive uses a <a href='/angular2/angular2/ViewContainerRef'><code>ViewContainerRef</code></a> to instantiate, insert, move, and destroy views at
-   * runtime.
-   * The <a href='/angular2/angular2/ViewContainerRef'><code>ViewContainerRef</code></a> is created as a result of `<template>` element, and represents a
-   * location in the current view
-   * where these actions are performed.
-   *
-   * Views are always created as children of the current <a href='/angular2/angular2/View'><code>View</code></a>, and as siblings of the
-   * `<template>` element. Thus a
-   * directive in a child view cannot inject the directive that created it.
-   *
-   * Since directives that create views via ViewContainers are common in Angular, and using the full
-   * `<template>` element syntax is wordy, Angular
-   * also supports a shorthand notation: `<li *foo="bar">` and `<li template="foo: bar">` are
-   * equivalent.
-   *
-   * Thus,
-   *
-   * ```
-   * <ul>
-   *   <li *foo="bar" title="text"></li>
-   * </ul>
-   * ```
-   *
-   * Expands in use to:
-   *
-   * ```
-   * <ul>
-   *   <template [foo]="bar">
-   *     <li title="text"></li>
-   *   </template>
-   * </ul>
-   * ```
-   *
-   * Notice that although the shorthand places `*foo="bar"` within the `<li>` element, the binding for
-   * the directive
-   * controller is correctly instantiated on the `<template>` element rather than the `<li>` element.
-   *
-   *
-   * ## Example
-   *
-   * Let's suppose we want to implement the `unless` behavior, to conditionally include a template.
-   *
-   * Here is a simple directive that triggers on an `unless` selector:
-   *
-   * ```
-   * @Directive({
-   *   selector: '[unless]',
-   *   properties: ['unless']
-   * })
-   * export class Unless {
-   *   viewContainer: ViewContainerRef;
-   *   protoViewRef: ProtoViewRef;
-   *   prevCondition: boolean;
-   *
-   *   constructor(viewContainer: ViewContainerRef, protoViewRef: ProtoViewRef) {
-   *     this.viewContainer = viewContainer;
-   *     this.protoViewRef = protoViewRef;
-   *     this.prevCondition = null;
-   *   }
-   *
-   *   set unless(newCondition) {
-   *     if (newCondition && (isBlank(this.prevCondition) || !this.prevCondition)) {
-   *       this.prevCondition = true;
-   *       this.viewContainer.clear();
-   *     } else if (!newCondition && (isBlank(this.prevCondition) || this.prevCondition)) {
-   *       this.prevCondition = false;
-   *       this.viewContainer.create(this.protoViewRef);
-   *     }
-   *   }
-   * }
-   * ```
-   *
-   * We can then use this `unless` selector in a template:
-   * ```
-   * <ul>
-   *   <li *unless="expr"></li>
-   * </ul>
-   * ```
-   *
-   * Once the directive instantiates the child view, the shorthand notation for the template expands
-   * and the result is:
-   *
-   * ```
-   * <ul>
-   *   <template [unless]="exp">
-   *     <li></li>
-   *   </template>
-   *   <li></li>
-   * </ul>
-   * ```
-   *
-   * Note also that although the `<li></li>` template still exists inside the `<template></template>`,
-   * the instantiated
-   * view occurs on the second `<li></li>` which is a sibling to the `<template>` element.
-   *
-   * @exportedAs angular2/annotations
-   */
-  function Directive(args: _DirectiveArgs): (target:any) => any;
-
-  interface _DirectiveArgs {
-
-    /**
-     * The CSS selector that triggers the instantiation of a directive.
-     *
-     * Angular only allows directives to trigger on CSS selectors that do not cross element
-     * boundaries.
-     *
-     * `selector` may be declared as one of the following:
-     *
-     * - `element-name`: select by element name.
-     * - `.class`: select by class name.
-     * - `[attribute]`: select by attribute name.
-     * - `[attribute=value]`: select by attribute name and value.
-     * - `:not(sub_selector)`: select only if the element does not match the `sub_selector`.
-     * - `selector1, selector2`: select if either `selector1` or `selector2` matches.
-     *
-     *
-     * ## Example
-     *
-     * Suppose we have a directive with an `input[type=text]` selector.
-     *
-     * And the following HTML:
-     *
-     * ```html
-     * <form>
-     *   <input type="text">
-     *   <input type="radio">
-     * <form>
-     * ```
-     *
-     * The directive would only be instantiated on the `<input type="text">` element.
-     */
-    selector?: string;
-
-    /**
-     * Enumerates the set of properties that accept data binding for a directive.
-     *
-     * The `properties` property defines a set of `directiveProperty` to `bindingProperty`
-     * configuration:
-     *
-     * - `directiveProperty` specifies the component property where the value is written.
-     * - `bindingProperty` specifies the DOM property where the value is read from.
-     *
-     * You can include a <a href='/angular2/angular2/Pipe'><code>Pipe</code></a> when specifying a `bindingProperty` to allow for data
-     * transformation and structural change detection of the value. These pipes will be evaluated in
-     * the context of this component.
-     *
-     * ## Syntax
-     *
-     * There is no need to specify both `directiveProperty` and `bindingProperty` when they both have
-     * the same value.
-     *
-     * ```
-     * @Directive({
-     *   properties: [
-     *     'propertyName', // shorthand notation for 'propertyName: propertyName'
-     *     'directiveProperty1: bindingProperty1',
-     *     'directiveProperty2: bindingProperty2 | pipe1 | ...',
-     *     ...
-     *   ]
-     * }
-     * ```
-     *
-     *
-     * ## Basic Property Binding
-     *
-     * We can easily build a simple `Tooltip` directive that exposes a `tooltip` property, which can
-     * be used in templates with standard Angular syntax. For example:
-     *
-     * ```
-     * @Directive({
-     *   selector: '[tooltip]',
-     *   properties: [
-     *     'text: tooltip'
-     *   ]
-     * })
-     * class Tooltip {
-     *   set text(value: string) {
-     *     // This will get called every time with the new value when the 'tooltip' property changes
-     *   }
-     * }
-     * ```
-     *
-     * We can then bind to the `tooltip' property as either an expression (`someExpression`) or as a
-     * string literal, as shown in the HTML template below:
-     *
-     * ```html
-     * <div [tooltip]="someExpression">...</div>
-     * <div tooltip="Some Text">...</div>
-     * ```
-     *
-     * Whenever the `someExpression` expression changes, the `properties` declaration instructs
-     * Angular to update the `Tooltip`'s `text` property.
-     *
-     * ## Bindings With Pipes
-     *
-     * You can also use pipes when writing binding definitions for a directive.
-     *
-     * For example, we could write a binding that updates the directive on structural changes, rather
-     * than on reference changes, as normally occurs in change detection.
-     *
-     * See <a href='/angular2/angular2/Pipe'><code>Pipe</code></a> and <a href='/angular2/pipes/KeyValueChanges'><code>KeyValueChanges</code></a> documentation for more details.
-     *
-     * ```
-     * @Directive({
-     *   selector: '[class-set]',
-     *   properties: [
-     *     'classChanges: classSet | keyValDiff'
-     *   ]
-     * })
-     * class ClassSet {
-     *   set classChanges(changes: KeyValueChanges) {
-     *     // This will get called every time the `class-set` expressions changes its structure.
-     *   }
-     * }
-     * ```
-     *
-     * The template that this directive is used in may also contain its own pipes. For example:
-     *
-     * ```html
-     * <div [class-set]="someExpression | somePipe">
-     * ```
-     *
-     * In this case, the two pipes compose as if they were inlined: `someExpression | somePipe |
-     * keyValDiff`.
-     */
-    properties?: List<string>;
-
-    /**
-     * Enumerates the set of emitted events.
-     *
-     * ## Syntax
-     *
-     * ```
-     * @Component({
-     *   events: ['statusChange']
-     * })
-     * class TaskComponent {
-     *   statusChange: EventEmitter;
-     *
-     *   constructor() {
-     *     this.statusChange = new EventEmitter();
-     *   }
-     *
-     *   onComplete() {
-     *     this.statusChange.next('completed');
-     *   }
-     * }
-     * ```
-     *
-     * Use `propertyName: eventName` when the event emitter property name is different from the name
-     * of the emitted event:
-     *
-     * ```
-     * @Component({
-     *   events: ['status: statusChange']
-     * })
-     * class TaskComponent {
-     *   status: EventEmitter;
-     *
-     *   constructor() {
-     *     this.status = new EventEmitter();
-     *   }
-     *
-     *   onComplete() {
-     *     this.status.next('completed');
-     *   }
-     * }
-     * ```
-     */
-    events?: List<string>;
-
-    /**
-     * Specifiy the events, actions, properties and attributes related to the host element.
-     *
-     * ## Events
-     *
-     * Specifies which DOM hostListeners a directive listens to via a set of `(event)` to `method`
-     * key-value pairs:
-     *
-     * - `event1`: the DOM event that the directive listens to.
-     * - `statement`: the statement to execute when the event occurs.
-     * If the evalutation of the statement returns `false`, then `preventDefault`is applied on the DOM
-     * event.
-     *
-     * To listen to global events, a target must be added to the event name.
-     * The target can be `window`, `document` or `body`.
-     *
-     * When writing a directive event binding, you can also refer to the following local variables:
-     * - `$event`: Current event object which triggered the event.
-     * - `$target`: The source of the event. This will be either a DOM element or an Angular
-     * directive. (will be implemented in later release)
-     *
-     * ## Syntax
-     *
-     * ```
-     * @Directive({
-     *   host: {
-     *     '(event1)': 'onMethod1(arguments)',
-     *     '(target:event2)': 'onMethod2(arguments)',
-     *     ...
-     *   }
-     * }
-     * ```
-     *
-     * ## Basic Event Binding:
-     *
-     * Suppose you want to write a directive that reacts to `change` events in the DOM and on
-     * `resize` events in window.
-     * You would define the event binding as follows:
-     *
-     * ```
-     * @Directive({
-     *   selector: 'input',
-     *   host: {
-     *     '(change)': 'onChange($event)',
-     *     '(window:resize)': 'onResize($event)'
-     *   }
-     * })
-     * class InputDirective {
-     *   onChange(event:Event) {
-     *     // invoked when the input element fires the 'change' event
-     *   }
-     *   onResize(event:Event) {
-     *     // invoked when the window fires the 'resize' event
-     *   }
-     * }
-     * ```
-     *
-     * ## Properties
-     *
-     * Specifies which DOM properties a directives updates.
-     *
-     * ## Syntax
-     *
-     * ```
-     * @Directive({
-     *   selector: 'input',
-     *   host: {
-     *     '[prop]': 'expression'
-     *   }
-     * })
-     * class InputDirective {
-     *   value:string;
-     * }
-     * ```
-     *
-     * In this example the prop property of the host element is updated with the expression value
-     * every time it changes.
-     *
-     * ## Attributes
-     *
-     * Specifies static attributes that should be propagated to a host element. Attributes specified
-     * in `hostAttributes` are propagated only if a given attribute is not present on a host element.
-     *
-     * ## Syntax
-     *
-     * ```
-     * @Directive({
-     *   selector: '[my-button]',
-     *   host: {
-     *     'role': 'button'
-     *   }
-     * })
-     * class MyButton {
-     * }
-     * ```
-     *
-     * In this example using `my-button` directive (ex.: `<div my-button></div>`) on a host element
-     * (here: `<div>` ) will ensure that this element will get the "button" role.
-     *
-     * ## Actions
-     *
-     * Specifies which DOM methods a directive can invoke.
-     *
-     * ## Syntax
-     *
-     * ```
-     * @Directive({
-     *   selector: 'input',
-     *   host: {
-     *     '@emitFocus': 'focus()'
-     *   }
-     * })
-     * class InputDirective {
-     *   constructor() {
-     *     this.emitFocus = new EventEmitter();
-     *   }
-     *
-     *   focus() {
-     *     this.emitFocus.next();
-     *   }
-     * }
-     * ```
-     *
-     * In this example calling focus on InputDirective will result in calling focus on the input.
-     */
-    host?: StringMap<string, string>;
-
-    /**
-     * Specifies which lifecycle should be notified to the directive.
-     *
-     * See <a href='/angular2/angular2/onChange'><code>onChange</code></a>, <a href='/angular2/angular2/onDestroy'><code>onDestroy</code></a>, <a href='/angular2/angular2/onCheck'><code>onCheck</code></a>,
-     * <a href='/angular2/angular2/onInit'><code>onInit</code></a>, <a href='/angular2/angular2/onAllChangesDone'><code>onAllChangesDone</code></a> for details.
-     */
-    lifecycle?: List<LifecycleEvent>;
-
-    /**
-     * If set to false the compiler does not compile the children of this directive.
-     */
-    compileChildren?: boolean;
-
-    /**
-     * Defines the set of injectable objects that are visible to a Directive and its light dom
-     * children.
-     *
-     * ## Simple Example
-     *
-     * Here is an example of a class that can be injected:
-     *
-     * ```
-     * class Greeter {
-     *    greet(name:string) {
-     *      return 'Hello ' + name + '!';
-     *    }
-     * }
-     *
-     * @Directive({
-     *   selector: 'greet',
-     *   hostInjector: [
-     *     Greeter
-     *   ]
-     * })
-     * class HelloWorld {
-     *   greeter:Greeter;
-     *
-     *   constructor(greeter:Greeter) {
-     *     this.greeter = greeter;
-     *   }
-     * }
-     * ```
-     */
-    hostInjector?: List<any>;
-
-    /**
-     * Defines the name that can be used in the template to assign this directive to a variable.
-     *
-     * ## Simple Example
-     *
-     * ```
-     * @Directive({
-     *   selector: 'child-dir',
-     *   exportAs: 'child'
-     * })
-     * class ChildDir {
-     * }
-     *
-     * @Component({
-     *   selector: 'main',
-     * })
-     * @View({
-     *   template: `<child-dir #c="child"></child-dir>`,
-     *   directives: [ChildDir]
-     * })
-     * class MainComponent {
-     * }
-     *
-     * ```
-     */
-    exportAs?: string;
-  }
-
+  
 
   /**
    * Lifecycle events are guaranteed to be called in the following order:
@@ -889,249 +80,351 @@ declare module "angular2/angular2" {
    * - `onAllChangesDone`
    */
   class LifecycleEvent {
-    name: string;
+    
+     name: string;
   }
-
+  
 
   /**
-   * An interface that <a href='/angular2/angular2/NgFormModel'><code>NgFormModel</code></a> and <a href='/angular2/angular2/NgForm'><code>NgForm</code></a> implement.
-   *
+   * An interface that <a href='/angular2/angular2.api/NgFormModel'><code>NgFormModel</code></a> and <a href='/angular2/angular2.api/NgForm'><code>NgForm</code></a> implement.
+   * 
    * Only used by the forms module.
    */
   interface Form {
-    addControl(dir: NgControl): void;
-    removeControl(dir: NgControl): void;
-    getControl(dir: NgControl): Control;
-    addControlGroup(dir: NgControlGroup): void;
-    removeControlGroup(dir: NgControlGroup): void;
-    updateModel(dir: NgControl, value: any): void;
+    
+     addControl(dir: NgControl): void;
+    
+     removeControl(dir: NgControl): void;
+    
+     getControl(dir: NgControl): Control;
+    
+     addControlGroup(dir: NgControlGroup): void;
+    
+     removeControlGroup(dir: NgControlGroup): void;
+    
+     updateModel(dir: NgControl, value: any): void;
   }
-
-  interface TypeDecorator {
-    annotations: Array<any>;
-    Class(obj: ClassDefinition): Type;
-  }
-
-  interface ClassDefinition {
-    extends: Type;
-    constructor: (Function | Array<any>);
-  }
-
+  
 
   /**
-   * Specifies that a <a href='/angular2/angular2/QueryList'><code>QueryList</code></a> should be injected.
-   *
-   * See <a href='/angular2/angular2/QueryList'><code>QueryList</code></a> for usage and example.
-   *
+   * An interface implemented by all Angular type decorators, which allows them to be used as ES7
+   * decorators as well as
+   * Angular DSL syntax.
+   * 
+   * DSL syntax:
+   * 
+   * ```
+   * var MyClass = ng
+   *   .Component({...})
+   *   .View({...})
+   *   .Class({...});
+   * ```
+   * 
+   * ES7 syntax:
+   * 
+   * ```
+   * @ng.Component({...})
+   * @ng.View({...})
+   * class MyClass {...}
+   * ```
+   */
+  interface TypeDecorator {
+    
+
+    /**
+     * Invoke as ES7 decorator.
+     */
+     <T extends Type>(type: T): T;
+  
+    
+
+    /**
+     * Storage for the accumulated annotations so far used by the DSL syntax.
+     * 
+     * Used by <a href='/angular2/angular2.api/Class'><code>Class</code></a> to annotate the generated class.
+     */
+     annotations: Array<any>;
+    
+
+    /**
+     * Generate a class from the definition and annotate it with <a href='/angular2/angular2.api/TypeDecorator#annotations'><code>TypeDecorator</code></a>.
+     */
+     Class(obj: ClassDefinition): Type;
+  }
+  
+
+  /**
+   * Declares the interface to be used with <a href='/angular2/angular2.api/Class'><code>Class</code></a>.
+   */
+  interface ClassDefinition {
+    
+
+    /**
+     * Optional argument for specifying the superclass.
+     */
+     extends?: Type;
+    
+
+    /**
+     * Required constructor function for a class.
+     * 
+     * The function may be optionall wrapped in an `Array`, in which case additional parameter
+     * annotations may be
+     * specified. The number of arguments and the number of paramater annotations must match.
+     * 
+     * See <a href='/angular2/angular2.api/Class'><code>Class</code></a> for example of usage.
+     */
+     constructor: (Function | Array<any>);
+  }
+  
+
+  /**
+   * Specifies that a <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a> should be injected.
+   * 
+   * See <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a> for usage and example.
+   * 
    * @exportedAs angular2/annotations
    */
-  class Query extends  DependencyAnnotation {
-    descendants: boolean;
-    selector: any;
-    isVarBindingQuery: boolean;
-    varBindings: List<string>;
-    toString(): any;
+  class Query extends DependencyAnnotation {
+    
+     descendants: boolean;
+    
+     selector: void;
+    
+     isVarBindingQuery: boolean;
+    
+     varBindings: List<string>;
+    
+     toString(): string;
   }
-
+  
 
   /**
    * A directive that contains a group of [NgControl].
-   *
+   * 
    * Only used by the forms module.
    */
   class ControlContainer {
-    name: string;
-    formDirective: Form;
-    path: List<string>;
+    
+     name: string;
+    
+     formDirective: Form;
+    
+     path: List<string>;
   }
-
+  
 
   /**
    * A marker annotation that marks a class as available to `Injector` for creation. Used by tooling
    * for generating constructor stubs.
-   *
+   * 
    * ```
    * class NeedsService {
    *   constructor(svc:UsefulService) {}
    * }
-   *
+   * 
    * @Injectable
    * class UsefulService {}
    * ```
    * @exportedAs angular2/di_annotations
    */
   class Injectable {
+    
+     visibility: Visibility;
   }
+  
 
+  /**
+   * Specifies how injector should resolve a dependency.
+   * 
+   * See <a href='/angular2/angular2.api/Self'><code>Self</code></a>, <a href='/angular2/angular2.api/Parent'><code>Parent</code></a>, <a href='/angular2/angular2.api/Ancestor'><code>Ancestor</code></a>, <a href='/angular2/angular2.api/Unbounded'><code>Unbounded</code></a>.
+   * 
+   * @exportedAs angular2/di_annotations
+   */
+  class Visibility {
+    
+     depth: number;
+    
+     crossBoundaries: boolean;
+    
+     includeSelf: boolean;
+    
+     toString(): string;
+  }
+  
 
   /**
    * Injectable Objects that contains a live list of child directives in the light Dom of a directive.
    * The directives are kept in depth-first pre-order traversal of the DOM.
-   *
+   * 
    * In the future this class will implement an Observable interface.
    * For now it uses a plain list of observable callbacks.
-   *
+   * 
    * @exportedAs angular2/view
    */
   class BaseQueryList<T> {
-    reset(newList: any): any;
-    add(obj: any): any;
-    fireCallbacks(): any;
-    onChange(callback: any): any;
-    removeCallback(callback: any): any;
-    length: any;
-    first: any;
-    last: any;
+    
+     reset(newList: any): void;
+    
+     add(obj: any): void;
+    
+     fireCallbacks(): void;
+    
+     onChange(callback: any): void;
+    
+     removeCallback(callback: any): void;
+    
+     length: void;
+    
+     first: void;
+    
+     last: void;
   }
-
+  
   class AppProtoView {
-    elementBinders: List<ElementBinder>;
-    protoLocals: Map<string, any>;
-    render: RenderProtoViewRef;
-    protoChangeDetector: ProtoChangeDetector;
-    variableBindings: Map<string, string>;
-    variableLocations: Map<string, number>;
-    bindElement(parent: ElementBinder, distanceToParent: int, protoElementInjector: ProtoElementInjector, componentDirective?: DirectiveBinding): ElementBinder;
+    
+     elementBinders: List<ElementBinder>;
+    
+     protoLocals: Map<string, any>;
+    
+     render: RenderProtoViewRef;
+    
+     protoChangeDetector: ProtoChangeDetector;
+    
+     variableBindings: Map<string, string>;
+    
+     variableLocations: Map<string, number>;
+    
+     bindElement(parent: ElementBinder, distanceToParent: int, protoElementInjector: ProtoElementInjector, componentDirective?: DirectiveBinding): ElementBinder;
+    
 
     /**
      * Adds an event binding for the last created ElementBinder via bindElement.
-     *
+     * 
      * If the directive index is a positive integer, the event is evaluated in the context of
      * the given directive.
-     *
+     * 
      * If the directive index is -1, the event is evaluated in the context of the enclosing view.
-     *
+     * 
      * @param {string} eventName
      * @param {AST} expression
      * @param {int} directiveIndex The directive index in the binder or -1 when the event is not bound
      *                             to a directive
      */
-    bindEvent(eventBindings: List<EventBinding>, boundElementIndex: number, directiveIndex?: int): void;
+     bindEvent(eventBindings: List<EventBinding>, boundElementIndex: number, directiveIndex?: int): void;
   }
-
+  
 
   /**
-   * Const of making objects: http://jsperf.com/instantiate-size-of-object
+   * Cost of making objects: http://jsperf.com/instantiate-size-of-object
    */
-  class AppView implements  ChangeDispatcher,  EventDispatcher {
-    render: RenderViewRef;
-    rootElementInjectors: List<ElementInjector>;
-    elementInjectors: List<ElementInjector>;
-    changeDetector: ChangeDetector;
-    componentChildViews: List<AppView>;
-    viewContainers: List<AppViewContainer>;
-    preBuiltObjects: List<PreBuiltObjects>;
-    elementRefs: List<ElementRef>;
-    ref: ViewRef;
+  class AppView implements ChangeDispatcher,  EventDispatcher {
+    
+     render: RenderViewRef;
+    
+     rootElementInjectors: List<ElementInjector>;
+    
+     elementInjectors: List<ElementInjector>;
+    
+     changeDetector: ChangeDetector;
+    
+     componentChildViews: List<AppView>;
+    
+     viewContainers: List<AppViewContainer>;
+    
+     preBuiltObjects: List<PreBuiltObjects>;
+    
+     elementRefs: List<ElementRef>;
+    
+     ref: ViewRef;
+    
 
     /**
      * The context against which data-binding expressions in this view are evaluated against.
      * This is always a component instance.
      */
-    context: any;
+     context: any;
+    
 
     /**
      * Variables, local to this view, that can be used in binding expressions (in addition to the
      * context). This is used for thing like `<video #player>` or
      * `<li template="for #item of items">`, where "player" and "item" are locals, respectively.
      */
-    locals: Locals;
-    renderer: Renderer;
-    proto: AppProtoView;
-    init(changeDetector: ChangeDetector, elementInjectors: List<ElementInjector>, rootElementInjectors: List<ElementInjector>, preBuiltObjects: List<PreBuiltObjects>, componentChildViews: List<AppView>): any;
-    setLocal(contextName: string, value: any): void;
-    hydrated(): boolean;
+     locals: Locals;
+    
+     renderer: Renderer;
+    
+     proto: AppProtoView;
+    
+     init(changeDetector: ChangeDetector, elementInjectors: List<ElementInjector>, rootElementInjectors: List<ElementInjector>, preBuiltObjects: List<PreBuiltObjects>, componentChildViews: List<AppView>): void;
+    
+     setLocal(contextName: string, value: any): void;
+    
+     hydrated(): boolean;
+    
 
     /**
      * Triggers the event handlers for the element and the directives.
-     *
+     * 
      * This method is intended to be called from directive EventEmitters.
-     *
+     * 
      * @param {string} eventName
      * @param {*} eventObj
      * @param {int} binderIndex
      */
-    triggerEventHandlers(eventName: string, eventObj: any, binderIndex: int): void;
-    notifyOnBinding(b: BindingRecord, currentValue: any): void;
-    notifyOnAllChangesDone(): void;
-    getDirectiveFor(directive: DirectiveIndex): any;
-    getDetectorFor(directive: DirectiveIndex): any;
-    invokeElementMethod(elementIndex: number, methodName: string, args: List<any>): any;
-    dispatchEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
+     triggerEventHandlers(eventName: string, eventObj: any, binderIndex: int): void;
+    
+     notifyOnBinding(b: BindingRecord, currentValue: any): void;
+    
+     notifyOnAllChangesDone(): void;
+    
+     getDirectiveFor(directive: DirectiveIndex): any;
+    
+     getDetectorFor(directive: DirectiveIndex): any;
+    
+     invokeElementMethod(elementIndex: number, methodName: string, args: List<any>): void;
+    
+     dispatchEvent(elementIndex: number, eventName: string, locals: Map<string, any>): boolean;
   }
-
+  
   class AppViewContainer {
-    views: List<AppView>;
+    
+     views: List<AppView>;
   }
-
-  class Visibility extends  DependencyAnnotation {
-    depth: number;
-    crossComponentBoundaries: boolean;
-    includeSelf: boolean;
-    toString(): any;
+  
+  class DehydratedException extends BaseException {
   }
-
-
-  /**
-   * Entry point for creating, moving views in the view hierarchy and destroying views.
-   * This manager contains all recursion and delegates to helper methods
-   * in AppViewManagerUtils and the Renderer, so unit tests get simpler.
-   */
-  class AppViewManager {
-    getComponentView(hostLocation: ElementRef): ViewRef;
-    getViewContainer(location: ElementRef): ViewContainerRef;
-    getHostElement(hostViewRef: ViewRef): ElementRef;
-
-    /**
-     * Returns an ElementRef for the element with the given variable name
-     * in the component view of the component at the provided ElementRef.
-     */
-    getNamedElementInComponentView(hostLocation: ElementRef, variableName: string): ElementRef;
-    getComponent(hostLocation: ElementRef): any;
-    createRootHostView(hostProtoViewRef: ProtoViewRef, overrideSelector: string, injector: Injector): ViewRef;
-    destroyRootHostView(hostViewRef: ViewRef): any;
-    createViewInContainer(viewContainerLocation: ElementRef, atIndex: number, protoViewRef: ProtoViewRef, context?: ElementRef, injector?: Injector): ViewRef;
-    destroyViewInContainer(viewContainerLocation: ElementRef, atIndex: number): any;
-    attachViewInContainer(viewContainerLocation: ElementRef, atIndex: number, viewRef: ViewRef): ViewRef;
-    detachViewInContainer(viewContainerLocation: ElementRef, atIndex: number): ViewRef;
+  
+  class ExpressionChangedAfterItHasBeenChecked extends BaseException {
   }
-
-  class DehydratedException extends  BaseException {
+  
+  class ChangeDetectionError extends BaseException {
+    
+     location: string;
   }
-
-  class ExpressionChangedAfterItHasBeenChecked extends  BaseException {
-    message: string;
-    toString(): string;
-  }
-
-  class ChangeDetectionError extends  BaseException {
-    message: string;
-    location: string;
-    originalException: any;
-    toString(): string;
-  }
-
+  
 
   /**
    * Interface used by Angular to control the change detection strategy for an application.
-   *
+   * 
    * Angular implements the following change detection strategies by default:
-   *
-   * - <a href='/angular2/angular2/DynamicChangeDetection'><code>DynamicChangeDetection</code></a>: slower, but does not require `eval()`.
-   * - <a href='/angular2/angular2/JitChangeDetection'><code>JitChangeDetection</code></a>: faster, but requires `eval()`.
-   *
+   * 
+   * - <a href='/angular2/angular2.api/DynamicChangeDetection'><code>DynamicChangeDetection</code></a>: slower, but does not require `eval()`.
+   * - <a href='/angular2/angular2.api/JitChangeDetection'><code>JitChangeDetection</code></a>: faster, but requires `eval()`.
+   * 
    * In JavaScript, you should always use `JitChangeDetection`, unless you are in an environment that
    * has
    * [CSP](https://developer.mozilla.org/en-US/docs/Web/Security/CSP), such as a Chrome Extension.
-   *
+   * 
    * In Dart, use `DynamicChangeDetection` during development. The Angular transformer generates an
    * analog to the
    * `JitChangeDetection` strategy at compile time.
-   *
-   *
-   * See: <a href='/angular2/angular2/DynamicChangeDetection'><code>DynamicChangeDetection</code></a>, <a href='/angular2/angular2/JitChangeDetection'><code>JitChangeDetection</code></a>,
-   * <a href='/angular2/angular2/PreGeneratedChangeDetection'><code>PreGeneratedChangeDetection</code></a>
-   *
+   * 
+   * 
+   * See: <a href='/angular2/angular2.api/DynamicChangeDetection'><code>DynamicChangeDetection</code></a>, <a href='/angular2/angular2.api/JitChangeDetection'><code>JitChangeDetection</code></a>,
+   * <a href='/angular2/angular2.api/PreGeneratedChangeDetection'><code>PreGeneratedChangeDetection</code></a>
+   * 
    * # Example
    * ```javascript
    * bootstrap(MyApp, [bind(ChangeDetection).toClass(DynamicChangeDetection)]);
@@ -1139,251 +432,321 @@ declare module "angular2/angular2" {
    * @exportedAs angular2/change_detection
    */
   class ChangeDetection {
-    createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
+    
+     createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
   }
-
+  
 
   /**
    * ON_PUSH means that the change detector's mode will be set to CHECK_ONCE during hydration.
    */
-  var ON_PUSH: any;
-
+  var ON_PUSH:any;
+  
 
   /**
    * DEFAULT means that the change detector's mode will be set to CHECK_ALWAYS during hydration.
    */
-  var DEFAULT: any;
-
+  var DEFAULT:any;
+  
 
   /**
    * Controls change detection.
-   *
-   * <a href='/angular2/angular2/ChangeDetectorRef'><code>ChangeDetectorRef</code></a> allows requesting checks for detectors that rely on observables. It
+   * 
+   * <a href='/angular2/angular2.api/ChangeDetectorRef'><code>ChangeDetectorRef</code></a> allows requesting checks for detectors that rely on observables. It
    * also allows detaching and
    * attaching change detector subtrees.
-   *
+   * 
    * @exportedAs angular2/change_detection
    */
   class ChangeDetectorRef {
+    
 
     /**
      * Request to check all ON_PUSH ancestors.
      */
-    requestCheck(): void;
+     requestCheck(): void;
+    
 
     /**
      * Detaches the change detector from the change detector tree.
-     *
+     * 
      * The detached change detector will not be checked until it is reattached.
      */
-    detach(): void;
+     detach(): void;
+    
 
     /**
      * Reattach the change detector to the change detector tree.
-     *
+     * 
      * This also requests a check of this change detector. This reattached change detector will be
      * checked during the
      * next change detection run.
      */
-    reattach(): void;
+     reattach(): void;
   }
-
+  
   class PipeRegistry {
-    config: any;
-    get(type: string, obj: any, cdRef?: ChangeDetectorRef, existingPipe?: Pipe): Pipe;
+    
+     config: void;
+    
+     get(type: string, obj: any, cdRef?: ChangeDetectorRef, existingPipe?: Pipe): Pipe;
   }
-
+  
 
   /**
-   * Indicates that the result of a <a href='/angular2/angular2/Pipe'><code>Pipe</code></a> transformation has changed even though the reference
+   * Indicates that the result of a <a href='/angular2/angular2.api/Pipe'><code>Pipe</code></a> transformation has changed even though the reference
    * has not changed.
-   *
+   * 
    * The wrapped value will be unwrapped by change detection, and the unwrapped value will be stored.
-   *
+   * 
    * @exportedAs angular2/pipes
    */
   class WrappedValue {
-    wrapped: any;
+    
+     wrapped: any;
   }
-
+  
 
   /**
    * An interface for extending the list of pipes known to Angular.
-   *
-   * If you are writing a custom <a href='/angular2/angular2/Pipe'><code>Pipe</code></a>, you must extend this interface.
-   *
+   * 
+   * If you are writing a custom <a href='/angular2/angular2.api/Pipe'><code>Pipe</code></a>, you must extend this interface.
+   * 
    * #Example
-   *
+   * 
    * ```
    * class DoublePipe implements Pipe {
    *  supports(obj) {
    *    return true;
    *  }
-   *
+   * 
    *  onDestroy() {}
-   *
-   *  transform(value) {
+   * 
+   *  transform(value, args = []) {
    *    return `${value}${value}`;
    *  }
    * }
    * ```
-   *
+   * 
    * @exportedAs angular2/pipes
    */
   interface Pipe {
-    supports(obj: any): boolean;
-    onDestroy(): void;
-    transform(value: any): any;
+    
+     supports(obj: any): boolean;
+    
+     onDestroy(): void;
+    
+     transform(value: any, args: List<any>): any;
   }
-
+  
   interface PipeFactory {
-    supports(obs: any): boolean;
-    create(cdRef: any): Pipe;
+    
+     supports(obs: any): boolean;
+    
+     create(cdRef: ChangeDetectorRef): Pipe;
   }
-
+  
 
   /**
    * @exportedAs angular2/pipes
    */
-  class NullPipe extends  BasePipe {
-    called: boolean;
-    supports(obj: any): any;
-    transform(value: any): any;
+  class NullPipe extends BasePipe {
+    
+     called: boolean;
+    
+     supports(obj: any): boolean;
+    
+     transform(value: any, args?: List<any>): WrappedValue;
   }
-
+  
 
   /**
    * @exportedAs angular2/pipes
    */
-  class NullPipeFactory implements  PipeFactory {
-    supports(obj: any): boolean;
-    create(cdRef: any): Pipe;
+  class NullPipeFactory implements PipeFactory {
+    
+     supports(obj: any): boolean;
+    
+     create(cdRef: ChangeDetectorRef): Pipe;
   }
-
-  var defaultPipes: any;
-
+  
+  var defaultPipes:any;
+  
 
   /**
    * Implements change detection that does not require `eval()`.
-   *
-   * This is slower than <a href='/angular2/angular2/JitChangeDetection'><code>JitChangeDetection</code></a>.
-   *
+   * 
+   * This is slower than <a href='/angular2/angular2.api/JitChangeDetection'><code>JitChangeDetection</code></a>.
+   * 
    * @exportedAs angular2/change_detection
    */
-  class DynamicChangeDetection extends  ChangeDetection {
-    registry: PipeRegistry;
-    createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
+  class DynamicChangeDetection extends ChangeDetection {
+    
+     registry: PipeRegistry;
+    
+     createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
   }
-
+  
 
   /**
    * Implements faster change detection by generating source code.
-   *
+   * 
    * This requires `eval()`. For change detection that does not require `eval()`, see
-   * <a href='/angular2/angular2/DynamicChangeDetection'><code>DynamicChangeDetection</code></a> and <a href='/angular2/angular2/PreGeneratedChangeDetection'><code>PreGeneratedChangeDetection</code></a>.
-   *
+   * <a href='/angular2/angular2.api/DynamicChangeDetection'><code>DynamicChangeDetection</code></a> and <a href='/angular2/angular2.api/PreGeneratedChangeDetection'><code>PreGeneratedChangeDetection</code></a>.
+   * 
    * @exportedAs angular2/change_detection
    */
-  class JitChangeDetection extends  ChangeDetection {
-    registry: PipeRegistry;
-    createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
+  class JitChangeDetection extends ChangeDetection {
+    
+     registry: PipeRegistry;
+    
+     createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
   }
-
+  
 
   /**
    * Implements change detection using a map of pregenerated proto detectors.
-   *
+   * 
    * @exportedAs angular2/change_detection
    */
-  class PreGeneratedChangeDetection extends  ChangeDetection {
-    registry: PipeRegistry;
-    createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
+  class PreGeneratedChangeDetection extends ChangeDetection {
+    
+     registry: PipeRegistry;
+    
+     createProtoChangeDetector(definition: ChangeDetectorDefinition): ProtoChangeDetector;
   }
-
+  
 
   /**
-   * Map from <a href='/angular2/angular2/ChangeDetectorDefinition#id'><code>ChangeDetectorDefinition</code></a> to a factory method which takes a
-   * <a href='/angular2/angular2/PipeRegistry'><code>PipeRegistry</code></a> and a <a href='/angular2/angular2/ChangeDetectorDefinition'><code>ChangeDetectorDefinition</code></a> and generates a
-   * <a href='/angular2/angular2/ProtoChangeDetector'><code>ProtoChangeDetector</code></a> associated with the definition.
+   * Map from <a href='/angular2/angular2.api/ChangeDetectorDefinition#id'><code>ChangeDetectorDefinition</code></a> to a factory method which takes a
+   * <a href='/angular2/angular2.api/PipeRegistry'><code>PipeRegistry</code></a> and a <a href='/angular2/angular2.api/ChangeDetectorDefinition'><code>ChangeDetectorDefinition</code></a> and generates a
+   * <a href='/angular2/angular2.api/ProtoChangeDetector'><code>ProtoChangeDetector</code></a> associated with the definition.
    */
   var preGeneratedProtoDetectors : StringMap<string, Function> ;
-
+  
   var defaultPipeRegistry : PipeRegistry ;
-
+  
   class DirectiveIndex {
-    elementIndex: number;
-    directiveIndex: number;
-    name: any;
+    
+     elementIndex: number;
+    
+     directiveIndex: number;
+    
+     name: void;
   }
-
+  
   class BindingRecord {
-    mode: string;
-    implicitReceiver: any;
-    ast: AST;
-    elementIndex: number;
-    propertyName: string;
-    propertyUnit: string;
-    setter: SetterFn;
-    lifecycleEvent: string;
-    directiveRecord: DirectiveRecord;
-    callOnChange(): boolean;
-    isOnPushChangeDetection(): boolean;
-    isDirective(): boolean;
-    isDirectiveLifecycle(): boolean;
-    isElementProperty(): boolean;
-    isElementAttribute(): boolean;
-    isElementClass(): boolean;
-    isElementStyle(): boolean;
-    isTextNode(): boolean;
+    
+     mode: string;
+    
+     implicitReceiver: any;
+    
+     ast: AST;
+    
+     elementIndex: number;
+    
+     propertyName: string;
+    
+     propertyUnit: string;
+    
+     setter: SetterFn;
+    
+     lifecycleEvent: string;
+    
+     directiveRecord: DirectiveRecord;
+    
+     callOnChange(): boolean;
+    
+     isOnPushChangeDetection(): boolean;
+    
+     isDirective(): boolean;
+    
+     isDirectiveLifecycle(): boolean;
+    
+     isElementProperty(): boolean;
+    
+     isElementAttribute(): boolean;
+    
+     isElementClass(): boolean;
+    
+     isElementStyle(): boolean;
+    
+     isTextNode(): boolean;
   }
-
+  
   interface ProtoChangeDetector {
-    instantiate(dispatcher: any): ChangeDetector;
+    
+     instantiate(dispatcher: any): ChangeDetector;
   }
-
+  
   interface ChangeDispatcher {
-    notifyOnBinding(bindingRecord: BindingRecord, value: any): void;
-    notifyOnAllChangesDone(): void;
+    
+     notifyOnBinding(bindingRecord: BindingRecord, value: any): void;
+    
+     notifyOnAllChangesDone(): void;
   }
-
+  
   interface ChangeDetector {
-    parent: ChangeDetector;
-    mode: string;
-    addChild(cd: ChangeDetector): void;
-    addShadowDomChild(cd: ChangeDetector): void;
-    removeChild(cd: ChangeDetector): void;
-    removeShadowDomChild(cd: ChangeDetector): void;
-    remove(): void;
-    hydrate(context: any, locals: Locals, directives: any): void;
-    dehydrate(): void;
-    markPathToRootAsCheckOnce(): void;
-    detectChanges(): void;
-    checkNoChanges(): void;
+    
+     parent: ChangeDetector;
+    
+     mode: string;
+    
+     addChild(cd: ChangeDetector): void;
+    
+     addShadowDomChild(cd: ChangeDetector): void;
+    
+     removeChild(cd: ChangeDetector): void;
+    
+     removeShadowDomChild(cd: ChangeDetector): void;
+    
+     remove(): void;
+    
+     hydrate(context: any, locals: Locals, directives: any): void;
+    
+     dehydrate(): void;
+    
+     markPathToRootAsCheckOnce(): void;
+    
+     detectChanges(): void;
+    
+     checkNoChanges(): void;
   }
-
+  
   class Locals {
-    parent: Locals;
-    current: Map<any, any>;
-    contains(name: string): boolean;
-    get(name: string): any;
-    set(name: string, value: any): void;
-    clearValues(): void;
+    
+     parent: Locals;
+    
+     current: Map<any, any>;
+    
+     contains(name: string): boolean;
+    
+     get(name: string): any;
+    
+     set(name: string, value: any): void;
+    
+     clearValues(): void;
   }
-
+  
   class ChangeDetectorDefinition {
-    id: string;
-    strategy: string;
-    variableNames: List<string>;
-    bindingRecords: List<BindingRecord>;
-    directiveRecords: List<DirectiveRecord>;
+    
+     id: string;
+    
+     strategy: string;
+    
+     variableNames: List<string>;
+    
+     bindingRecords: List<BindingRecord>;
+    
+     directiveRecords: List<DirectiveRecord>;
   }
-
+  
 
   /**
    * Provides default implementation of supports and onDestroy.
-   *
+   * 
    * #Example
-   *
+   * 
    * ```
    * class DoublePipe extends BasePipe {*
    *  transform(value) {
@@ -1392,206 +755,240 @@ declare module "angular2/angular2" {
    * }
    * ```
    */
-  class BasePipe implements  Pipe {
-    supports(obj: any): boolean;
-    onDestroy(): void;
-    transform(value: any): any;
+  class BasePipe implements Pipe {
+    
+     supports(obj: any): boolean;
+    
+     onDestroy(): void;
+    
+     transform(value: any, args: List<any>): any;
   }
-
+  
   class DirectiveRecord {
-    directiveIndex: DirectiveIndex;
-    callOnAllChangesDone: boolean;
-    callOnChange: boolean;
-    callOnCheck: boolean;
-    callOnInit: boolean;
-    changeDetection: string;
-    isOnPushChangeDetection(): boolean;
+    
+     directiveIndex: DirectiveIndex;
+    
+     callOnAllChangesDone: boolean;
+    
+     callOnChange: boolean;
+    
+     callOnCheck: boolean;
+    
+     callOnInit: boolean;
+    
+     changeDetection: string;
+    
+     isOnPushChangeDetection(): boolean;
   }
-
-  var Inject: any;
-
-  var InjectPromise: any;
-
-  var InjectLazy: any;
-
-  var Optional: any;
-
+  
+  var Inject:any;
+  
+  var Optional:any;
+  
 
   /**
    * Allows to refer to references which are not yet defined.
-   *
+   * 
    * This situation arises when the key which we need te refer to for the purposes of DI is declared,
    * but not yet defined.
-   *
+   * 
    * ## Example:
-   *
+   * 
    * ```
    * class Door {
    *   // Incorrect way to refer to a reference which is defined later.
    *   // This fails because `Lock` is undefined at this point.
    *   constructor(lock:Lock) { }
-   *
+   * 
    *   // Correct way to refer to a reference which is defined later.
    *   // The reference needs to be captured in a closure.
    *   constructor(@Inject(forwardRef(() => Lock)) lock:Lock) { }
    * }
-   *
+   * 
    * // Only at this point the lock is defined.
    * class Lock {
    * }
    * ```
-   *
+   * 
    * @exportedAs angular2/di
    */
   function forwardRef(forwardRefFn: ForwardRefFn) : Type ;
-
+  
 
   /**
    * Lazily retrieve the reference value.
-   *
-   * See: <a href='/angular2/angular2/forwardRef'><code>forwardRef</code></a>
-   *
+   * 
+   * See: <a href='/angular2/angular2.api/forwardRef'><code>forwardRef</code></a>
+   * 
    * @exportedAs angular2/di
    */
   function resolveForwardRef(type: any) : any ;
-
+  
   interface ForwardRefFn {
+    
+     (): any;
+  
   }
-
+  
 
   /**
    * A dependency injection container used for resolving dependencies.
-   *
+   * 
    * An `Injector` is a replacement for a `new` operator, which can automatically resolve the
    * constructor dependencies.
    * In typical use, application code asks for the dependencies in the constructor and they are
    * resolved by the `Injector`.
-   *
+   * 
    * ## Example:
-   *
+   * 
    * Suppose that we want to inject an `Engine` into class `Car`, we would define it like this:
-   *
+   * 
    * ```javascript
    * class Engine {
    * }
-   *
+   * 
    * class Car {
    *   constructor(@Inject(Engine) engine) {
    *   }
    * }
-   *
+   * 
    * ```
-   *
+   * 
    * Next we need to write the code that creates and instantiates the `Injector`. We then ask for the
    * `root` object, `Car`, so that the `Injector` can recursively build all of that object's
    * dependencies.
-   *
+   * 
    * ```javascript
    * main() {
    *   var injector = Injector.resolveAndCreate([Car, Engine]);
-   *
+   * 
    *   // Get a reference to the `root` object, which will recursively instantiate the tree.
    *   var car = injector.get(Car);
    * }
    * ```
    * Notice that we don't use the `new` operator because we explicitly want to have the `Injector`
    * resolve all of the object's dependencies automatically.
-   *
+   * 
    * @exportedAs angular2/di
    */
   class Injector {
-
-    /**
-     * Direct parent of this injector.
-     */
-    parent: Injector;
+    
 
     /**
      * Retrieves an instance from the injector.
-     *
+     * 
      * @param `token`: usually the `Type` of an object. (Same as the token used while setting up a
      * binding).
      * @returns an instance represented by the token. Throws if not found.
      */
-    get(token: any): any;
+     get(token: any): any;
+    
 
     /**
      * Retrieves an instance from the injector.
-     *
+     * 
      * @param `token`: usually a `Type`. (Same as the token used while setting up a binding).
      * @returns an instance represented by the token. Returns `null` if not found.
      */
-    getOptional(token: any): any;
+     getOptional(token: any): any;
+    
 
     /**
-     * Retrieves an instance from the injector asynchronously. Used with asynchronous bindings.
-     *
-     * @param `token`: usually a `Type`. (Same as token used while setting up a binding).
-     * @returns a `Promise` which resolves to the instance represented by the token.
+     * Retrieves an instance from the injector.
+     * 
+     * @param `index`: index of an instance.
+     * @returns an instance represented by the index. Throws if not found.
      */
-    asyncGet(token: any): Promise<any>;
+     getAt(index: number): any;
+    
+
+    /**
+     * Direct parent of this injector.
+     */
+     parent: Injector;
+    
+
+    /**
+     * Internal. Do not use.
+     * 
+     * We return `any` not to export the InjectorStrategy type.
+     */
+     internalStrategy: any;
+    
 
     /**
      * Creates a child injector and loads a new set of bindings into it.
-     *
+     * 
      * A resolution is a process of flattening multiple nested lists and converting individual
-     * bindings into a list of <a href='/angular2/angular2/ResolvedBinding'><code>ResolvedBinding</code></a>s. The resolution can be cached by `resolve`
-     * for the <a href='/angular2/angular2/Injector'><code>Injector</code></a> for performance-sensitive code.
-     *
-     * @param `bindings` can be a list of `Type`, <a href='/angular2/angular2/Binding'><code>Binding</code></a>, <a href='/angular2/angular2/ResolvedBinding'><code>ResolvedBinding</code></a>, or a
+     * bindings into a list of <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>s. The resolution can be cached by `resolve`
+     * for the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> for performance-sensitive code.
+     * 
+     * @param `bindings` can be a list of `Type`, <a href='/angular2/angular2.api/Binding'><code>Binding</code></a>, <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>, or a
      * recursive list of more bindings.
+     * @param `depProvider`
      */
-    resolveAndCreateChild(bindings: List<Type | Binding | List<any>>): Injector;
+     resolveAndCreateChild(bindings: List<Type | Binding | List<any>>, depProvider?: DependencyProvider): Injector;
+    
 
     /**
-     * Creates a child injector and loads a new set of <a href='/angular2/angular2/ResolvedBinding'><code>ResolvedBinding</code></a>s into it.
-     *
-     * @param `bindings`: A sparse list of <a href='/angular2/angular2/ResolvedBinding'><code>ResolvedBinding</code></a>s.
-     * See `resolve` for the <a href='/angular2/angular2/Injector'><code>Injector</code></a>.
-     * @returns a new child <a href='/angular2/angular2/Injector'><code>Injector</code></a>.
+     * Creates a child injector and loads a new set of <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>s into it.
+     * 
+     * @param `bindings`: A sparse list of <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>s.
+     * See `resolve` for the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+     * @param `depProvider`
+     * @returns a new child <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
      */
-    createChildFromResolved(bindings: List<ResolvedBinding>): Injector;
+     createChildFromResolved(bindings: List<ResolvedBinding>, depProvider?: DependencyProvider): Injector;
   }
-
+  
+  class ProtoInjector {
+    
+     distanceToParent: number;
+    
+     getBindingAtIndex(index: number): any;
+  }
+  
 
   /**
-   * Describes how the <a href='/angular2/angular2/Injector'><code>Injector</code></a> should instantiate a given token.
-   *
-   * See <a href='/angular2/angular2/bind'><code>bind</code></a>.
-   *
+   * Describes how the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> should instantiate a given token.
+   * 
+   * See <a href='/angular2/angular2.api/bind'><code>bind</code></a>.
+   * 
    * ## Example
-   *
+   * 
    * ```javascript
    * var injector = Injector.resolveAndCreate([
    *   new Binding(String, { toValue: 'Hello' })
    * ]);
-   *
+   * 
    * expect(injector.get(String)).toEqual('Hello');
    * ```
-   *
+   * 
    * @exportedAs angular2/di
    */
   class Binding {
+    
 
     /**
      * Token used when retrieving this binding. Usually the `Type`.
      */
-    token: any;
+     token: void;
+    
 
     /**
      * Binds an interface to an implementation / subclass.
-     *
+     * 
      * ## Example
-     *
+     * 
      * Becuse `toAlias` and `toClass` are often confused, the example contains both use cases for easy
      * comparison.
-     *
+     * 
      * ```javascript
-     *
+     * 
      * class Vehicle {}
-     *
+     * 
      * class Car extends Vehicle {}
-     *
+     * 
      * var injectorClass = Injector.resolveAndCreate([
      *   Car,
      *   new Binding(Vehicle, { toClass: Car })
@@ -1600,48 +997,50 @@ declare module "angular2/angular2" {
      *   Car,
      *   new Binding(Vehicle, { toAlias: Car })
      * ]);
-     *
+     * 
      * expect(injectorClass.get(Vehicle)).not.toBe(injectorClass.get(Car));
      * expect(injectorClass.get(Vehicle) instanceof Car).toBe(true);
-     *
+     * 
      * expect(injectorAlias.get(Vehicle)).toBe(injectorAlias.get(Car));
      * expect(injectorAlias.get(Vehicle) instanceof Car).toBe(true);
      * ```
      */
-    toClass: Type;
+     toClass: Type;
+    
 
     /**
      * Binds a key to a value.
-     *
+     * 
      * ## Example
-     *
+     * 
      * ```javascript
      * var injector = Injector.resolveAndCreate([
      *   new Binding(String, { toValue: 'Hello' })
      * ]);
-     *
+     * 
      * expect(injector.get(String)).toEqual('Hello');
      * ```
      */
-    toValue: any;
+     toValue: void;
+    
 
     /**
      * Binds a key to the alias for an existing key.
-     *
-     * An alias means that <a href='/angular2/angular2/Injector'><code>Injector</code></a> returns the same instance as if the alias token was used.
+     * 
+     * An alias means that <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> returns the same instance as if the alias token was used.
      * This is in contrast to `toClass` where a separate instance of `toClass` is returned.
-     *
+     * 
      * ## Example
-     *
+     * 
      * Becuse `toAlias` and `toClass` are often confused the example contains both use cases for easy
      * comparison.
-     *
+     * 
      * ```javascript
-     *
+     * 
      * class Vehicle {}
-     *
+     * 
      * class Car extends Vehicle {}
-     *
+     * 
      * var injectorAlias = Injector.resolveAndCreate([
      *   Car,
      *   new Binding(Vehicle, { toAlias: Car })
@@ -1650,156 +1049,141 @@ declare module "angular2/angular2" {
      *   Car,
      *   new Binding(Vehicle, { toClass: Car })
      * ]);
-     *
+     * 
      * expect(injectorAlias.get(Vehicle)).toBe(injectorAlias.get(Car));
      * expect(injectorAlias.get(Vehicle) instanceof Car).toBe(true);
-     *
+     * 
      * expect(injectorClass.get(Vehicle)).not.toBe(injectorClass.get(Car));
      * expect(injectorClass.get(Vehicle) instanceof Car).toBe(true);
      * ```
      */
-    toAlias: any;
+     toAlias: void;
+    
 
     /**
      * Binds a key to a function which computes the value.
-     *
+     * 
      * ## Example
-     *
+     * 
      * ```javascript
      * var injector = Injector.resolveAndCreate([
      *   new Binding(Number, { toFactory: () => { return 1+2; }}),
      *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
      *                         dependencies: [Number] })
      * ]);
-     *
+     * 
      * expect(injector.get(Number)).toEqual(3);
      * expect(injector.get(String)).toEqual('Value: 3');
      * ```
      */
-    toFactory: Function;
+     toFactory: Function;
+    
 
     /**
-     * Binds a key to a function which computes the value asynchronously.
-     *
-     * ## Example
-     *
-     * ```javascript
-     * var injector = Injector.resolveAndCreate([
-     *   new Binding(Number, { toAsyncFactory: () => {
-     *     return new Promise((resolve) => resolve(1 + 2));
-     *   }}),
-     *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
-     *                         dependencies: [Number]})
-     * ]);
-     *
-     * injector.asyncGet(Number).then((v) => expect(v).toBe(3));
-     * injector.asyncGet(String).then((v) => expect(v).toBe('Value: 3'));
-     * ```
-     *
-     * The interesting thing to note is that event though `Number` has an async factory, the `String`
-     * factory function takes the resolved value. This shows that the <a href='/angular2/angular2/Injector'><code>Injector</code></a> delays
-     * executing the
-     * `String` factory
-     * until after the `Number` is resolved. This can only be done if the `token` is retrieved using
-     * the `asyncGet` API in the <a href='/angular2/angular2/Injector'><code>Injector</code></a>.
-     */
-    toAsyncFactory: Function;
-
-    /**
-     * Used in conjunction with `toFactory` or `toAsyncFactory` and specifies a set of dependencies
+     * Used in conjunction with `toFactory` and specifies a set of dependencies
      * (as `token`s) which should be injected into the factory function.
-     *
+     * 
      * ## Example
-     *
+     * 
      * ```javascript
      * var injector = Injector.resolveAndCreate([
      *   new Binding(Number, { toFactory: () => { return 1+2; }}),
      *   new Binding(String, { toFactory: (value) => { return "Value: " + value; },
      *                         dependencies: [Number] })
      * ]);
-     *
+     * 
      * expect(injector.get(Number)).toEqual(3);
      * expect(injector.get(String)).toEqual('Value: 3');
      * ```
      */
-    dependencies: List<any>;
+     dependencies: List<any>;
+    
 
     /**
-     * Converts the <a href='/angular2/angular2/Binding'><code>Binding</code></a> into <a href='/angular2/angular2/ResolvedBinding'><code>ResolvedBinding</code></a>.
-     *
-     * <a href='/angular2/angular2/Injector'><code>Injector</code></a> internally only uses <a href='/angular2/angular2/ResolvedBinding'><code>ResolvedBinding</code></a>, <a href='/angular2/angular2/Binding'><code>Binding</code></a> contains
+     * Converts the <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> into <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>.
+     * 
+     * <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> internally only uses <a href='/angular2/angular2.api/ResolvedBinding'><code>ResolvedBinding</code></a>, <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> contains
      * convenience binding syntax.
      */
-    resolve(): ResolvedBinding;
+     resolve(): ResolvedBinding;
   }
-
+  
 
   /**
-   * Provides an API for imperatively constructing <a href='/angular2/angular2/Binding'><code>Binding</code></a>s.
-   *
-   * This is only relevant for JavaScript. See <a href='/angular2/angular2/BindingBuilder'><code>BindingBuilder</code></a>.
-   *
+   * Provides an API for imperatively constructing <a href='/angular2/angular2.api/Binding'><code>Binding</code></a>s.
+   * 
+   * This is only relevant for JavaScript. See <a href='/angular2/angular2.api/BindingBuilder'><code>BindingBuilder</code></a>.
+   * 
    * ## Example
-   *
+   * 
    * ```javascript
    * bind(MyInterface).toClass(MyClass)
-   *
+   * 
    * ```
-   *
+   * 
    * @exportedAs angular2/di
    */
   function bind(token: any) : BindingBuilder ;
-
+  
 
   /**
-   * A unique object used for retrieving items from the <a href='/angular2/angular2/Injector'><code>Injector</code></a>.
-   *
+   * A unique object used for retrieving items from the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+   * 
    * Keys have:
    * - a system-wide unique `id`.
    * - a `token`, usually the `Type` of the instance.
-   *
-   * Keys are used internally by the <a href='/angular2/angular2/Injector'><code>Injector</code></a> because their system-wide unique `id`s allow the
+   * 
+   * Keys are used internally by the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> because their system-wide unique `id`s allow the
    * injector to index in arrays rather than looking up items in maps.
-   *
+   * 
    * @exportedAs angular2/di
    */
   class Key {
-    token: Object;
-    id: number;
-    displayName: string;
+    
+     token: Object;
+    
+     id: number;
+    
+     displayName: string;
   }
-
+  
 
   /**
-   * Thrown when trying to retrieve a dependency by `Key` from <a href='/angular2/angular2/Injector'><code>Injector</code></a>, but the
-   * <a href='/angular2/angular2/Injector'><code>Injector</code></a> does not have a <a href='/angular2/angular2/Binding'><code>Binding</code></a> for <a href='/angular2/angular2/Key'><code>Key</code></a>.
-   *
+   * Thrown when trying to retrieve a dependency by `Key` from <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>, but the
+   * <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> does not have a <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> for <a href='/angular2/angular2.api/Key'><code>Key</code></a>.
+   * 
    * @exportedAs angular2/di_errors
    */
-  class NoBindingError extends  AbstractBindingError {
+  class NoBindingError extends AbstractBindingError {
   }
-
+  
 
   /**
    * Base class for all errors arising from misconfigured bindings.
-   *
+   * 
    * @exportedAs angular2/di_errors
    */
-  class AbstractBindingError extends  BaseException {
-    name: string;
-    message: string;
-    keys: List<any>;
-    constructResolvingMessage: Function;
-    addKey(key: any): void;
-    toString(): string;
+  class AbstractBindingError extends BaseException {
+    
+     name: string;
+    
+     message: string;
+    
+     keys: List<any>;
+    
+     constructResolvingMessage: Function;
+    
+     addKey(key: any): void;
+    
+     toString(): string;
   }
-
+  
 
   /**
-   * Thrown when trying to retrieve an async <a href='/angular2/angular2/Binding'><code>Binding</code></a> using the sync API.
-   *
+   * Thrown when trying to retrieve an async <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> using the sync API.
+   * 
    * ## Example
-   *
+   * 
    * ```javascript
    * var injector = Injector.resolveAndCreate([
    *   bind(Number).toAsyncFactory(() => {
@@ -1807,27 +1191,27 @@ declare module "angular2/angular2" {
    *   }),
    *   bind(String).toFactory((v) => { return "Value: " + v; }, [String])
    * ]);
-   *
+   * 
    * injector.asyncGet(String).then((v) => expect(v).toBe('Value: 3'));
    * expect(() => {
    *   injector.get(String);
    * }).toThrowError(AsycBindingError);
    * ```
-   *
+   * 
    * The above example throws because `String` depends on `Number` which is async. If any binding in
    * the dependency graph is async then the graph can only be retrieved using the `asyncGet` API.
-   *
+   * 
    * @exportedAs angular2/di_errors
    */
-  class AsyncBindingError extends  AbstractBindingError {
+  class AsyncBindingError extends AbstractBindingError {
   }
-
+  
 
   /**
    * Thrown when dependencies form a cycle.
-   *
+   * 
    * ## Example:
-   *
+   * 
    * ```javascript
    * class A {
    *   constructor(b:B) {}
@@ -1836,119 +1220,125 @@ declare module "angular2/angular2" {
    *   constructor(a:A) {}
    * }
    * ```
-   *
+   * 
    * Retrieving `A` or `B` throws a `CyclicDependencyError` as the graph above cannot be constructed.
-   *
+   * 
    * @exportedAs angular2/di_errors
    */
-  class CyclicDependencyError extends  AbstractBindingError {
+  class CyclicDependencyError extends AbstractBindingError {
   }
-
+  
 
   /**
    * Thrown when a constructing type returns with an Error.
-   *
+   * 
    * The `InstantiationError` class contains the original error plus the dependency graph which caused
    * this object to be instantiated.
-   *
+   * 
    * @exportedAs angular2/di_errors
    */
-  class InstantiationError extends  AbstractBindingError {
-    cause: any;
-    causeKey: any;
+  class InstantiationError extends AbstractBindingError {
+    
+     causeKey: void;
   }
-
+  
 
   /**
-   * Thrown when an object other then <a href='/angular2/angular2/Binding'><code>Binding</code></a> (or `Type`) is passed to <a href='/angular2/angular2/Injector'><code>Injector</code></a>
+   * Thrown when an object other then <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> (or `Type`) is passed to <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>
    * creation.
-   *
+   * 
    * @exportedAs angular2/di_errors
    */
-  class InvalidBindingError extends  BaseException {
-    message: string;
-    toString(): string;
+  class InvalidBindingError extends BaseException {
+    
+     message: string;
+    
+     toString(): string;
   }
-
+  
 
   /**
    * Thrown when the class has no annotation information.
-   *
-   * Lack of annotation information prevents the <a href='/angular2/angular2/Injector'><code>Injector</code></a> from determining which dependencies
+   * 
+   * Lack of annotation information prevents the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> from determining which dependencies
    * need to be injected into the constructor.
-   *
+   * 
    * @exportedAs angular2/di_errors
    */
-  class NoAnnotationError extends  BaseException {
-    name: string;
-    message: string;
-    toString(): string;
+  class NoAnnotationError extends BaseException {
+    
+     name: string;
+    
+     message: string;
+    
+     toString(): string;
   }
-
+  
 
   /**
    * @exportedAs angular2/di
    */
   class OpaqueToken {
-    toString(): string;
+    
+     toString(): string;
   }
-
+  
 
   /**
-   * An internal resolved representation of a <a href='/angular2/angular2/Binding'><code>Binding</code></a> used by the <a href='/angular2/angular2/Injector'><code>Injector</code></a>.
-   *
-   * A <a href='/angular2/angular2/Binding'><code>Binding</code></a> is resolved when it has a factory function. Binding to a class, alias, or
-   * value, are just convenience methods, as <a href='/angular2/angular2/Injector'><code>Injector</code></a> only operates on calling factory
+   * An internal resolved representation of a <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> used by the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+   * 
+   * A <a href='/angular2/angular2.api/Binding'><code>Binding</code></a> is resolved when it has a factory function. Binding to a class, alias, or
+   * value, are just convenience methods, as <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> only operates on calling factory
    * functions.
-   *
+   * 
    * @exportedAs angular2/di
    */
   class ResolvedBinding {
+    
 
     /**
      * A key, usually a `Type`.
      */
-    key: Key;
+     key: Key;
+    
 
     /**
      * Factory function which can return an instance of an object represented by a key.
      */
-    factory: Function;
+     factory: Function;
+    
 
     /**
      * Arguments (dependencies) to the `factory` function.
      */
-    dependencies: List<Dependency>;
-
-    /**
-     * Specifies whether the `factory` function returns a `Promise`.
-     */
-    providedAsPromise: boolean;
+     dependencies: List<Dependency>;
   }
-
+  
 
   /**
-   * Helper class for the <a href='/angular2/angular2/bind'><code>bind</code></a> function.
-   *
+   * Helper class for the <a href='/angular2/angular2.api/bind'><code>bind</code></a> function.
+   * 
    * @exportedAs angular2/di
    */
   class BindingBuilder {
-    token: any;
+    
+     token: void;
+    
 
     /**
      * Binds an interface to an implementation / subclass.
-     *
+     * 
      * ## Example
-     *
+     * 
      * Because `toAlias` and `toClass` are often confused, the example contains both use cases for
      * easy comparison.
-     *
+     * 
      * ```javascript
-     *
+     * 
      * class Vehicle {}
-     *
+     * 
      * class Car extends Vehicle {}
-     *
+     * 
      * var injectorClass = Injector.resolveAndCreate([
      *   Car,
      *   bind(Vehicle).toClass(Car)
@@ -1957,48 +1347,50 @@ declare module "angular2/angular2" {
      *   Car,
      *   bind(Vehicle).toAlias(Car)
      * ]);
-     *
+     * 
      * expect(injectorClass.get(Vehicle)).not.toBe(injectorClass.get(Car));
      * expect(injectorClass.get(Vehicle) instanceof Car).toBe(true);
-     *
+     * 
      * expect(injectorAlias.get(Vehicle)).toBe(injectorAlias.get(Car));
      * expect(injectorAlias.get(Vehicle) instanceof Car).toBe(true);
      * ```
      */
-    toClass(type: Type): Binding;
+     toClass(type: Type): Binding;
+    
 
     /**
      * Binds a key to a value.
-     *
+     * 
      * ## Example
-     *
+     * 
      * ```javascript
      * var injector = Injector.resolveAndCreate([
      *   bind(String).toValue('Hello')
      * ]);
-     *
+     * 
      * expect(injector.get(String)).toEqual('Hello');
      * ```
      */
-    toValue(value: any): Binding;
+     toValue(value: any): Binding;
+    
 
     /**
      * Binds a key to the alias for an existing key.
-     *
+     * 
      * An alias means that we will return the same instance as if the alias token was used. (This is
      * in contrast to `toClass` where a separet instance of `toClass` will be returned.)
-     *
+     * 
      * ## Example
-     *
+     * 
      * Becuse `toAlias` and `toClass` are often confused, the example contains both use cases for easy
      * comparison.
-     *
+     * 
      * ```javascript
-     *
+     * 
      * class Vehicle {}
-     *
+     * 
      * class Car extends Vehicle {}
-     *
+     * 
      * var injectorAlias = Injector.resolveAndCreate([
      *   Car,
      *   bind(Vehicle).toAlias(Car)
@@ -2007,173 +1399,222 @@ declare module "angular2/angular2" {
      *   Car,
      *   bind(Vehicle).toClass(Car)
      * ]);
-     *
+     * 
      * expect(injectorAlias.get(Vehicle)).toBe(injectorAlias.get(Car));
      * expect(injectorAlias.get(Vehicle) instanceof Car).toBe(true);
-     *
+     * 
      * expect(injectorClass.get(Vehicle)).not.toBe(injectorClass.get(Car));
      * expect(injectorClass.get(Vehicle) instanceof Car).toBe(true);
      * ```
      */
-    toAlias(aliasToken: any): Binding;
+     toAlias(aliasToken: any): Binding;
+    
 
     /**
      * Binds a key to a function which computes the value.
-     *
+     * 
      * ## Example
-     *
+     * 
      * ```javascript
      * var injector = Injector.resolveAndCreate([
      *   bind(Number).toFactory(() => { return 1+2; }),
      *   bind(String).toFactory((v) => { return "Value: " + v; }, [Number])
      * ]);
-     *
+     * 
      * expect(injector.get(Number)).toEqual(3);
      * expect(injector.get(String)).toEqual('Value: 3');
      * ```
      */
-    toFactory(factoryFunction: Function, dependencies?: List<any>): Binding;
-
-    /**
-     * Binds a key to a function which computes the value asynchronously.
-     *
-     * ## Example
-     *
-     * ```javascript
-     * var injector = Injector.resolveAndCreate([
-     *   bind(Number).toAsyncFactory(() => {
-     *     return new Promise((resolve) => resolve(1 + 2));
-     *   }),
-     *   bind(String).toFactory((v) => { return "Value: " + v; }, [Number])
-     * ]);
-     *
-     * injector.asyncGet(Number).then((v) => expect(v).toBe(3));
-     * injector.asyncGet(String).then((v) => expect(v).toBe('Value: 3'));
-     * ```
-     *
-     * The interesting thing to note is that event though `Number` has an async factory, the `String`
-     * factory function takes the resolved value. This shows that the <a href='/angular2/angular2/Injector'><code>Injector</code></a> delays
-     * executing of the `String` factory
-     * until after the `Number` is resolved. This can only be done if the `token` is retrieved using
-     * the `asyncGet` API in the <a href='/angular2/angular2/Injector'><code>Injector</code></a>.
-     */
-    toAsyncFactory(factoryFunction: Function, dependencies?: List<any>): Binding;
+     toFactory(factoryFunction: Function, dependencies?: List<any>): Binding;
   }
-
+  
 
   /**
    * @private
    */
   class Dependency {
-    key: Key;
-    asPromise: boolean;
-    lazy: boolean;
-    optional: boolean;
-    properties: List<any>;
+    
+     key: Key;
+    
+     optional: boolean;
+    
+     visibility: Visibility;
+    
+     properties: List<any>;
   }
+  
+  var Self:any;
+  
+  var Parent:any;
+  
+  var Ancestor:any;
+  
+  var Unbounded:any;
+  
 
+  /**
+   * Used to provide dependencies that cannot be easily expressed as bindings.
+   */
+  interface DependencyProvider {
+    
+     getDependency(injector: Injector, binding: ResolvedBinding, dependency: Dependency): any;
+  }
+  
 
+  interface AbstractControl_markAsDirtyArgs {
+    onlySelf?: boolean;
+  }
+  
+  interface AbstractControl_updateValidityArgs {
+    onlySelf?: boolean;
+  }
+  
+  interface AbstractControl_updateValueAndValidityArgs {
+    onlySelf?: boolean;
+    emitEvent?: boolean;
+  }
+  
   /**
    * Omitting from external API doc as this is really an abstract internal concept.
    */
   class AbstractControl {
-    validator: Function;
-    value: any;
-    status: string;
-    valid: boolean;
-    errors: StringMap<string, any>;
-    pristine: boolean;
-    dirty: boolean;
-    touched: boolean;
-    untouched: boolean;
-    valueChanges: Observable;
-    markAsTouched(): void;
-    setParent(parent: any): any;
-    find(path: List<string | number>| string): AbstractControl;
-    getError(errorCode: string, path?: List<string>): any;
-    hasError(errorCode: string, path?: List<string>): any;
+    
+     validator: Function;
+    
+     value: any;
+    
+     status: string;
+    
+     valid: boolean;
+    
+     errors: StringMap<string, any>;
+    
+     pristine: boolean;
+    
+     dirty: boolean;
+    
+     touched: boolean;
+    
+     untouched: boolean;
+    
+     valueChanges: Observable;
+    
+     markAsTouched(): void;
+    
+     markAsDirty(args?: AbstractControl_markAsDirtyArgs): void;
+    
+     setParent(parent: any): void;
+    
+     updateValidity(args?: AbstractControl_updateValidityArgs): void;
+    
+     updateValueAndValidity(args?: AbstractControl_updateValueAndValidityArgs): void;
+    
+     find(path: List<string | number>| string): AbstractControl;
+    
+     getError(errorCode: string, path?: List<string>): any;
+    
+     hasError(errorCode: string, path?: List<string>): boolean;
   }
-
-
+  
+  interface Control_updateValueOptions {
+    onlySelf?: boolean;
+    emitEvent?: boolean;
+  }
+  
   /**
    * Defines a part of a form that cannot be divided into other controls.
-   *
+   * 
    * `Control` is one of the three fundamental building blocks used to define forms in Angular, along
    * with
-   * <a href='/angular2/angular2/ControlGroup'><code>ControlGroup</code></a> and <a href='/angular2/angular2/ControlArray'><code>ControlArray</code></a>.
-   *
+   * <a href='/angular2/angular2.api/ControlGroup'><code>ControlGroup</code></a> and <a href='/angular2/angular2.api/ControlArray'><code>ControlArray</code></a>.
+   * 
    * @exportedAs angular2/forms
    */
-  class Control extends  AbstractControl {
-    registerOnChange(fn: Function): void;
+  class Control extends AbstractControl {
+    
+     updateValue(value: any, options?: Control_updateValueOptions): void;
+    
+     registerOnChange(fn: Function): void;
   }
-
+  
 
   /**
    * Defines a part of a form, of fixed length, that can contain other controls.
-   *
-   * A ControlGroup aggregates the values and errors of each <a href='/angular2/angular2/Control'><code>Control</code></a> in the group. Thus, if
+   * 
+   * A ControlGroup aggregates the values and errors of each <a href='/angular2/angular2.api/Control'><code>Control</code></a> in the group. Thus, if
    * one of the controls
    * in a group is invalid, the entire group is invalid. Similarly, if a control changes its value,
    * the entire group
    * changes as well.
-   *
+   * 
    * `ControlGroup` is one of the three fundamental building blocks used to define forms in Angular,
    * along with
-   * <a href='/angular2/angular2/Control'><code>Control</code></a> and <a href='/angular2/angular2/ControlArray'><code>ControlArray</code></a>. <a href='/angular2/angular2/ControlArray'><code>ControlArray</code></a> can also contain other controls,
+   * <a href='/angular2/angular2.api/Control'><code>Control</code></a> and <a href='/angular2/angular2.api/ControlArray'><code>ControlArray</code></a>. <a href='/angular2/angular2.api/ControlArray'><code>ControlArray</code></a> can also contain other controls,
    * but is of variable
    * length.
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class ControlGroup extends  AbstractControl {
-    controls: StringMap<string, AbstractControl>;
-    addControl(name: string, c: AbstractControl): any;
-    removeControl(name: string): any;
-    include(controlName: string): void;
-    exclude(controlName: string): void;
-    contains(controlName: string): boolean;
+  class ControlGroup extends AbstractControl {
+    
+     controls: StringMap<string, AbstractControl>;
+    
+     addControl(name: string, c: AbstractControl): void;
+    
+     removeControl(name: string): void;
+    
+     include(controlName: string): void;
+    
+     exclude(controlName: string): void;
+    
+     contains(controlName: string): boolean;
   }
-
+  
 
   /**
    * Defines a part of a form, of variable length, that can contain other controls.
-   *
-   * A `ControlArray` aggregates the values and errors of each <a href='/angular2/angular2/Control'><code>Control</code></a> in the group. Thus, if
+   * 
+   * A `ControlArray` aggregates the values and errors of each <a href='/angular2/angular2.api/Control'><code>Control</code></a> in the group. Thus, if
    * one of the controls
    * in a group is invalid, the entire group is invalid. Similarly, if a control changes its value,
    * the entire group
    * changes as well.
-   *
+   * 
    * `ControlArray` is one of the three fundamental building blocks used to define forms in Angular,
    * along with
-   * <a href='/angular2/angular2/Control'><code>Control</code></a> and <a href='/angular2/angular2/ControlGroup'><code>ControlGroup</code></a>. <a href='/angular2/angular2/ControlGroup'><code>ControlGroup</code></a> can also contain other controls,
+   * <a href='/angular2/angular2.api/Control'><code>Control</code></a> and <a href='/angular2/angular2.api/ControlGroup'><code>ControlGroup</code></a>. <a href='/angular2/angular2.api/ControlGroup'><code>ControlGroup</code></a> can also contain other controls,
    * but is of fixed
    * length.
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class ControlArray extends  AbstractControl {
-    controls: List<AbstractControl>;
-    at(index: number): AbstractControl;
-    push(control: AbstractControl): void;
-    insert(index: number, control: AbstractControl): void;
-    removeAt(index: number): void;
-    length: number;
+  class ControlArray extends AbstractControl {
+    
+     controls: List<AbstractControl>;
+    
+     at(index: number): AbstractControl;
+    
+     push(control: AbstractControl): void;
+    
+     insert(index: number, control: AbstractControl): void;
+    
+     removeAt(index: number): void;
+    
+     length: number;
   }
-
+  
 
   /**
    * Creates and binds a control with a specified name to a DOM element.
-   *
-   * This directive can only be used as a child of <a href='/angular2/angular2/NgForm'><code>NgForm</code></a> or <a href='/angular2/angular2/NgFormModel'><code>NgFormModel</code></a>.
-   *
+   * 
+   * This directive can only be used as a child of <a href='/angular2/angular2.api/NgForm'><code>NgForm</code></a> or <a href='/angular2/angular2.api/NgFormModel'><code>NgFormModel</code></a>.
+   * 
    * # Example
-   *
+   * 
    * In this example, we create the login and password controls.
    * We can work with each control separately: check its validity, get its value, listen to its
    *  changes.
-   *
+   * 
    *  ```
    * @Component({selector: "login-comp"})
    * @View({
@@ -2182,9 +1623,9 @@ declare module "angular2/angular2" {
    *              <form #f="form" (submit)='onLogIn(f.value)'>
    *                Login <input type='text' ng-control='login' #l="form">
    *                <div *ng-if="!l.valid">Login is invalid</div>
-   *
+   * 
    *                Password <input type='password' ng-control='password'>
-   *
+   * 
    *                <button type='submit'>Log in!</button>
    *              </form>
    *      `})
@@ -2194,9 +1635,9 @@ declare module "angular2/angular2" {
    *  }
    * }
    *  ```
-   *
+   * 
    * We can also use ng-model to bind a domain model to the form.
-   *
+   * 
    *  ```
    * @Component({selector: "login-comp"})
    * @View({
@@ -2211,41 +1652,51 @@ declare module "angular2/angular2" {
    *      `})
    * class LoginComp {
    *  credentials: {login:string, password:string};
-   *
+   * 
    *  onLogIn() {
    *    // this.credentials.login === "some login"
    *    // this.credentials.password === "some password"
    *  }
    * }
    *  ```
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class NgControlName extends  NgControl {
-    update: any;
-    model: any;
-    ngValidators: QueryList<NgValidator>;
-    onChange(c: StringMap<string, any>): any;
-    onDestroy(): any;
-    viewToModelUpdate(newValue: any): void;
-    path: List<string>;
-    formDirective: any;
-    control: Control;
-    validator: Function;
+  class NgControlName extends NgControl {
+    
+     update: void;
+    
+     model: any;
+    
+     ngValidators: QueryList<NgValidator>;
+    
+     onChange(c: StringMap<string, any>): void;
+    
+     onDestroy(): void;
+    
+     viewToModelUpdate(newValue: any): void;
+    
+     path: List<string>;
+    
+     formDirective: any;
+    
+     control: Control;
+    
+     validator: Function;
   }
-
+  
 
   /**
    * Binds an existing control to a DOM element.
-   *
+   * 
    * # Example
-   *
+   * 
    * In this example, we bind the control to an input element. When the value of the input element
    * changes, the value of
    * the control will reflect that change. Likewise, if the value of the control changes, the input
    * element reflects that
    * change.
-   *
+   * 
    *  ```
    * @Component({selector: "login-comp"})
    * @View({
@@ -2254,16 +1705,16 @@ declare module "angular2/angular2" {
    *      })
    * class LoginComp {
    *  loginControl:Control;
-   *
+   * 
    *  constructor() {
    *    this.loginControl = new Control('');
    *  }
    * }
-   *
+   * 
    *  ```
-   *
+   * 
    * We can also use ng-model to bind a domain model to the form.
-   *
+   * 
    *  ```
    * @Component({selector: "login-comp"})
    * @View({
@@ -2273,31 +1724,40 @@ declare module "angular2/angular2" {
    * class LoginComp {
    *  loginControl:Control;
    *  login:string;
-   *
+   * 
    *  constructor() {
    *    this.loginControl = new Control('');
    *  }
    * }
    *  ```
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class NgFormControl extends  NgControl {
-    form: Control;
-    update: any;
-    model: any;
-    ngValidators: QueryList<NgValidator>;
-    onChange(c: any): any;
-    path: List<string>;
-    control: Control;
-    validator: Function;
-    viewToModelUpdate(newValue: any): void;
+  class NgFormControl extends NgControl {
+    
+     form: Control;
+    
+     update: void;
+    
+     model: any;
+    
+     ngValidators: QueryList<NgValidator>;
+    
+     onChange(c: any): void;
+    
+     path: List<string>;
+    
+     control: Control;
+    
+     validator: Function;
+    
+     viewToModelUpdate(newValue: any): void;
   }
-
+  
 
   /**
    * Binds a domain model to the form.
-   *
+   * 
    * # Example
    *  ```
    * @Component({selector: "search-comp"})
@@ -2310,48 +1770,62 @@ declare module "angular2/angular2" {
    *  searchQuery: string;
    * }
    *  ```
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class NgModel extends  NgControl {
-    update: any;
-    model: any;
-    ngValidators: QueryList<NgValidator>;
-    onChange(c: any): any;
-    control: any;
-    path: List<string>;
-    validator: Function;
-    viewToModelUpdate(newValue: any): void;
+  class NgModel extends NgControl {
+    
+     update: void;
+    
+     model: any;
+    
+     ngValidators: QueryList<NgValidator>;
+    
+     onChange(c: any): void;
+    
+     control: Control;
+    
+     path: List<string>;
+    
+     validator: Function;
+    
+     viewToModelUpdate(newValue: any): void;
   }
-
+  
 
   /**
    * An abstract class that all control directive extend.
-   *
-   * It binds a <a href='/angular2/angular2/Control'><code>Control</code></a> object to a DOM element.
-   *
+   * 
+   * It binds a <a href='/angular2/angular2.api/Control'><code>Control</code></a> object to a DOM element.
+   * 
    * @exportedAs angular2/forms
    */
   class NgControl {
-    name: string;
-    valueAccessor: ControlValueAccessor;
-    validator: Function;
-    path: List<string>;
-    control: Control;
-    viewToModelUpdate(newValue: any): void;
+    
+     name: string;
+    
+     valueAccessor: ControlValueAccessor;
+    
+     validator: Function;
+    
+     path: List<string>;
+    
+     control: Control;
+    
+     viewToModelUpdate(newValue: any): void;
   }
-
+  
 
   /**
    * Creates and binds a control group to a DOM element.
-   *
-   * This directive can only be used as a child of <a href='/angular2/angular2/NgForm'><code>NgForm</code></a> or <a href='/angular2/angular2/NgFormModel'><code>NgFormModel</code></a>.
-   *
+   * 
+   * This directive can only be used as a child of <a href='/angular2/angular2.api/NgForm'><code>NgForm</code></a> or <a href='/angular2/angular2.api/NgFormModel'><code>NgFormModel</code></a>.
+   * 
    * # Example
-   *
+   * 
    * In this example, we create the credentials and personal control groups.
    * We can work with each group separately: check its validity, get its value, listen to its changes.
-   *
+   * 
    *  ```
    * @Component({selector: "signup-comp"})
    * @View({
@@ -2363,7 +1837,7 @@ declare module "angular2/angular2" {
    *                  Password <input type='password' ng-control='password'>
    *                </div>
    *                <div *ng-if="!credentials.valid">Credentials are invalid</div>
-   *
+   * 
    *                <div ng-control-group='personal'>
    *                  Name <input type='text' ng-control='name'>
    *                </div>
@@ -2376,28 +1850,32 @@ declare module "angular2/angular2" {
    *    //  credentials: {login: 'some login', password: 'some password'}}
    *  }
    * }
-   *
+   * 
    *  ```
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class NgControlGroup extends  ControlContainer {
-    onInit(): any;
-    onDestroy(): any;
-    path: List<string>;
-    formDirective: any;
+  class NgControlGroup extends ControlContainer {
+    
+     onInit(): void;
+    
+     onDestroy(): void;
+    
+     path: List<string>;
+    
+     formDirective: any;
   }
-
+  
 
   /**
    * Binds an existing control group to a DOM element.
-   *
+   * 
    * # Example
-   *
+   * 
    * In this example, we bind the control group to the form element, and we bind the login and
    * password controls to the
    * login and password elements.
-   *
+   * 
    *  ```
    * @Component({selector: "login-comp"})
    * @View({
@@ -2410,23 +1888,23 @@ declare module "angular2/angular2" {
    *      })
    * class LoginComp {
    *  loginForm:ControlGroup;
-   *
+   * 
    *  constructor() {
    *    this.loginForm = new ControlGroup({
    *      login: new Control(""),
    *      password: new Control("")
    *    });
    *  }
-   *
+   * 
    *  onLogin() {
    *    // this.loginForm.value
    *  }
    * }
-   *
+   * 
    *  ```
-   *
+   * 
    * We can also use ng-model to bind a domain model to the form.
-   *
+   * 
    *  ```
    * @Component({selector: "login-comp"})
    * @View({
@@ -2440,45 +1918,58 @@ declare module "angular2/angular2" {
    * class LoginComp {
    *  credentials:{login:string, password:string}
    *  loginForm:ControlGroup;
-   *
+   * 
    *  constructor() {
    *    this.loginForm = new ControlGroup({
    *      login: new Control(""),
    *      password: new Control("")
    *    });
    *  }
-   *
+   * 
    *  onLogin() {
    *    // this.credentials.login === 'some login'
    *    // this.credentials.password === 'some password'
    *  }
    * }
    *  ```
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class NgFormModel extends  ControlContainer implements  Form {
-    form: ControlGroup;
-    directives: List<NgControl>;
-    ngSubmit: any;
-    onChange(_: any): any;
-    formDirective: Form;
-    path: List<string>;
-    addControl(dir: NgControl): void;
-    getControl(dir: NgControl): Control;
-    removeControl(dir: NgControl): void;
-    addControlGroup(dir: NgControlGroup): any;
-    removeControlGroup(dir: NgControlGroup): any;
-    updateModel(dir: NgControl, value: any): void;
-    onSubmit(): any;
+  class NgFormModel extends ControlContainer implements Form {
+    
+     form: ControlGroup;
+    
+     directives: List<NgControl>;
+    
+     ngSubmit: void;
+    
+     onChange(_: any): void;
+    
+     formDirective: Form;
+    
+     path: List<string>;
+    
+     addControl(dir: NgControl): void;
+    
+     getControl(dir: NgControl): Control;
+    
+     removeControl(dir: NgControl): void;
+    
+     addControlGroup(dir: NgControlGroup): void;
+    
+     removeControlGroup(dir: NgControlGroup): void;
+    
+     updateModel(dir: NgControl, value: any): void;
+    
+     onSubmit(): boolean;
   }
-
+  
 
   /**
    * Creates and binds a form object to a DOM element.
-   *
+   * 
    * # Example
-   *
+   * 
    *  ```
    * @Component({selector: "signup-comp"})
    * @View({
@@ -2490,7 +1981,7 @@ declare module "angular2/angular2" {
    *                  Password <input type='password' ng-control='password'>
    *                </div>
    *                <div *ng-if="!credentials.valid">Credentials are invalid</div>
-   *
+   * 
    *                <div ng-control-group='personal'>
    *                  Name <input type='text' ng-control='name'>
    *                </div>
@@ -2503,169 +1994,233 @@ declare module "angular2/angular2" {
    *    //  credentials: {login: 'some login', password: 'some password'}}
    *  }
    * }
-   *
+   * 
    *  ```
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class NgForm extends  ControlContainer implements  Form {
-    form: ControlGroup;
-    ngSubmit: any;
-    formDirective: Form;
-    path: List<string>;
-    controls: StringMap<string, AbstractControl>;
-    value: any;
-    errors: any;
-    addControl(dir: NgControl): void;
-    getControl(dir: NgControl): Control;
-    removeControl(dir: NgControl): void;
-    addControlGroup(dir: NgControlGroup): void;
-    removeControlGroup(dir: NgControlGroup): void;
-    updateModel(dir: NgControl, value: any): void;
-    onSubmit(): any;
+  class NgForm extends ControlContainer implements Form {
+    
+     form: ControlGroup;
+    
+     ngSubmit: void;
+    
+     formDirective: Form;
+    
+     path: List<string>;
+    
+     controls: StringMap<string, AbstractControl>;
+    
+     value: any;
+    
+     errors: any;
+    
+     addControl(dir: NgControl): void;
+    
+     getControl(dir: NgControl): Control;
+    
+     removeControl(dir: NgControl): void;
+    
+     addControlGroup(dir: NgControlGroup): void;
+    
+     removeControlGroup(dir: NgControlGroup): void;
+    
+     updateModel(dir: NgControl, value: any): void;
+    
+     onSubmit(): boolean;
   }
-
+  
 
   /**
    * A bridge between a control and a native element.
-   *
-   * Please see <a href='/angular2/angular2/DefaultValueAccessor'><code>DefaultValueAccessor</code></a> for more information.
+   * 
+   * Please see <a href='/angular2/angular2.api/DefaultValueAccessor'><code>DefaultValueAccessor</code></a> for more information.
    */
   interface ControlValueAccessor {
-    writeValue(obj: any): void;
-    registerOnChange(fn: any): void;
-    registerOnTouched(fn: any): void;
+    
+     writeValue(obj: any): void;
+    
+     registerOnChange(fn: any): void;
+    
+     registerOnTouched(fn: any): void;
   }
-
+  
 
   /**
    * The default accessor for writing a value and listening to changes that is used by the
-   * <a href='/angular2/angular2/NgModel'><code>NgModel</code></a>, <a href='/angular2/angular2/NgFormControl'><code>NgFormControl</code></a>, and <a href='/angular2/angular2/NgControlName'><code>NgControlName</code></a> directives.
-   *
+   * <a href='/angular2/angular2.api/NgModel'><code>NgModel</code></a>, <a href='/angular2/angular2.api/NgFormControl'><code>NgFormControl</code></a>, and <a href='/angular2/angular2.api/NgControlName'><code>NgControlName</code></a> directives.
+   * 
    *  # Example
    *  ```
    *  <input type="text" [(ng-model)]="searchQuery">
    *  ```
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class DefaultValueAccessor implements  ControlValueAccessor {
-    value: string;
-    onChange: any;
-    onTouched: any;
-    cd: NgControl;
-    renderer: Renderer;
-    elementRef: ElementRef;
-    writeValue(value: any): any;
-    ngClassUntouched: boolean;
-    ngClassTouched: boolean;
-    ngClassPristine: boolean;
-    ngClassDirty: boolean;
-    ngClassValid: boolean;
-    ngClassInvalid: boolean;
-    registerOnChange(fn: any): void;
-    registerOnTouched(fn: any): void;
+  class DefaultValueAccessor implements ControlValueAccessor {
+    
+     value: string;
+    
+     onChange: void;
+    
+     onTouched: void;
+    
+     cd: NgControl;
+    
+     renderer: Renderer;
+    
+     elementRef: ElementRef;
+    
+     writeValue(value: any): void;
+    
+     ngClassUntouched: boolean;
+    
+     ngClassTouched: boolean;
+    
+     ngClassPristine: boolean;
+    
+     ngClassDirty: boolean;
+    
+     ngClassValid: boolean;
+    
+     ngClassInvalid: boolean;
+    
+     registerOnChange(fn: any): void;
+    
+     registerOnTouched(fn: any): void;
   }
-
+  
 
   /**
    * The accessor for writing a value and listening to changes on a checkbox input element.
-   *
+   * 
    *  # Example
    *  ```
    *  <input type="checkbox" [ng-control]="rememberLogin">
    *  ```
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class CheckboxControlValueAccessor implements  ControlValueAccessor {
-    checked: boolean;
-    onChange: any;
-    onTouched: any;
-    cd: NgControl;
-    renderer: Renderer;
-    elementRef: ElementRef;
-    writeValue(value: any): any;
-    ngClassUntouched: boolean;
-    ngClassTouched: boolean;
-    ngClassPristine: boolean;
-    ngClassDirty: boolean;
-    ngClassValid: boolean;
-    ngClassInvalid: boolean;
-    registerOnChange(fn: any): void;
-    registerOnTouched(fn: any): void;
+  class CheckboxControlValueAccessor implements ControlValueAccessor {
+    
+     checked: boolean;
+    
+     onChange: void;
+    
+     onTouched: void;
+    
+     cd: NgControl;
+    
+     renderer: Renderer;
+    
+     elementRef: ElementRef;
+    
+     writeValue(value: any): void;
+    
+     ngClassUntouched: boolean;
+    
+     ngClassTouched: boolean;
+    
+     ngClassPristine: boolean;
+    
+     ngClassDirty: boolean;
+    
+     ngClassValid: boolean;
+    
+     ngClassInvalid: boolean;
+    
+     registerOnChange(fn: any): void;
+    
+     registerOnTouched(fn: any): void;
   }
-
+  
 
   /**
    * The accessor for writing a value and listening to changes on a select element.
-   *
+   * 
    * @exportedAs angular2/forms
    */
-  class SelectControlValueAccessor implements  ControlValueAccessor {
-    value: any;
-    onChange: any;
-    onTouched: any;
-    cd: NgControl;
-    renderer: Renderer;
-    elementRef: ElementRef;
-    writeValue(value: any): any;
-    ngClassUntouched: boolean;
-    ngClassTouched: boolean;
-    ngClassPristine: boolean;
-    ngClassDirty: boolean;
-    ngClassValid: boolean;
-    ngClassInvalid: boolean;
-    registerOnChange(fn: any): void;
-    registerOnTouched(fn: any): void;
+  class SelectControlValueAccessor implements ControlValueAccessor {
+    
+     value: void;
+    
+     onChange: void;
+    
+     onTouched: void;
+    
+     cd: NgControl;
+    
+     renderer: Renderer;
+    
+     elementRef: ElementRef;
+    
+     writeValue(value: any): void;
+    
+     ngClassUntouched: boolean;
+    
+     ngClassTouched: boolean;
+    
+     ngClassPristine: boolean;
+    
+     ngClassDirty: boolean;
+    
+     ngClassValid: boolean;
+    
+     ngClassInvalid: boolean;
+    
+     registerOnChange(fn: any): void;
+    
+     registerOnTouched(fn: any): void;
   }
-
+  
 
   /**
    * A list of all the form directives used as part of a `@View` annotation.
-   *
+   * 
    *  This is a shorthand for importing them each individually.
-   *
+   * 
    * @exportedAs angular2/forms
    */
   var formDirectives : List<Type> ;
-
+  
 
   /**
    * Provides a set of validators used by form controls.
-   *
+   * 
    * # Example
-   *
+   * 
    * ```
    * var loginControl = new Control("", Validators.required)
    * ```
-   *
+   * 
    * @exportedAs angular2/forms
    */
   class Validators {
   }
-
+  
   class NgValidator {
-    validator: Function;
+    
+     validator: Function;
   }
-
-  class NgRequiredValidator extends  NgValidator {
-    validator: Function;
+  
+  class NgRequiredValidator extends NgValidator {
+    
+     validator: Function;
   }
-
+  
 
   /**
    * Creates a form object from a user-specified configuration.
-   *
+   * 
    * # Example
-   *
+   * 
    * ```
    * import {Component, View, bootstrap} from 'angular2/angular2';
    * import {FormBuilder, Validators, formDirectives, ControlGroup} from 'angular2/forms';
-   *
+   * 
    * @Component({
    *   selector: 'login-comp',
-   *   appInjector: [
+   *   viewInjector: [
    *     FormBuilder
    *   ]
    * })
@@ -2673,7 +2228,7 @@ declare module "angular2/angular2" {
    *   template: `
    *     <form [control-group]="loginForm">
    *       Login <input control="login">
-   *
+   * 
    *       <div control-group="passwordRetry">
    *         Password <input type="password" control="password">
    *         Confirm password <input type="password" control="passwordConfirmation">
@@ -2686,11 +2241,11 @@ declare module "angular2/angular2" {
    * })
    * class LoginComp {
    *   loginForm: ControlGroup;
-   *
+   * 
    *   constructor(builder: FormBuilder) {
    *     this.loginForm = builder.group({
    *       login: ["", Validators.required],
-   *
+   * 
    *       passwordRetry: builder.group({
    *         password: ["", Validators.required],
    *         passwordConfirmation: ["", Validators.required]
@@ -2698,880 +2253,101 @@ declare module "angular2/angular2" {
    *     });
    *   }
    * }
-   *
+   * 
    * bootstrap(LoginComp)
    * ```
-   *
-   * This example creates a <a href='/angular2/angular2/ControlGroup'><code>ControlGroup</code></a> that consists of a `login` <a href='/angular2/angular2/Control'><code>Control</code></a>, and a
+   * 
+   * This example creates a <a href='/angular2/angular2.api/ControlGroup'><code>ControlGroup</code></a> that consists of a `login` <a href='/angular2/angular2.api/Control'><code>Control</code></a>, and a
    * nested
-   * <a href='/angular2/angular2/ControlGroup'><code>ControlGroup</code></a> that defines a `password` and a `passwordConfirmation` <a href='/angular2/angular2/Control'><code>Control</code></a>:
-   *
+   * <a href='/angular2/angular2.api/ControlGroup'><code>ControlGroup</code></a> that defines a `password` and a `passwordConfirmation` <a href='/angular2/angular2.api/Control'><code>Control</code></a>:
+   * 
    * ```
    *  var loginForm = builder.group({
    *    login: ["", Validators.required],
-   *
+   * 
    *    passwordRetry: builder.group({
    *      password: ["", Validators.required],
    *      passwordConfirmation: ["", Validators.required]
    *    })
    *  });
-   *
+   * 
    *  ```
    * @exportedAs angular2/forms
    */
   class FormBuilder {
-    group(controlsConfig: StringMap<string, any>, extra?: StringMap<string, any>): ControlGroup;
-    control(value: Object, validator?: Function): Control;
-    array(controlsConfig: List<any>, validator?: Function): ControlArray;
+    
+     group(controlsConfig: StringMap<string, any>, extra?: StringMap<string, any>): ControlGroup;
+    
+     control(value: Object, validator?: Function): Control;
+    
+     array(controlsConfig: List<any>, validator?: Function): ControlArray;
   }
-
+  
   var formInjectables : List<Type> ;
-
-  class Observable {
-    observer(generator: any): Object;
+  
+  class DomRenderer extends Renderer {
+    
+     createRootHostView(hostProtoViewRef: RenderProtoViewRef, hostElementSelector: string): RenderViewRef;
+    
+     createView(protoViewRef: RenderProtoViewRef): RenderViewRef;
+    
+     destroyView(view: RenderViewRef): void;
+    
+     getNativeElementSync(location: RenderElementRef): any;
+    
+     attachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): void;
+    
+     setComponentViewRootNodes(componentViewRef: RenderViewRef, rootNodes: List</*node*/ any>): void;
+    
+     getRootNodes(viewRef: RenderViewRef): List</*node*/ any>;
+    
+     detachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): void;
+    
+     attachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): void;
+    
+     detachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): void;
+    
+     hydrateView(viewRef: RenderViewRef): void;
+    
+     dehydrateView(viewRef: RenderViewRef): void;
+    
+     setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
+    
+     setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
+    
+     setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
+    
+     setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
+    
+     invokeElementMethod(location: RenderElementRef, methodName: string, args: List<any>): void;
+    
+     setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+    
+     setEventDispatcher(viewRef: RenderViewRef, dispatcher: any): void;
   }
-
-
-  /**
-   * Use Rx.Observable but provides an adapter to make it work as specified here:
-   * https://github.com/jhusain/observable-spec
-   *
-   * Once a reference implementation of the spec is available, switch to it.
-   */
-  class EventEmitter extends  Observable {
-    observer(generator: any): any;
-    toRx(): Rx.Observable<any>;
-    next(value: any): any;
-    throw(error: any): any;
-    return(value?: any): any;
-  }
-
-  class DomRenderer extends  Renderer {
-    createRootHostView(hostProtoViewRef: RenderProtoViewRef, hostElementSelector: string): RenderViewRef;
-    createView(protoViewRef: RenderProtoViewRef): RenderViewRef;
-    destroyView(view: RenderViewRef): any;
-    getNativeElementSync(location: RenderElementRef): any;
-    attachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): any;
-    setComponentViewRootNodes(componentViewRef: RenderViewRef, rootNodes: List</*node*/ any>): any;
-    getRootNodes(viewRef: RenderViewRef): List</*node*/ any>;
-    detachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): any;
-    attachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): any;
-    detachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): any;
-    hydrateView(viewRef: RenderViewRef): any;
-    dehydrateView(viewRef: RenderViewRef): any;
-    setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
-    setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
-    setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
-    setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
-    invokeElementMethod(location: RenderElementRef, methodName: string, args: List<any>): void;
-    setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
-    setEventDispatcher(viewRef: RenderViewRef, dispatcher: any): void;
-  }
-
-  var DOCUMENT_TOKEN: any;
-
-
-  /**
-   * @exportedAs angular2/view
-   */
-  class ViewRef {
-    render: RenderViewRef;
-    setLocal(contextName: string, value: any): void;
-  }
-
-
-  /**
-   * @exportedAs angular2/view
-   */
-  class ProtoViewRef {
-  }
-
-
-  /**
-   * @exportedAs angular2/core
-   */
-  class ViewContainerRef {
-    viewManager: AppViewManager;
-    element: ElementRef;
-    clear(): void;
-    get(index: number): ViewRef;
-    length: number;
-    create(protoViewRef?: ProtoViewRef, atIndex?: number, context?: ElementRef, injector?: Injector): ViewRef;
-    insert(viewRef: ViewRef, atIndex?: number): ViewRef;
-    indexOf(viewRef: ViewRef): any;
-    remove(atIndex?: number): void;
-
-    /**
-     * The method can be used together with insert to implement a view move, i.e.
-     * moving the dom nodes while the directives in the view stay intact.
-     */
-    detach(atIndex?: number): ViewRef;
-  }
-
-
-  /**
-   * @exportedAs angular2/view
-   */
-  class ElementRef implements  RenderElementRef {
-    parentView: ViewRef;
-    boundElementIndex: number;
-    renderView: RenderViewRef;
-
-    /**
-     * Exposes the underlying native element.
-     * Attention: This won't work in a webworker scenario!
-     */
-    nativeElement: any;
-  }
-
-
-  /**
-   * A wrapper around zones that lets you schedule tasks after it has executed a task.
-   *
-   * The wrapper maintains an "inner" and an "mount" `Zone`. The application code will executes
-   * in the "inner" zone unless `runOutsideAngular` is explicitely called.
-   *
-   * A typical application will create a singleton `NgZone`. The outer `Zone` is a fork of the root
-   * `Zone`. The default `onTurnDone` runs the Angular change detection.
-   *
-   * @exportedAs angular2/core
-   */
-  class NgZone {
-
-    /**
-     * Runs `fn` in the inner zone and returns whatever it returns.
-     *
-     * In a typical app where the inner zone is the Angular zone, this allows one to make use of the
-     * Angular's auto digest mechanism.
-     *
-     * ```
-     * var zone: NgZone = [ref to the application zone];
-     *
-     * zone.run(() => {
-     *   // the change detection will run after this function and the microtasks it enqueues have
-     * executed.
-     * });
-     * ```
-     */
-    run(fn: any): any;
-
-    /**
-     * Runs `fn` in the outer zone and returns whatever it returns.
-     *
-     * In a typical app where the inner zone is the Angular zone, this allows one to escape Angular's
-     * auto-digest mechanism.
-     *
-     * ```
-     * var zone: NgZone = [ref to the application zone];
-     *
-     * zone.runOusideAngular(() => {
-     *   element.onClick(() => {
-     *     // Clicking on the element would not trigger the change detection
-     *   });
-     * });
-     * ```
-     */
-    runOutsideAngular(fn: any): any;
-  }
-
-
-  /**
-   * Specifies that an injector should retrieve a dependency from its element.
-   *
-   * ## Example
-   *
-   * Here is a simple directive that retrieves a dependency from its element.
-   *
-   * ```
-   * @Directive({
-   *   selector: '[dependency]',
-   *   properties: [
-   *     'id: dependency'
-   *   ]
-   * })
-   * class Dependency {
-   *   id:string;
-   * }
-   *
-   *
-   * @Directive({
-   *   selector: '[my-directive]'
-   * })
-   * class Dependency {
-   *   constructor(@Self() dependency:Dependency) {
-   *     expect(dependency.id).toEqual(1);
-   *   };
-   * }
-   * ```
-   *
-   * We use this with the following HTML template:
-   *
-   * ```
-   * <div dependency="1" my-directive></div>
-   * ```
-   *
-   * @exportedAs angular2/annotations
-   */
-  class SelfAnnotation extends  Visibility {
-    toString(): any;
-  }
-
-
-  /**
-   * Specifies that an injector should retrieve a dependency from any ancestor element within the same
-   * shadow boundary.
-   *
-   * An ancestor is any element between the parent element and the shadow root.
-   *
-   * Use <a href='/angular2/angular2/Unbounded'><code>Unbounded</code></a> if you need to cross upper shadow boundaries.
-   *
-   * ## Example
-   *
-   * Here is a simple directive that retrieves a dependency from an ancestor element.
-   *
-   * ```
-   * @Directive({
-   *   selector: '[dependency]',
-   *   properties: [
-   *     'id: dependency'
-   *   ]
-   * })
-   * class Dependency {
-   *   id:string;
-   * }
-   *
-   *
-   * @Directive({
-   *   selector: '[my-directive]'
-   * })
-   * class Dependency {
-   *   constructor(@Ancestor() dependency:Dependency) {
-   *     expect(dependency.id).toEqual(2);
-   *   };
-   * }
-   * ```
-   *
-   *  We use this with the following HTML template:
-   *
-   * ```
-   * <div dependency="1">
-   *   <div dependency="2">
-   *     <div>
-   *       <div dependency="3" my-directive></div>
-   *     </div>
-   *   </div>
-   * </div>
-   * ```
-   *
-   * The `@Ancestor()` annotation in our constructor forces the injector to retrieve the dependency
-   * from the
-   * nearest ancestor element:
-   * - The current element `dependency="3"` is skipped because it is not an ancestor.
-   * - Next parent has no directives `<div>`
-   * - Next parent has the `Dependency` directive and so the dependency is satisfied.
-   *
-   * Angular injects `dependency=2`.
-   *
-   * @exportedAs angular2/annotations
-   */
-  class AncestorAnnotation extends  Visibility {
-    toString(): any;
-  }
-
-
-  /**
-   * Specifies that an injector should retrieve a dependency from the direct parent.
-   *
-   * ## Example
-   *
-   * Here is a simple directive that retrieves a dependency from its parent element.
-   *
-   * ```
-   * @Directive({
-   *   selector: '[dependency]',
-   *   properties: [
-   *     'id: dependency'
-   *   ]
-   * })
-   * class Dependency {
-   *   id:string;
-   * }
-   *
-   *
-   * @Directive({
-   *   selector: '[my-directive]'
-   * })
-   * class Dependency {
-   *   constructor(@Parent() dependency:Dependency) {
-   *     expect(dependency.id).toEqual(1);
-   *   };
-   * }
-   * ```
-   *
-   * We use this with the following HTML template:
-   *
-   * ```
-   * <div dependency="1">
-   *   <div dependency="2" my-directive></div>
-   * </div>
-   * ```
-   * The `@Parent()` annotation in our constructor forces the injector to retrieve the dependency from
-   * the
-   * parent element (even thought the current element could resolve it): Angular injects
-   * `dependency=1`.
-   *
-   * @exportedAs angular2/annotations
-   */
-  class ParentAnnotation extends  Visibility {
-    toString(): any;
-  }
-
-
-  /**
-   * Specifies that an injector should retrieve a dependency from any ancestor element, crossing
-   * component boundaries.
-   *
-   * Use <a href='/angular2/angular2/Ancestor'><code>Ancestor</code></a> to look for ancestors within the current shadow boundary only.
-   *
-   * ## Example
-   *
-   * Here is a simple directive that retrieves a dependency from an ancestor element.
-   *
-   * ```
-   * @Directive({
-   *   selector: '[dependency]',
-   *   properties: [
-   *     'id: dependency'
-   *   ]
-   * })
-   * class Dependency {
-   *   id:string;
-   * }
-   *
-   *
-   * @Directive({
-   *   selector: '[my-directive]'
-   * })
-   * class Dependency {
-   *   constructor(@Unbounded() dependency:Dependency) {
-   *     expect(dependency.id).toEqual(2);
-   *   };
-   * }
-   * ```
-   *
-   * @exportedAs angular2/annotations
-   */
-  class UnboundedAnnotation extends  Visibility {
-    toString(): any;
-  }
-
-
-  /**
-   * Declares the available HTML templates for an application.
-   *
-   * Each angular component requires a single `@Component` and at least one `@View` annotation. The
-   * `@View` annotation specifies the HTML template to use, and lists the directives that are active
-   * within the template.
-   *
-   * When a component is instantiated, the template is loaded into the component's shadow root, and
-   * the expressions and statements in the template are evaluated against the component.
-   *
-   * For details on the `@Component` annotation, see <a href='/angular2/angular2/Component'><code>Component</code></a>.
-   *
-   * ## Example
-   *
-   * ```
-   * @Component({
-   *   selector: 'greet'
-   * })
-   * @View({
-   *   template: 'Hello {{name}}!',
-   *   directives: [GreetUser, Bold]
-   * })
-   * class Greet {
-   *   name: string;
-   *
-   *   constructor() {
-   *     this.name = 'World';
-   *   }
-   * }
-   * ```
-   *
-   * @exportedAs angular2/annotations
-   */
-  class ViewAnnotation {
-
-    /**
-     * Specifies a template URL for an angular component.
-     *
-     * NOTE: either `templateUrl` or `template` should be used, but not both.
-     */
-    templateUrl: string;
-
-    /**
-     * Specifies an inline template for an angular component.
-     *
-     * NOTE: either `templateUrl` or `template` should be used, but not both.
-     */
-    template: string;
-
-    /**
-     * Specifies stylesheet URLs for an angular component.
-     */
-    styleUrls: List<string>;
-
-    /**
-     * Specifies an inline stylesheet for an angular component.
-     */
-    styles: List<string>;
-
-    /**
-     * Specifies a list of directives that can be used within a template.
-     *
-     * Directives must be listed explicitly to provide proper component encapsulation.
-     *
-     * ## Example
-     *
-     * ```javascript
-     * @Component({
-     *     selector: 'my-component'
-     *   })
-     * @View({
-     *   directives: [For]
-     *   template: '
-     *   <ul>
-     *     <li *ng-for="#item of items">{{item}}</li>
-     *   </ul>'
-     * })
-     * class MyComponent {
-     * }
-     * ```
-     */
-    directives: List<Type | any | List<any>>;
-
-    /**
-     * Specify a custom renderer for this View.
-     * If this is set, neither `template`, `templateUrl`, `styles`, `styleUrls` nor `directives` are
-     * used.
-     */
-    renderer: string;
-  }
-
-  interface ViewArgs {
-    templateUrl: string;
-    template: string;
-    directives: List<Type | any | List<any>>;
-    renderer: string;
-    styles: List<string>;
-    styleUrls: List<string>;
-  }
-
-
-  /**
-   * Bootstrapping for Angular applications.
-   *
-   * You instantiate an Angular application by explicitly specifying a component to use as the root
-   * component for your
-   * application via the `bootstrap()` method.
-   *
-   * ## Simple Example
-   *
-   * Assuming this `index.html`:
-   *
-   * ```html
-   * <html>
-   *   <!-- load Angular script tags here. -->
-   *   <body>
-   *     <my-app>loading...</my-app>
-   *   </body>
-   * </html>
-   * ```
-   *
-   * An application is bootstrapped inside an existing browser DOM, typically `index.html`. Unlike
-   * Angular 1, Angular 2
-   * does not compile/process bindings in `index.html`. This is mainly for security reasons, as well
-   * as architectural
-   * changes in Angular 2. This means that `index.html` can safely be processed using server-side
-   * technologies such as
-   * bindings. Bindings can thus use double-curly `{{ syntax }}` without collision from Angular 2
-   * component double-curly
-   * `{{ syntax }}`.
-   *
-   * We can use this script code:
-   *
-   * ```
-   * @Component({
-   *    selector: 'my-app'
-   * })
-   * @View({
-   *    template: 'Hello {{ name }}!'
-   * })
-   * class MyApp {
-   *   name:string;
-   *
-   *   constructor() {
-   *     this.name = 'World';
-   *   }
-   * }
-   *
-   * main() {
-   *   return bootstrap(MyApp);
-   * }
-   * ```
-   *
-   * When the app developer invokes `bootstrap()` with the root component `MyApp` as its argument,
-   * Angular performs the
-   * following tasks:
-   *
-   *  1. It uses the component's `selector` property to locate the DOM element which needs to be
-   * upgraded into
-   *     the angular component.
-   *  2. It creates a new child injector (from the platform injector) and configures the injector with
-   * the component's
-   *     `appInjector`. Optionally, you can also override the injector configuration for an app by
-   * invoking
-   *     `bootstrap` with the `componentInjectableBindings` argument.
-   *  3. It creates a new `Zone` and connects it to the angular application's change detection domain
-   * instance.
-   *  4. It creates a shadow DOM on the selected component's host element and loads the template into
-   * it.
-   *  5. It instantiates the specified component.
-   *  6. Finally, Angular performs change detection to apply the initial data bindings for the
-   * application.
-   *
-   *
-   * ## Instantiating Multiple Applications on a Single Page
-   *
-   * There are two ways to do this.
-   *
-   *
-   * ### Isolated Applications
-   *
-   * Angular creates a new application each time that the `bootstrap()` method is invoked. When
-   * multiple applications
-   * are created for a page, Angular treats each application as independent within an isolated change
-   * detection and
-   * `Zone` domain. If you need to share data between applications, use the strategy described in the
-   * next
-   * section, "Applications That Share Change Detection."
-   *
-   *
-   * ### Applications That Share Change Detection
-   *
-   * If you need to bootstrap multiple applications that share common data, the applications must
-   * share a common
-   * change detection and zone. To do that, create a meta-component that lists the application
-   * components in its template.
-   * By only invoking the `bootstrap()` method once, with the meta-component as its argument, you
-   * ensure that only a
-   * single change detection zone is created and therefore data can be shared across the applications.
-   *
-   *
-   * ## Platform Injector
-   *
-   * When working within a browser window, there are many singleton resources: cookies, title,
-   * location, and others.
-   * Angular services that represent these resources must likewise be shared across all Angular
-   * applications that
-   * occupy the same browser window.  For this reason, Angular creates exactly one global platform
-   * injector which stores
-   * all shared services, and each angular application injector has the platform injector as its
-   * parent.
-   *
-   * Each application has its own private injector as well. When there are multiple applications on a
-   * page, Angular treats
-   * each application injector's services as private to that application.
-   *
-   *
-   * # API
-   * - `appComponentType`: The root component which should act as the application. This is a reference
-   * to a `Type`
-   *   which is annotated with `@Component(...)`.
-   * - `componentInjectableBindings`: An additional set of bindings that can be added to `appInjector`
-   * for the
-   * <a href='/angular2/angular2/Component'><code>Component</code></a> to override default injection behavior.
-   * - `errorReporter`: `function(exception:any, stackTrace:string)` a default error reporter for
-   * unhandled exceptions.
-   *
-   * Returns a `Promise` with the application`s private <a href='/angular2/angular2/Injector'><code>Injector</code></a>.
-   *
-   * @exportedAs angular2/core
-   */
-  function bootstrap(appComponentType: Type, componentInjectableBindings?: List<Type | Binding | List<any>>, errorReporter?: Function) : Promise<ApplicationRef> ;
-
-  class ApplicationRef {
-    hostComponentType: any;
-    hostComponent: any;
-    dispose(): any;
-    injector: any;
-  }
-
-  var appComponentRefToken : OpaqueToken ;
-
-  var appComponentTypeToken : OpaqueToken ;
-
-
-  /**
-   * Specifies that a <a href='/angular2/angular2/QueryList'><code>QueryList</code></a> should be injected.
-   *
-   * See <a href='/angular2/angular2/QueryList'><code>QueryList</code></a> for usage and example.
-   *
-   * @exportedAs angular2/annotations
-   */
-  class QueryAnnotation extends  DependencyAnnotation {
-    descendants: boolean;
-    selector: any;
-    isVarBindingQuery: boolean;
-    varBindings: List<string>;
-    toString(): any;
-  }
-
-
-  /**
-   * Specifies that a constant attribute value should be injected.
-   *
-   * The directive can inject constant string literals of host element attributes.
-   *
-   * ## Example
-   *
-   * Suppose we have an `<input>` element and want to know its `type`.
-   *
-   * ```html
-   * <input type="text">
-   * ```
-   *
-   * A decorator can inject string literal `text` like so:
-   *
-   * ```javascript
-   * @Directive({
-   *   selector: `input'
-   * })
-   * class InputDirective {
-   *   constructor(@Attribute('type') type) {
-   *     // type would be `text` in this example
-   *   }
-   * }
-   * ```
-   *
-   * @exportedAs angular2/annotations
-   */
-  class AttributeAnnotation extends  DependencyAnnotation {
-    attributeName: string;
-    token: any;
-    toString(): any;
-  }
-
-
-  /**
-   * Cache that stores the AppProtoView of the template of a component.
-   * Used to prevent duplicate work and resolve cyclic dependencies.
-   */
-  class CompilerCache {
-    set(component: Type, protoView: AppProtoView): void;
-    get(component: Type): AppProtoView;
-    setHost(component: Type, protoView: AppProtoView): void;
-    getHost(component: Type): AppProtoView;
-    clear(): void;
-  }
-
-
-  /**
-   * @exportedAs angular2/view
-   */
-  class Compiler {
-    compileInHost(componentTypeOrBinding: Type | Binding): Promise<ProtoViewRef>;
-  }
-
-
-  /**
-   * Defines lifecycle method [onChange] called after all of component's bound
-   * properties are updated.
-   */
-  interface OnChange {
-    onChange(changes: StringMap<string, any>): void;
-  }
-
-
-  /**
-   * Defines lifecycle method [onDestroy] called when a directive is being destroyed.
-   */
-  interface OnDestroy {
-    onDestroy(): void;
-  }
-
-
-  /**
-   * Defines lifecycle method [onCheck] called when a directive is being checked.
-   */
-  interface OnCheck {
-    onCheck(): void;
-  }
-
-
-  /**
-   * Defines lifecycle method [onInit] called when a directive is being checked the first time.
-   */
-  interface OnInit {
-    onInit(): void;
-  }
-
-
-  /**
-   * Defines lifecycle method [onAllChangesDone ] called when the bindings of all its children have
-   * been changed.
-   */
-  interface OnAllChangesDone {
-    onAllChangesDone(): void;
-  }
-
-
-  /**
-   * An iterable live list of components in the Light DOM.
-   *
-   * Injectable Objects that contains a live list of child directives in the light DOM of a directive.
-   * The directives are kept in depth-first pre-order traversal of the DOM.
-   *
-   * The `QueryList` is iterable, therefore it can be used in both javascript code with `for..of` loop
-   * as well as in
-   * template with `*ng-for="of"` directive.
-   *
-   * NOTE: In the future this class will implement an `Observable` interface. For now it uses a plain
-   * list of observable
-   * callbacks.
-   *
-   * # Example:
-   *
-   * Assume that `<tabs>` component would like to get a list its children which are `<pane>`
-   * components as shown in this
-   * example:
-   *
-   * ```html
-   * <tabs>
-   *   <pane title="Overview">...</pane>
-   *   <pane *ng-for="#o of objects" [title]="o.title">{{o.text}}</pane>
-   * </tabs>
-   * ```
-   *
-   * In the above example the list of `<tabs>` elements needs to get a list of `<pane>` elements so
-   * that it could render
-   * tabs with the correct titles and in the correct order.
-   *
-   * A possible solution would be for a `<pane>` to inject `<tabs>` component and then register itself
-   * with `<tabs>`
-   * component's on `hydrate` and deregister on `dehydrate` event. While a reasonable approach, this
-   * would only work
-   * partialy since `*ng-for` could rearrange the list of `<pane>` components which would not be
-   * reported to `<tabs>`
-   * component and thus the list of `<pane>` components would be out of sync with respect to the list
-   * of `<pane>` elements.
-   *
-   * A preferred solution is to inject a `QueryList` which is a live list of directives in the
-   * component`s light DOM.
-   *
-   * ```javascript
-   * @Component({
-   *   selector: 'tabs'
-   * })
-   * @View({
-   *  template: `
-   *    <ul>
-   *      <li *ng-for="#pane of panes">{{pane.title}}</li>
-   *    </ul>
-   *    <content></content>
-   *  `
-   * })
-   * class Tabs {
-   *   panes: QueryList<Pane>
-   *
-   *   constructor(@Query(Pane) panes:QueryList<Pane>) {
-   *     this.panes = panes;
-   *   }
-   * }
-   *
-   * @Component({
-   *   selector: 'pane',
-   *   properties: ['title']
-   * })
-   * @View(...)
-   * class Pane {
-   *   title:string;
-   * }
-   * ```
-   *
-   * @exportedAs angular2/view
-   */
-  class QueryList<T> extends  BaseQueryList<T> {
-    onChange(callback: any): any;
-    removeCallback(callback: any): any;
-  }
-
-  class DirectiveResolver {
-    resolve(type: Type): DirectiveAnnotation;
-  }
-
-
-  /**
-   * @exportedAs angular2/view
-   */
-  class ComponentRef {
-    location: ElementRef;
-    instance: any;
-    dispose: Function;
-    hostView: ViewRef;
-  }
-
-
-  /**
-   * Service for dynamically loading a Component into an arbitrary position in the internal Angular
-   * application tree.
-   *
-   * @exportedAs angular2/view
-   */
-  class DynamicComponentLoader {
-
-    /**
-     * Loads a root component that is placed at the first element that matches the
-     * component's selector.
-     * The loaded component receives injection normally as a hosted view.
-     */
-    loadAsRoot(typeOrBinding: Type | Binding, overrideSelector?: string, injector?: Injector): Promise<ComponentRef>;
-
-    /**
-     * Loads a component into the component view of the provided ElementRef
-     * next to the element with the given name
-     * The loaded component receives
-     * injection normally as a hosted view.
-     */
-    loadIntoLocation(typeOrBinding: Type | Binding, hostLocation: ElementRef, anchorName: string, injector?: Injector): Promise<ComponentRef>;
-
-    /**
-     * Loads a component next to the provided ElementRef. The loaded component receives
-     * injection normally as a hosted view.
-     */
-    loadNextToLocation(typeOrBinding: Type | Binding, location: ElementRef, injector?: Injector): Promise<ComponentRef>;
-  }
-
+  
+  var DOCUMENT_TOKEN:any;
+  
 
   /**
    * Declare reusable UI building blocks for an application.
-   *
+   * 
    * Each Angular component requires a single `@Component` and at least one `@View` annotation. The
    * `@Component`
    * annotation specifies when a component is instantiated, and which properties and hostListeners it
    * binds to.
-   *
+   * 
    * When a component is instantiated, Angular
    * - creates a shadow DOM for the component.
    * - loads the selected template into the shadow DOM.
-   * - creates a child <a href='/angular2/angular2/Injector'><code>Injector</code></a> which is configured with the `appInjector` for the
-   * <a href='/angular2/angular2/Component'><code>Component</code></a>.
-   *
+   * - creates all the injectable objects configured with `hostInjector` and `viewInjector`.
+   * 
    * All template expressions and statements are then evaluated against the component instance.
-   *
-   * For details on the `@View` annotation, see <a href='/angular2/angular2/View'><code>View</code></a>.
-   *
+   * 
+   * For details on the `@View` annotation, see <a href='/angular2/angular2.api/View'><code>View</code></a>.
+   * 
    * ## Example
-   *
+   * 
    * ```
    * @Component({
    *   selector: 'greet'
@@ -3581,109 +2357,58 @@ declare module "angular2/angular2" {
    * })
    * class Greet {
    *   name: string;
-   *
+   * 
    *   constructor() {
    *     this.name = 'World';
    *   }
    * }
    * ```
-   *
-   *
+   * 
+   * 
    * @exportedAs angular2/annotations
    */
-  interface ComponentAnnotation extends  DirectiveAnnotation {
+  class ComponentAnnotation extends DirectiveAnnotation {
+    
 
     /**
      * Defines the used change detection strategy.
-     *
+     * 
      * When a component is instantiated, Angular creates a change detector, which is responsible for
      * propagating
      * the component's bindings.
-     *
+     * 
      * The `changeDetection` property defines, whether the change detection will be checked every time
      * or only when the component
      * tells it to do so.
      */
-    changeDetection: string;
-
-    /**
-     * Defines the set of injectable objects that are visible to a Component and its children.
-     *
-     * The `appInjector` defined in the Component annotation allow you to configure a set of bindings
-     * for the component's
-     * injector.
-     *
-     * When a component is instantiated, Angular creates a new child Injector, which is configured
-     * with the bindings in
-     * the Component `appInjector` annotation. The injectable objects then become available for
-     * injection to the component
-     * itself and any of the directives in the component's template, i.e. they are not available to
-     * the directives which
-     * are children in the component's light DOM.
-     *
-     *
-     * The syntax for configuring the `appInjector` injectable is identical to <a href='/angular2/angular2/Injector'><code>Injector</code></a>
-     * injectable configuration.
-     * See <a href='/angular2/angular2/Injector'><code>Injector</code></a> for additional detail.
-     *
-     *
-     * ## Simple Example
-     *
-     * Here is an example of a class that can be injected:
-     *
-     * ```
-     * class Greeter {
-     *    greet(name:string) {
-     *      return 'Hello ' + name + '!';
-     *    }
-     * }
-     *
-     * @Component({
-     *   selector: 'greet',
-     *   appInjector: [
-     *     Greeter
-     *   ]
-     * })
-     * @View({
-     *   template: `{{greeter.greet('world')}}!`,
-     *   directives: [Child]
-     * })
-     * class HelloWorld {
-     *   greeter:Greeter;
-     *
-     *   constructor(greeter:Greeter) {
-     *     this.greeter = greeter;
-     *   }
-     * }
-     * ```
-     */
-    appInjector: List<any>;
+     changeDetection: string;
+    
 
     /**
      * Defines the set of injectable objects that are visible to its view dom children.
-     *
+     * 
      * ## Simple Example
-     *
+     * 
      * Here is an example of a class that can be injected:
-     *
+     * 
      * ```
      * class Greeter {
      *    greet(name:string) {
      *      return 'Hello ' + name + '!';
      *    }
      * }
-     *
+     * 
      * @Directive({
      *   selector: 'needs-greeter'
      * })
      * class NeedsGreeter {
      *   greeter:Greeter;
-     *
+     * 
      *   constructor(greeter:Greeter) {
      *     this.greeter = greeter;
      *   }
      * }
-     *
+     * 
      * @Component({
      *   selector: 'greet',
      *   viewInjector: [
@@ -3696,61 +2421,61 @@ declare module "angular2/angular2" {
      * })
      * class HelloWorld {
      * }
-     *
+     * 
      * ```
      */
-    viewInjector: List<any>;
+     viewInjector: List<any>;
   }
-
+  
 
   /**
    * Directives allow you to attach behavior to elements in the DOM.
-   *
-   * <a href='/angular2/angular2/Directive'><code>Directive</code></a>s with an embedded view are called <a href='/angular2/angular2/Component'><code>Component</code></a>s.
-   *
+   * 
+   * <a href='/angular2/angular2.api/Directive'><code>Directive</code></a>s with an embedded view are called <a href='/angular2/angular2.api/Component'><code>Component</code></a>s.
+   * 
    * A directive consists of a single directive annotation and a controller class. When the
    * directive's `selector` matches
    * elements in the DOM, the following steps occur:
-   *
+   * 
    * 1. For each directive, the `ElementInjector` attempts to resolve the directive's constructor
    * arguments.
    * 2. Angular instantiates directives for each matched element using `ElementInjector` in a
    * depth-first order,
    *    as declared in the HTML.
-   *
+   * 
    * ## Understanding How Injection Works
-   *
+   * 
    * There are three stages of injection resolution.
    * - *Pre-existing Injectors*:
-   *   - The terminal <a href='/angular2/angular2/Injector'><code>Injector</code></a> cannot resolve dependencies. It either throws an error or, if
+   *   - The terminal <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> cannot resolve dependencies. It either throws an error or, if
    * the dependency was
    *     specified as `@Optional`, returns `null`.
    *   - The platform injector resolves browser singleton resources, such as: cookies, title,
    * location, and others.
-   * - *Component Injectors*: Each component instance has its own <a href='/angular2/angular2/Injector'><code>Injector</code></a>, and they follow
+   * - *Component Injectors*: Each component instance has its own <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>, and they follow
    * the same parent-child hierarchy
    *     as the component instances in the DOM.
    * - *Element Injectors*: Each component instance has a Shadow DOM. Within the Shadow DOM each
    * element has an `ElementInjector`
    *     which follow the same parent-child hierarchy as the DOM elements themselves.
-   *
+   * 
    * When a template is instantiated, it also must instantiate the corresponding directives in a
    * depth-first order. The
    * current `ElementInjector` resolves the constructor dependencies for each directive.
-   *
+   * 
    * Angular then resolves dependencies as follows, according to the order in which they appear in the
-   * <a href='/angular2/angular2/View'><code>View</code></a>:
-   *
+   * <a href='/angular2/angular2.api/View'><code>View</code></a>:
+   * 
    * 1. Dependencies on the current element
    * 2. Dependencies on element injectors and their parents until it encounters a Shadow DOM boundary
    * 3. Dependencies on component injectors and their parents until it encounters the root component
    * 4. Dependencies on pre-existing injectors
-   *
-   *
+   * 
+   * 
    * The `ElementInjector` can inject other directives, element-specific special objects, or it can
    * delegate to the parent
    * injector.
-   *
+   * 
    * To inject other directives, declare the constructor parameter as:
    * - `directive:DirectiveType`: a directive on the current element only
    * - `@Ancestor() directive:DirectiveType`: any directive that matches the type between the current
@@ -3764,21 +2489,21 @@ declare module "angular2/angular2" {
    * directives.
    * - `@QueryDescendants(DirectiveType) query:QueryList<DirectiveType>`: A live collection of any
    * child directives.
-   *
+   * 
    * To inject element-specific special objects, declare the constructor parameter as:
    * - `element: ElementRef` to obtain a reference to logical element in the view.
    * - `viewContainer: ViewContainerRef` to control child template instantiation, for
-   * <a href='/angular2/angular2/Directive'><code>Directive</code></a> directives only
+   * <a href='/angular2/angular2.api/Directive'><code>Directive</code></a> directives only
    * - `bindingPropagation: BindingPropagation` to control change detection in a more granular way.
-   *
+   * 
    * ## Example
-   *
+   * 
    * The following example demonstrates how dependency injection resolves constructor arguments in
    * practice.
-   *
-   *
+   * 
+   * 
    * Assume this HTML template:
-   *
+   * 
    * ```
    * <div dependency="1">
    *   <div dependency="2">
@@ -3791,14 +2516,14 @@ declare module "angular2/angular2" {
    *   </div>
    * </div>
    * ```
-   *
+   * 
    * With the following `dependency` decorator and `SomeService` injectable class.
-   *
+   * 
    * ```
    * @Injectable()
    * class SomeService {
    * }
-   *
+   * 
    * @Directive({
    *   selector: '[dependency]',
    *   properties: [
@@ -3809,15 +2534,15 @@ declare module "angular2/angular2" {
    *   id:string;
    * }
    * ```
-   *
+   * 
    * Let's step through the different ways in which `MyDirective` could be declared...
-   *
-   *
+   * 
+   * 
    * ### No injection
-   *
+   * 
    * Here the constructor is declared with no arguments, therefore nothing is injected into
    * `MyDirective`.
-   *
+   * 
    * ```
    * @Directive({ selector: '[my-directive]' })
    * class MyDirective {
@@ -3825,15 +2550,15 @@ declare module "angular2/angular2" {
    *   }
    * }
    * ```
-   *
+   * 
    * This directive would be instantiated with no dependencies.
-   *
-   *
+   * 
+   * 
    * ### Component-level injection
-   *
+   * 
    * Directives can inject any injectable instance from the closest component injector or any of its
    * parents.
-   *
+   * 
    * Here, the constructor declares a parameter, `someService`, and injects the `SomeService` type
    * from the parent
    * component's injector.
@@ -3844,14 +2569,14 @@ declare module "angular2/angular2" {
    *   }
    * }
    * ```
-   *
+   * 
    * This directive would be instantiated with a dependency on `SomeService`.
-   *
-   *
+   * 
+   * 
    * ### Injecting a directive from the current element
-   *
+   * 
    * Directives can inject other directives declared on the current element.
-   *
+   * 
    * ```
    * @Directive({ selector: '[my-directive]' })
    * class MyDirective {
@@ -3862,16 +2587,16 @@ declare module "angular2/angular2" {
    * ```
    * This directive would be instantiated with `Dependency` declared at the same element, in this case
    * `dependency="3"`.
-   *
-   *
+   * 
+   * 
    * ### Injecting a directive from a direct parent element
-   *
+   * 
    * Directives can inject other directives declared on a direct parent element. By definition, a
    * directive with a
    * `@Parent` annotation does not attempt to resolve dependencies for the current element, even if
    * this would satisfy
    * the dependency.
-   *
+   * 
    * ```
    * @Directive({ selector: '[my-directive]' })
    * class MyDirective {
@@ -3882,16 +2607,16 @@ declare module "angular2/angular2" {
    * ```
    * This directive would be instantiated with `Dependency` declared at the parent element, in this
    * case `dependency="2"`.
-   *
-   *
+   * 
+   * 
    * ### Injecting a directive from any ancestor elements
-   *
+   * 
    * Directives can inject other directives declared on any ancestor element (in the current Shadow
    * DOM), i.e. on the
    * parent element and its parents. By definition, a directive with an `@Ancestor` annotation does
    * not attempt to
    * resolve dependencies for the current element, even if this would satisfy the dependency.
-   *
+   * 
    * ```
    * @Directive({ selector: '[my-directive]' })
    * class MyDirective {
@@ -3900,22 +2625,22 @@ declare module "angular2/angular2" {
    *   }
    * }
    * ```
-   *
+   * 
    * Unlike the `@Parent` which only checks the parent, `@Ancestor` checks the parent, as well as its
    * parents recursively. If `dependency="2"` didn't exist on the direct parent, this injection would
    * have returned
    * `dependency="1"`.
-   *
-   *
+   * 
+   * 
    * ### Injecting a live collection of direct child directives
-   *
-   *
+   * 
+   * 
    * A directive can also query for other child directives. Since parent directives are instantiated
    * before child directives, a directive can't simply inject the list of child directives. Instead,
-   * the directive injects a <a href='/angular2/angular2/QueryList'><code>QueryList</code></a>, which updates its contents as children are added,
-   * removed, or moved by a directive that uses a <a href='/angular2/angular2/ViewContainerRef'><code>ViewContainerRef</code></a> such as a `ng-for`, an
+   * the directive injects a <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a>, which updates its contents as children are added,
+   * removed, or moved by a directive that uses a <a href='/angular2/angular2.api/ViewContainerRef'><code>ViewContainerRef</code></a> such as a `ng-for`, an
    * `ng-if`, or an `ng-switch`.
-   *
+   * 
    * ```
    * @Directive({ selector: '[my-directive]' })
    * class MyDirective {
@@ -3923,15 +2648,15 @@ declare module "angular2/angular2" {
    *   }
    * }
    * ```
-   *
-   * This directive would be instantiated with a <a href='/angular2/angular2/QueryList'><code>QueryList</code></a> which contains `Dependency` 4 and
+   * 
+   * This directive would be instantiated with a <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a> which contains `Dependency` 4 and
    * 6. Here, `Dependency` 5 would not be included, because it is not a direct child.
-   *
+   * 
    * ### Injecting a live collection of descendant directives
-   *
+   * 
    * By passing the descendant flag to `@Query` above, we can include the children of the child
    * elements.
-   *
+   * 
    * ```
    * @Directive({ selector: '[my-directive]' })
    * class MyDirective {
@@ -3939,18 +2664,18 @@ declare module "angular2/angular2" {
    *   }
    * }
    * ```
-   *
+   * 
    * This directive would be instantiated with a Query which would contain `Dependency` 4, 5 and 6.
-   *
+   * 
    * ### Optional injection
-   *
+   * 
    * The normal behavior of directives is to return an error when a specified dependency cannot be
    * resolved. If you
    * would like to inject `null` on unresolved dependency instead, you can annotate that dependency
    * with `@Optional()`.
    * This explicitly permits the author of a template to treat some of the surrounding directives as
    * optional.
-   *
+   * 
    * ```
    * @Directive({ selector: '[my-directive]' })
    * class MyDirective {
@@ -3958,15 +2683,15 @@ declare module "angular2/angular2" {
    *   }
    * }
    * ```
-   *
+   * 
    * This directive would be instantiated with a `Dependency` directive found on the current element.
    * If none can be
    * found, the injector supplies `null` instead of throwing an error.
-   *
+   * 
    * ## Example
-   *
+   * 
    * Here we use a decorator directive to simply define basic tool-tip behavior.
-   *
+   * 
    * ```
    * @Directive({
    *   selector: '[tooltip]',
@@ -3982,16 +2707,16 @@ declare module "angular2/angular2" {
    *   text:string;
    *   overlay:Overlay; // NOT YET IMPLEMENTED
    *   overlayManager:OverlayManager; // NOT YET IMPLEMENTED
-   *
+   * 
    *   constructor(overlayManager:OverlayManager) {
    *     this.overlay = overlay;
    *   }
-   *
+   * 
    *   onMouseEnter() {
    *     // exact signature to be determined
    *     this.overlay = this.overlayManager.open(text, ...);
    *   }
-   *
+   * 
    *   onMouseLeave() {
    *     this.overlay.close();
    *     this.overlay = null;
@@ -4001,39 +2726,39 @@ declare module "angular2/angular2" {
    * In our HTML template, we can then add this behavior to a `<div>` or any other element with the
    * `tooltip` selector,
    * like so:
-   *
+   * 
    * ```
    * <div tooltip="some text here"></div>
    * ```
-   *
+   * 
    * Directives can also control the instantiation, destruction, and positioning of inline template
    * elements:
-   *
-   * A directive uses a <a href='/angular2/angular2/ViewContainerRef'><code>ViewContainerRef</code></a> to instantiate, insert, move, and destroy views at
+   * 
+   * A directive uses a <a href='/angular2/angular2.api/ViewContainerRef'><code>ViewContainerRef</code></a> to instantiate, insert, move, and destroy views at
    * runtime.
-   * The <a href='/angular2/angular2/ViewContainerRef'><code>ViewContainerRef</code></a> is created as a result of `<template>` element, and represents a
+   * The <a href='/angular2/angular2.api/ViewContainerRef'><code>ViewContainerRef</code></a> is created as a result of `<template>` element, and represents a
    * location in the current view
    * where these actions are performed.
-   *
-   * Views are always created as children of the current <a href='/angular2/angular2/View'><code>View</code></a>, and as siblings of the
+   * 
+   * Views are always created as children of the current <a href='/angular2/angular2.api/View'><code>View</code></a>, and as siblings of the
    * `<template>` element. Thus a
    * directive in a child view cannot inject the directive that created it.
-   *
+   * 
    * Since directives that create views via ViewContainers are common in Angular, and using the full
    * `<template>` element syntax is wordy, Angular
    * also supports a shorthand notation: `<li *foo="bar">` and `<li template="foo: bar">` are
    * equivalent.
-   *
+   * 
    * Thus,
-   *
+   * 
    * ```
    * <ul>
    *   <li *foo="bar" title="text"></li>
    * </ul>
    * ```
-   *
+   * 
    * Expands in use to:
-   *
+   * 
    * ```
    * <ul>
    *   <template [foo]="bar">
@@ -4041,18 +2766,18 @@ declare module "angular2/angular2" {
    *   </template>
    * </ul>
    * ```
-   *
+   * 
    * Notice that although the shorthand places `*foo="bar"` within the `<li>` element, the binding for
    * the directive
    * controller is correctly instantiated on the `<template>` element rather than the `<li>` element.
-   *
-   *
+   * 
+   * 
    * ## Example
-   *
+   * 
    * Let's suppose we want to implement the `unless` behavior, to conditionally include a template.
-   *
+   * 
    * Here is a simple directive that triggers on an `unless` selector:
-   *
+   * 
    * ```
    * @Directive({
    *   selector: '[unless]',
@@ -4062,13 +2787,13 @@ declare module "angular2/angular2" {
    *   viewContainer: ViewContainerRef;
    *   protoViewRef: ProtoViewRef;
    *   prevCondition: boolean;
-   *
+   * 
    *   constructor(viewContainer: ViewContainerRef, protoViewRef: ProtoViewRef) {
    *     this.viewContainer = viewContainer;
    *     this.protoViewRef = protoViewRef;
    *     this.prevCondition = null;
    *   }
-   *
+   * 
    *   set unless(newCondition) {
    *     if (newCondition && (isBlank(this.prevCondition) || !this.prevCondition)) {
    *       this.prevCondition = true;
@@ -4080,17 +2805,17 @@ declare module "angular2/angular2" {
    *   }
    * }
    * ```
-   *
+   * 
    * We can then use this `unless` selector in a template:
    * ```
    * <ul>
    *   <li *unless="expr"></li>
    * </ul>
    * ```
-   *
+   * 
    * Once the directive instantiates the child view, the shorthand notation for the template expands
    * and the result is:
-   *
+   * 
    * ```
    * <ul>
    *   <template [unless]="exp">
@@ -4099,66 +2824,68 @@ declare module "angular2/angular2" {
    *   <li></li>
    * </ul>
    * ```
-   *
+   * 
    * Note also that although the `<li></li>` template still exists inside the `<template></template>`,
    * the instantiated
    * view occurs on the second `<li></li>` which is a sibling to the `<template>` element.
-   *
+   * 
    * @exportedAs angular2/annotations
    */
-  class DirectiveAnnotation extends  Injectable {
+  class DirectiveAnnotation extends Injectable {
+    
 
     /**
      * The CSS selector that triggers the instantiation of a directive.
-     *
+     * 
      * Angular only allows directives to trigger on CSS selectors that do not cross element
      * boundaries.
-     *
+     * 
      * `selector` may be declared as one of the following:
-     *
+     * 
      * - `element-name`: select by element name.
      * - `.class`: select by class name.
      * - `[attribute]`: select by attribute name.
      * - `[attribute=value]`: select by attribute name and value.
      * - `:not(sub_selector)`: select only if the element does not match the `sub_selector`.
      * - `selector1, selector2`: select if either `selector1` or `selector2` matches.
-     *
-     *
+     * 
+     * 
      * ## Example
-     *
+     * 
      * Suppose we have a directive with an `input[type=text]` selector.
-     *
+     * 
      * And the following HTML:
-     *
+     * 
      * ```html
      * <form>
      *   <input type="text">
      *   <input type="radio">
      * <form>
      * ```
-     *
+     * 
      * The directive would only be instantiated on the `<input type="text">` element.
      */
-    selector: string;
+     selector: string;
+    
 
     /**
      * Enumerates the set of properties that accept data binding for a directive.
-     *
+     * 
      * The `properties` property defines a set of `directiveProperty` to `bindingProperty`
      * configuration:
-     *
+     * 
      * - `directiveProperty` specifies the component property where the value is written.
      * - `bindingProperty` specifies the DOM property where the value is read from.
-     *
-     * You can include a <a href='/angular2/angular2/Pipe'><code>Pipe</code></a> when specifying a `bindingProperty` to allow for data
+     * 
+     * You can include a <a href='/angular2/angular2.api/Pipe'><code>Pipe</code></a> when specifying a `bindingProperty` to allow for data
      * transformation and structural change detection of the value. These pipes will be evaluated in
      * the context of this component.
-     *
+     * 
      * ## Syntax
-     *
+     * 
      * There is no need to specify both `directiveProperty` and `bindingProperty` when they both have
      * the same value.
-     *
+     * 
      * ```
      * @Directive({
      *   properties: [
@@ -4169,13 +2896,13 @@ declare module "angular2/angular2" {
      *   ]
      * }
      * ```
-     *
-     *
+     * 
+     * 
      * ## Basic Property Binding
-     *
+     * 
      * We can easily build a simple `Tooltip` directive that exposes a `tooltip` property, which can
      * be used in templates with standard Angular syntax. For example:
-     *
+     * 
      * ```
      * @Directive({
      *   selector: '[tooltip]',
@@ -4189,27 +2916,27 @@ declare module "angular2/angular2" {
      *   }
      * }
      * ```
-     *
+     * 
      * We can then bind to the `tooltip' property as either an expression (`someExpression`) or as a
      * string literal, as shown in the HTML template below:
-     *
+     * 
      * ```html
      * <div [tooltip]="someExpression">...</div>
      * <div tooltip="Some Text">...</div>
      * ```
-     *
+     * 
      * Whenever the `someExpression` expression changes, the `properties` declaration instructs
      * Angular to update the `Tooltip`'s `text` property.
-     *
+     * 
      * ## Bindings With Pipes
-     *
+     * 
      * You can also use pipes when writing binding definitions for a directive.
-     *
+     * 
      * For example, we could write a binding that updates the directive on structural changes, rather
      * than on reference changes, as normally occurs in change detection.
-     *
-     * See <a href='/angular2/angular2/Pipe'><code>Pipe</code></a> and <a href='/angular2/pipes/KeyValueChanges'><code>KeyValueChanges</code></a> documentation for more details.
-     *
+     * 
+     * See <a href='/angular2/angular2.api/Pipe'><code>Pipe</code></a> and <a href='/angular2/pipes/KeyValueChanges'><code>KeyValueChanges</code></a> documentation for more details.
+     * 
      * ```
      * @Directive({
      *   selector: '[class-set]',
@@ -4223,85 +2950,87 @@ declare module "angular2/angular2" {
      *   }
      * }
      * ```
-     *
+     * 
      * The template that this directive is used in may also contain its own pipes. For example:
-     *
+     * 
      * ```html
      * <div [class-set]="someExpression | somePipe">
      * ```
-     *
+     * 
      * In this case, the two pipes compose as if they were inlined: `someExpression | somePipe |
      * keyValDiff`.
      */
-    properties: List<string>;
+     properties: List<string>;
+    
 
     /**
      * Enumerates the set of emitted events.
-     *
+     * 
      * ## Syntax
-     *
+     * 
      * ```
      * @Component({
      *   events: ['statusChange']
      * })
      * class TaskComponent {
      *   statusChange: EventEmitter;
-     *
+     * 
      *   constructor() {
      *     this.statusChange = new EventEmitter();
      *   }
-     *
+     * 
      *   onComplete() {
      *     this.statusChange.next('completed');
      *   }
      * }
      * ```
-     *
+     * 
      * Use `propertyName: eventName` when the event emitter property name is different from the name
      * of the emitted event:
-     *
+     * 
      * ```
      * @Component({
      *   events: ['status: statusChange']
      * })
      * class TaskComponent {
      *   status: EventEmitter;
-     *
+     * 
      *   constructor() {
      *     this.status = new EventEmitter();
      *   }
-     *
+     * 
      *   onComplete() {
      *     this.status.next('completed');
      *   }
      * }
      * ```
      */
-    events: List<string>;
+     events: List<string>;
+    
 
     /**
      * Specifiy the events, actions, properties and attributes related to the host element.
-     *
+     * 
      * ## Events
-     *
+     * 
      * Specifies which DOM hostListeners a directive listens to via a set of `(event)` to `method`
      * key-value pairs:
-     *
+     * 
      * - `event1`: the DOM event that the directive listens to.
      * - `statement`: the statement to execute when the event occurs.
      * If the evalutation of the statement returns `false`, then `preventDefault`is applied on the DOM
      * event.
-     *
+     * 
      * To listen to global events, a target must be added to the event name.
      * The target can be `window`, `document` or `body`.
-     *
+     * 
      * When writing a directive event binding, you can also refer to the following local variables:
      * - `$event`: Current event object which triggered the event.
      * - `$target`: The source of the event. This will be either a DOM element or an Angular
      * directive. (will be implemented in later release)
-     *
+     * 
      * ## Syntax
-     *
+     * 
      * ```
      * @Directive({
      *   host: {
@@ -4311,13 +3040,13 @@ declare module "angular2/angular2" {
      *   }
      * }
      * ```
-     *
+     * 
      * ## Basic Event Binding:
-     *
+     * 
      * Suppose you want to write a directive that reacts to `change` events in the DOM and on
      * `resize` events in window.
      * You would define the event binding as follows:
-     *
+     * 
      * ```
      * @Directive({
      *   selector: 'input',
@@ -4335,13 +3064,13 @@ declare module "angular2/angular2" {
      *   }
      * }
      * ```
-     *
+     * 
      * ## Properties
-     *
+     * 
      * Specifies which DOM properties a directives updates.
-     *
+     * 
      * ## Syntax
-     *
+     * 
      * ```
      * @Directive({
      *   selector: 'input',
@@ -4353,17 +3082,17 @@ declare module "angular2/angular2" {
      *   value:string;
      * }
      * ```
-     *
+     * 
      * In this example the prop property of the host element is updated with the expression value
      * every time it changes.
-     *
+     * 
      * ## Attributes
-     *
+     * 
      * Specifies static attributes that should be propagated to a host element. Attributes specified
      * in `hostAttributes` are propagated only if a given attribute is not present on a host element.
-     *
+     * 
      * ## Syntax
-     *
+     * 
      * ```
      * @Directive({
      *   selector: '[my-button]',
@@ -4374,16 +3103,16 @@ declare module "angular2/angular2" {
      * class MyButton {
      * }
      * ```
-     *
+     * 
      * In this example using `my-button` directive (ex.: `<div my-button></div>`) on a host element
      * (here: `<div>` ) will ensure that this element will get the "button" role.
-     *
+     * 
      * ## Actions
-     *
+     * 
      * Specifies which DOM methods a directive can invoke.
-     *
+     * 
      * ## Syntax
-     *
+     * 
      * ```
      * @Directive({
      *   selector: 'input',
@@ -4395,45 +3124,47 @@ declare module "angular2/angular2" {
      *   constructor() {
      *     this.emitFocus = new EventEmitter();
      *   }
-     *
+     * 
      *   focus() {
      *     this.emitFocus.next();
      *   }
      * }
      * ```
-     *
+     * 
      * In this example calling focus on InputDirective will result in calling focus on the input.
      */
-    host: StringMap<string, string>;
+     host: StringMap<string, string>;
+    
 
     /**
      * Specifies which lifecycle should be notified to the directive.
-     *
-     * See <a href='/angular2/angular2/onChange'><code>onChange</code></a>, <a href='/angular2/angular2/onDestroy'><code>onDestroy</code></a>, <a href='/angular2/angular2/onCheck'><code>onCheck</code></a>,
-     * <a href='/angular2/angular2/onInit'><code>onInit</code></a>, <a href='/angular2/angular2/onAllChangesDone'><code>onAllChangesDone</code></a> for details.
+     * 
+     * See <a href='/angular2/angular2.api/LifecycleEvent'><code>LifecycleEvent</code></a> for details.
      */
-    lifecycle: List<LifecycleEvent>;
+     lifecycle: List<LifecycleEvent>;
+    
 
     /**
      * If set to false the compiler does not compile the children of this directive.
      */
-    compileChildren: boolean;
+     compileChildren: boolean;
+    
 
     /**
      * Defines the set of injectable objects that are visible to a Directive and its light dom
      * children.
-     *
+     * 
      * ## Simple Example
-     *
+     * 
      * Here is an example of a class that can be injected:
-     *
+     * 
      * ```
      * class Greeter {
      *    greet(name:string) {
      *      return 'Hello ' + name + '!';
      *    }
      * }
-     *
+     * 
      * @Directive({
      *   selector: 'greet',
      *   hostInjector: [
@@ -4442,20 +3173,21 @@ declare module "angular2/angular2" {
      * })
      * class HelloWorld {
      *   greeter:Greeter;
-     *
+     * 
      *   constructor(greeter:Greeter) {
      *     this.greeter = greeter;
      *   }
      * }
      * ```
      */
-    hostInjector: List<any>;
+     hostInjector: List<any>;
+    
 
     /**
      * Defines the name that can be used in the template to assign this directive to a variable.
-     *
+     * 
      * ## Simple Example
-     *
+     * 
      * ```
      * @Directive({
      *   selector: 'child-dir',
@@ -4463,7 +3195,7 @@ declare module "angular2/angular2" {
      * })
      * class ChildDir {
      * }
-     *
+     * 
      * @Component({
      *   selector: 'main',
      * })
@@ -4473,35 +3205,18 @@ declare module "angular2/angular2" {
      * })
      * class MainComponent {
      * }
-     *
+     * 
      * ```
      */
-    exportAs: string;
+     exportAs: string;
   }
-
-  interface ComponentArgs extends  DirectiveArgs {
-    appInjector: List<any>;
-    viewInjector: List<any>;
-    changeDetection: string;
-  }
-
-  interface DirectiveArgs {
-    selector: string;
-    properties: List<string>;
-    events: List<string>;
-    host: StringMap<string, string>;
-    lifecycle: List<LifecycleEvent>;
-    hostInjector: List<any>;
-    exportAs: string;
-    compileChildren: boolean;
-  }
-
+  
 
   /**
-   * Notify a directive whenever a <a href='/angular2/angular2/View'><code>View</code></a> that contains it is destroyed.
-   *
+   * Notify a directive whenever a <a href='/angular2/angular2.api/View'><code>View</code></a> that contains it is destroyed.
+   * 
    * ## Example
-   *
+   * 
    * ```
    * @Directive({
    *   ...,
@@ -4515,19 +3230,19 @@ declare module "angular2/angular2" {
    * ```
    * @exportedAs angular2/annotations
    */
-  var onDestroy: any;
-
+  var onDestroy : LifecycleEvent ;
+  
 
   /**
    * Notify a directive when any of its bindings have changed.
-   *
+   * 
    * This method is called right after the directive's bindings have been checked,
    * and before any of its children's bindings have been checked.
-   *
+   * 
    * It is invoked only if at least one of the directive's bindings has changed.
-   *
+   * 
    * ## Example:
-   *
+   * 
    * ```
    * @Directive({
    *   selector: '[class-set]',
@@ -4553,19 +3268,19 @@ declare module "angular2/angular2" {
    *  ```
    * @exportedAs angular2/annotations
    */
-  var onChange: any;
-
+  var onChange : LifecycleEvent ;
+  
 
   /**
    * Notify a directive when it has been checked.
-   *
+   * 
    * This method is called right after the directive's bindings have been checked,
    * and before any of its children's bindings have been checked.
-   *
+   * 
    * It is invoked every time even when none of the directive's bindings has changed.
-   *
+   * 
    * ## Example:
-   *
+   * 
    * ```
    * @Directive({
    *   selector: '[class-set]',
@@ -4578,19 +3293,19 @@ declare module "angular2/angular2" {
    *  ```
    * @exportedAs angular2/annotations
    */
-  var onCheck: any;
-
+  var onCheck : LifecycleEvent ;
+  
 
   /**
    * Notify a directive when it has been checked the first itme.
-   *
+   * 
    * This method is called right after the directive's bindings have been checked,
    * and before any of its children's bindings have been checked.
-   *
+   * 
    * It is invoked only once.
-   *
+   * 
    * ## Example:
-   *
+   * 
    * ```
    * @Directive({
    *   selector: '[class-set]',
@@ -4603,69 +3318,1622 @@ declare module "angular2/angular2" {
    *  ```
    * @exportedAs angular2/annotations
    */
-  var onInit: any;
-
+  var onInit : LifecycleEvent ;
+  
 
   /**
    * Notify a directive when the bindings of all its children have been checked (whether they have
    * changed or not).
-   *
+   * 
    * ## Example:
-   *
+   * 
    * ```
    * @Directive({
    *   selector: '[class-set]',
    *   lifecycle: [onAllChangesDone]
    * })
    * class ClassSet {
-   *
+   * 
    *   onAllChangesDone() {
    *   }
-   *
+   * 
    * }
    *  ```
    * @exportedAs angular2/annotations
    */
-  var onAllChangesDone: any;
+  var onAllChangesDone : LifecycleEvent ;
+  
 
-  interface DirectiveTypeDecorator extends  TypeDecorator {
+  /**
+   * Declares the available HTML templates for an application.
+   * 
+   * Each angular component requires a single `@Component` and at least one `@View` annotation. The
+   * `@View` annotation specifies the HTML template to use, and lists the directives that are active
+   * within the template.
+   * 
+   * When a component is instantiated, the template is loaded into the component's shadow root, and
+   * the expressions and statements in the template are evaluated against the component.
+   * 
+   * For details on the `@Component` annotation, see <a href='/angular2/angular2.api/Component'><code>Component</code></a>.
+   * 
+   * ## Example
+   * 
+   * ```
+   * @Component({
+   *   selector: 'greet'
+   * })
+   * @View({
+   *   template: 'Hello {{name}}!',
+   *   directives: [GreetUser, Bold]
+   * })
+   * class Greet {
+   *   name: string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * ```
+   * 
+   * @exportedAs angular2/annotations
+   */
+  class ViewAnnotation {
+    
+
+    /**
+     * Specifies an inline template for an angular component.
+     * 
+     * NOTE: either `templateUrl` or `template` should be used, but not both.
+     */
+     templateUrl: string;
+    
+
+    /**
+     * Specifies a template URL for an angular component.
+     * 
+     * NOTE: either `templateUrl` or `template` should be used, but not both.
+     */
+     template: string;
+    
+
+    /**
+     * Specifies stylesheet URLs for an angular component.
+     */
+     styleUrls: List<string>;
+    
+
+    /**
+     * Specifies an inline stylesheet for an angular component.
+     */
+     styles: List<string>;
+    
+
+    /**
+     * Specifies a list of directives that can be used within a template.
+     * 
+     * Directives must be listed explicitly to provide proper component encapsulation.
+     * 
+     * ## Example
+     * 
+     * ```javascript
+     * @Component({
+     *     selector: 'my-component'
+     *   })
+     * @View({
+     *   directives: [For]
+     *   template: '
+     *   <ul>
+     *     <li *ng-for="#item of items">{{item}}</li>
+     *   </ul>'
+     * })
+     * class MyComponent {
+     * }
+     * ```
+     */
+     directives: List<Type | any | List<any>>;
+    
+
+    /**
+     * Specify a custom renderer for this View.
+     * If this is set, neither `template`, `templateUrl`, `styles`, `styleUrls` nor `directives` are
+     * used.
+     */
+     renderer: string;
+  }
+  
+
+  /**
+   * Specifies that a <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a> should be injected.
+   * 
+   * See <a href='/angular2/angular2.api/QueryList'><code>QueryList</code></a> for usage and example.
+   * 
+   * @exportedAs angular2/annotations
+   */
+  class QueryAnnotation extends DependencyAnnotation {
+    
+     descendants: boolean;
+    
+     selector: void;
+    
+     isVarBindingQuery: boolean;
+    
+     varBindings: List<string>;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Specifies that a constant attribute value should be injected.
+   * 
+   * The directive can inject constant string literals of host element attributes.
+   * 
+   * ## Example
+   * 
+   * Suppose we have an `<input>` element and want to know its `type`.
+   * 
+   * ```html
+   * <input type="text">
+   * ```
+   * 
+   * A decorator can inject string literal `text` like so:
+   * 
+   * ```javascript
+   * @Directive({
+   *   selector: `input'
+   * })
+   * class InputDirective {
+   *   constructor(@Attribute('type') type) {
+   *     // type would be `text` in this example
+   *   }
+   * }
+   * ```
+   * 
+   * @exportedAs angular2/annotations
+   */
+  class AttributeAnnotation extends DependencyAnnotation {
+    
+     attributeName: string;
+    
+     token: void;
+    
+     toString(): string;
+  }
+  
+
+  /**
+   * Defines lifecycle method [onAllChangesDone ] called when the bindings of all its children have
+   * been changed.
+   */
+  interface OnAllChangesDone {
+    
+     onAllChangesDone(): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method [onChange] called after all of component's bound
+   * properties are updated.
+   */
+  interface OnChange {
+    
+     onChange(changes: StringMap<string, any>): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method [onDestroy] called when a directive is being destroyed.
+   */
+  interface OnDestroy {
+    
+     onDestroy(): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method [onInit] called when a directive is being checked the first time.
+   */
+  interface OnInit {
+    
+     onInit(): void;
+  }
+  
+
+  /**
+   * Defines lifecycle method [onCheck] called when a directive is being checked.
+   */
+  interface OnCheck {
+    
+     onCheck(): void;
+  }
+  
+
+  /**
+   * Provides a way for expressing ES6 classes with parameter annotations in ES5.
+   * 
+   * ## Basic Example
+   * 
+   * ```
+   * var Greeter = ng.Class({
+   *   constructor: function(name) {
+   *     this.name = name;
+   *   },
+   * 
+   *   greet: function() {
+   *     alert('Hello ' + this.name + '!');
+   *   }
+   * });
+   * ```
+   * 
+   * is equivalent to ES6:
+   * 
+   * ```
+   * class Greeter {
+   *   constructor(name) {
+   *     this.name = name;
+   *   }
+   * 
+   *   greet() {
+   *     alert('Hello ' + this.name + '!');
+   *   }
+   * }
+   * ```
+   * 
+   * or equivalent to ES5:
+   * 
+   * ```
+   * var Greeter = function (name) {
+   *   this.name = name;
+   * }
+   * 
+   * Greeter.prototype.greet = function () {
+   *   alert('Hello ' + this.name + '!');
+   * }
+   * ```
+   * 
+   * ## Example with parameter annotations
+   * 
+   * ```
+   * var MyService = neg.Class({
+   *   constructor: [String, [new Query(), QueryList], function(name, queryList) {
+   *     ...
+   *   }];
+   * });
+   * ```
+   * 
+   * is equivalent to ES6:
+   * 
+   * ```
+   * class MyService {
+   *   constructor(name: string, @Query() queryList: QueryList) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example with inheritance
+   * 
+   * ```
+   * var Shape = ng.Class({
+   *   constructor: (color) {
+   *     this.color = color;
+   *   }
+   * });
+   * 
+   * var Square = ng.Class({
+   *   extends: Shape,
+   *   constructor: function(color, size) {
+   *     Shape.call(this, color);
+   *     this.size = size;
+   *   }
+   * });
+   * ```
+   */
+  function Class(clsDef: ClassDefinition) : Type ;
+  
+
+  /**
+   * An interface implemented by all Angular parameter decorators, which allows them to be used as ES7
+   * decorators.
+   */
+  interface ParameterDecorator {
+    
+
+    /**
+     * Invoke as ES7 decorator.
+     */
+     (cls: Type, unusedKey: any, index: number): void;
+  
+  }
+  
+
+  /**
+   * <a href='/angular2/angular2.api/Attribute'><code>Attribute</code></a> factory function.
+   */
+  var Attribute : AttributeFactory ;
+  
+
+  /**
+   * <a href='/angular2/angular2.api/Attribute'><code>Attribute</code></a> factory for creating annotations, decorators or DSL.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Attribute, Component, View} from "angular2/angular2";
+   * 
+   * @Component({...})
+   * @View({...})
+   * class MyComponent {
+   *   constructor(@Attribute('title') title: string) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example as ES5 DSL
+   * 
+   * ```
+   * var MyComponent = ng
+   *   .Component({...})
+   *   .View({...})
+   *   .Class({
+   *     constructor: [new ng.Attribute('title'), function(title) {
+   *       ...
+   *     }]
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyComponent = function(title) {
+   *   ...
+   * };
+   * 
+   * MyComponent.annotations = [
+   *   new ng.Component({...})
+   *   new ng.View({...})
+   * ]
+   * MyComponent.parameters = [
+   *   [new ng.Attribute('title')]
+   * ]
+   * ```
+   */
+  interface AttributeFactory {
+    
+     new(name: string): AttributeAnnotation;
+  
+    
+     (name: string): TypeDecorator;
+  
+  }
+  
+
+  /**
+   * <a href='/angular2/angular2.api/Component'><code>Component</code></a> factory function.
+   */
+  var Component : ComponentFactory ;
+  
+  interface ViewArgs {
+    templateUrl?: string;
+    template?: string;
+    directives?: List<Type | any | List<any>>;
+    renderer?: string;
+    styles?: List<string>;
+    styleUrls?: List<string>;
+  }
+  
+  /**
+   * Interface for the <a href='/angular2/angular2.api/Component'><code>Component</code></a> decorator function.
+   * 
+   * See <a href='/angular2/angular2.api/ComponentFactory'><code>ComponentFactory</code></a>.
+   */
+   
+  interface ComponentDecorator extends TypeDecorator {
+    
+
+    /**
+     * Chain <a href='/angular2/angular2.api/View'><code>View</code></a> annotation.
+     */
+     View(obj: ViewArgs): ViewDecorator;
+  }
+  
+  interface ComponentFactoryArgs {
+    selector?: string;
+    properties?: List<string>;
+    events?: List<string>;
+    host?: StringMap<string, string>;
+    lifecycle?: List<LifecycleEvent>;
+    hostInjector?: List<any>;
+    exportAs?: string;
+    compileChildren?: boolean;
+    viewInjector?: List<any>;
+    changeDetection?: string;
+  }
+  
+  /**
+   * <a href='/angular2/angular2.api/ComponentAnnotation'><code>ComponentAnnotation</code></a> factory for creating annotations, decorators or DSL.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Component, View} from "angular2/angular2";
+   * 
+   * @Component({...})
+   * @View({...})
+   * class MyComponent {
+   *   constructor() {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example as ES5 DSL
+   * 
+   * ```
+   * var MyComponent = ng
+   *   .Component({...})
+   *   .View({...})
+   *   .Class({
+   *     constructor: function() {
+   *       ...
+   *     }
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyComponent = function() {
+   *   ...
+   * };
+   * 
+   * MyComponent.annotations = [
+   *   new ng.Component({...})
+   *   new ng.View({...})
+   * ]
+   * ```
+   */
+  interface ComponentFactory {
+    
+    new(obj: ComponentFactoryArgs): ComponentAnnotation;
+    (obj: ComponentFactoryArgs): ComponentDecorator;
+  
+  }
+  
+
+  /**
+   * <a href='/angular2/angular2.api/Directive'><code>Directive</code></a> factory function.
+   */
+  var Directive : DirectiveFactory ;
+  
+
+  /**
+   * Interface for the <a href='/angular2/angular2.api/Directive'><code>Directive</code></a> decorator function.
+   * 
+   * See <a href='/angular2/angular2.api/DirectiveFactory'><code>DirectiveFactory</code></a>.
+   */
+  interface DirectiveDecorator extends TypeDecorator {
+  }
+  
+  interface DirectiveFactoryArgs {
+    selector?: string; 
+    properties?: List<string>; 
+    events?: List<string>;
+    host?: StringMap<string, string>; 
+    lifecycle?: List<LifecycleEvent>;
+    hostInjector?: List<any>;
+    exportAs?: string;
+    compileChildren?: boolean;
+  }
+  /**
+   * <a href='/angular2/angular2.api/Directive'><code>Directive</code></a> factory for creating annotations, decorators or DSL.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Directive} from "angular2/angular2";
+   * 
+   * @Directive({...})
+   * class MyDirective {
+   *   constructor() {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example as ES5 DSL
+   * 
+   * ```
+   * var MyDirective = ng
+   *   .Directive({...})
+   *   .Class({
+   *     constructor: function() {
+   *       ...
+   *     }
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyDirective = function() {
+   *   ...
+   * };
+   * 
+   * MyDirective.annotations = [
+   *   new ng.Directive({...})
+   * ]
+   * ```
+   */
+  interface DirectiveFactory {
+     new(obj: DirectiveFactoryArgs): DirectiveAnnotation;
+     (obj: DirectiveFactoryArgs): DirectiveDecorator;
+  }
+  
+
+  /**
+   * <a href='/angular2/angular2.api/View'><code>View</code></a> factory function.
+   */
+  var View : ViewFactory ;
+  
+  interface ViewDecoratorArgs {
+    templateUrl?: string;
+    template?: string;
+    directives?: List<Type | any | List<any>>;
+    renderer?: string;
+    styles?: List<string>;
+    styleUrls?: List<string>;
+  }
+  
+  /**
+   * Interface for the <a href='/angular2/angular2.api/View'><code>View</code></a> decorator function.
+   * 
+   * See <a href='/angular2/angular2.api/ViewFactory'><code>ViewFactory</code></a>.
+   */
+  interface ViewDecorator extends TypeDecorator {
+    
+
+    /**
+     * Chain <a href='/angular2/angular2.api/View'><code>View</code></a> annotation.
+     */
+     View(obj: ViewDecoratorArgs): ViewDecorator;
+  }
+  
+  interface ViewFactoryArgs {
+    templateUrl?: string;
+    template?: string;
+    directives?: List<Type | any | List<any>>;
+    renderer?: string;
+    styles?: List<string>;
+    styleUrls?: List<string>;
+  }
+  
+  /**
+   * <a href='/angular2/angular2.api/ViewAnnotation'><code>ViewAnnotation</code></a> factory for creating annotations, decorators or DSL.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Component, View} from "angular2/angular2";
+   * 
+   * @Component({...})
+   * @View({...})
+   * class MyComponent {
+   *   constructor() {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example as ES5 DSL
+   * 
+   * ```
+   * var MyComponent = ng
+   *   .Component({...})
+   *   .View({...})
+   *   .Class({
+   *     constructor: function() {
+   *       ...
+   *     }
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyComponent = function() {
+   *   ...
+   * };
+   * 
+   * MyComponent.annotations = [
+   *   new ng.Component({...})
+   *   new ng.View({...})
+   * ]
+   * ```
+   */
+  interface ViewFactory {
+     new(obj: ViewFactoryArgs): ViewAnnotation;
+     (obj: ViewFactoryArgs): ViewDecorator;
+  }
+  
+  interface QueryFactoryOptions {
+    descendants?: boolean;
+  }
+  /**
+   * <a href='/angular2/angular2.api/Query'><code>Query</code></a> factory for creating annotations, decorators or DSL.
+   * 
+   * ## Example as TypeScript Decorator
+   * 
+   * ```
+   * import {Query, QueryList, Component, View} from "angular2/angular2";
+   * 
+   * @Component({...})
+   * @View({...})
+   * class MyComponent {
+   *   constructor(@Query(SomeType) queryList: QueryList) {
+   *     ...
+   *   }
+   * }
+   * ```
+   * 
+   * ## Example as ES5 DSL
+   * 
+   * ```
+   * var MyComponent = ng
+   *   .Component({...})
+   *   .View({...})
+   *   .Class({
+   *     constructor: [new ng.Query(SomeType), function(queryList) {
+   *       ...
+   *     }]
+   *   })
+   * ```
+   * 
+   * ## Example as ES5 annotation
+   * 
+   * ```
+   * var MyComponent = function(queryList) {
+   *   ...
+   * };
+   * 
+   * MyComponent.annotations = [
+   *   new ng.Component({...})
+   *   new ng.View({...})
+   * ]
+   * MyComponent.parameters = [
+   *   [new ng.Query(SomeType)]
+   * ]
+   * ```
+   */
+  interface QueryFactory {
+     new(selector: Type | string, options?: QueryFactoryOptions): QueryAnnotation;  
+     (selector: Type | string, options?: QueryFactoryOptions): ParameterDecorator;
+  }
+  
+
+  /**
+   * Bootstrapping for Angular applications.
+   * 
+   * You instantiate an Angular application by explicitly specifying a component to use as the root
+   * component for your
+   * application via the `bootstrap()` method.
+   * 
+   * ## Simple Example
+   * 
+   * Assuming this `index.html`:
+   * 
+   * ```html
+   * <html>
+   *   <!-- load Angular script tags here. -->
+   *   <body>
+   *     <my-app>loading...</my-app>
+   *   </body>
+   * </html>
+   * ```
+   * 
+   * An application is bootstrapped inside an existing browser DOM, typically `index.html`. Unlike
+   * Angular 1, Angular 2
+   * does not compile/process bindings in `index.html`. This is mainly for security reasons, as well
+   * as architectural
+   * changes in Angular 2. This means that `index.html` can safely be processed using server-side
+   * technologies such as
+   * bindings. Bindings can thus use double-curly `{{ syntax }}` without collision from Angular 2
+   * component double-curly
+   * `{{ syntax }}`.
+   * 
+   * We can use this script code:
+   * 
+   * ```
+   * @Component({
+   *    selector: 'my-app'
+   * })
+   * @View({
+   *    template: 'Hello {{ name }}!'
+   * })
+   * class MyApp {
+   *   name:string;
+   * 
+   *   constructor() {
+   *     this.name = 'World';
+   *   }
+   * }
+   * 
+   * main() {
+   *   return bootstrap(MyApp);
+   * }
+   * ```
+   * 
+   * When the app developer invokes `bootstrap()` with the root component `MyApp` as its argument,
+   * Angular performs the
+   * following tasks:
+   * 
+   *  1. It uses the component's `selector` property to locate the DOM element which needs to be
+   * upgraded into
+   *     the angular component.
+   *  2. It creates a new child injector (from the platform injector). Optionally, you can also
+   * override the injector configuration for an app by
+   * invoking `bootstrap` with the `componentInjectableBindings` argument.
+   *  3. It creates a new `Zone` and connects it to the angular application's change detection domain
+   * instance.
+   *  4. It creates a shadow DOM on the selected component's host element and loads the template into
+   * it.
+   *  5. It instantiates the specified component.
+   *  6. Finally, Angular performs change detection to apply the initial data bindings for the
+   * application.
+   * 
+   * 
+   * ## Instantiating Multiple Applications on a Single Page
+   * 
+   * There are two ways to do this.
+   * 
+   * 
+   * ### Isolated Applications
+   * 
+   * Angular creates a new application each time that the `bootstrap()` method is invoked. When
+   * multiple applications
+   * are created for a page, Angular treats each application as independent within an isolated change
+   * detection and
+   * `Zone` domain. If you need to share data between applications, use the strategy described in the
+   * next
+   * section, "Applications That Share Change Detection."
+   * 
+   * 
+   * ### Applications That Share Change Detection
+   * 
+   * If you need to bootstrap multiple applications that share common data, the applications must
+   * share a common
+   * change detection and zone. To do that, create a meta-component that lists the application
+   * components in its template.
+   * By only invoking the `bootstrap()` method once, with the meta-component as its argument, you
+   * ensure that only a
+   * single change detection zone is created and therefore data can be shared across the applications.
+   * 
+   * 
+   * ## Platform Injector
+   * 
+   * When working within a browser window, there are many singleton resources: cookies, title,
+   * location, and others.
+   * Angular services that represent these resources must likewise be shared across all Angular
+   * applications that
+   * occupy the same browser window.  For this reason, Angular creates exactly one global platform
+   * injector which stores
+   * all shared services, and each angular application injector has the platform injector as its
+   * parent.
+   * 
+   * Each application has its own private injector as well. When there are multiple applications on a
+   * page, Angular treats
+   * each application injector's services as private to that application.
+   * 
+   * 
+   * # API
+   * - `appComponentType`: The root component which should act as the application. This is a reference
+   * to a `Type`
+   *   which is annotated with `@Component(...)`.
+   * - `componentInjectableBindings`: An additional set of bindings that can be added to the app
+   * injector
+   * to override default injection behavior.
+   * - `errorReporter`: `function(exception:any, stackTrace:string)` a default error reporter for
+   * unhandled exceptions.
+   * 
+   * Returns a `Promise` of <a href='/angular2/angular2.api/ApplicationRef'><code>ApplicationRef</code></a>.
+   * 
+   * @exportedAs angular2/core
+   */
+  function bootstrap(appComponentType: Type, componentInjectableBindings?: List<Type | Binding | List<any>>, errorReporter?: Function) : Promise<ApplicationRef> ;
+  
+
+  /**
+   * Represents a Angular's representation of an Application.
+   * 
+   * `ApplicationRef` represents a running application instance. Use it to retrieve the host
+   * component, injector,
+   * or dispose of an application.
+   */
+  class ApplicationRef {
+    
+
+    /**
+     * Returns the current <a href='/angular2/angular2.api/Component'><code>Component</code></a> type.
+     */
+     hostComponentType: Type;
+    
+
+    /**
+     * Returns the current <a href='/angular2/angular2.api/Component'><code>Component</code></a> instance.
+     */
+     hostComponent: any;
+    
+
+    /**
+     * Dispose (un-load) the application.
+     */
+     dispose(): void;
+    
+
+    /**
+     * Returns the root application <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+     */
+     injector: Injector;
+  }
+  
+
+  /**
+   * An opaque token representing the application root type in the <a href='/angular2/angular2.api/Injector'><code>Injector</code></a>.
+   * 
+   * ```
+   * @Component(...)
+   * @View(...)
+   * class MyApp {
+   *   ...
+   * }
+   * 
+   * bootstrap(MyApp).then((appRef:ApplicationRef) {
+   *   expect(appRef.injector.get(appComponentTypeToken)).toEqual(MyApp);
+   * });
+   * 
+   * ```
+   */
+  var appComponentTypeToken:any;
+  
+
+  /**
+   * Specifies app root url for the application.
+   * 
+   * Used by the <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a> when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a>
+   */
+  class AppRootUrl {
+    
+
+    /**
+     * Returns the base URL of the currently running application.
+     */
+     value: void;
+  }
+  
+
+  /**
+   * Used by the <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a> when resolving HTML and CSS template URLs.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a>
+   */
+  class UrlResolver {
+    
+
+    /**
+     * Resolves the `url` given the `baseUrl`:
+     * - when the `url` is null, the `baseUrl` is returned,
+     * - if `url` is relative ('path/to/here', './path/to/here'), the resolved url is a combination of
+     * `baseUrl` and `url`,
+     * - if `url` is absolute (it has a scheme: 'http://', 'https://' or start with '/'), the `url` is
+     * returned as is (ignoring the `baseUrl`)
+     * 
+     * @param {string} baseUrl
+     * @param {string} url
+     * @returns {string} the resolved URL
+     */
+     resolve(baseUrl: string, url: string): string;
+  }
+  
+
+  /**
+   * Resolve a <a href='/angular2/src/facade/lang/Type'><code>Type</code></a> from a <a href='/angular2/angular2.api/Component'><code>Component</code></a> into a URL.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a>
+   */
+  class ComponentUrlMapper {
+    
+
+    /**
+     * Returns the base URL to the component source file.
+     * The returned URL could be:
+     * - an absolute URL,
+     * - a path relative to the application
+     */
+     getUrl(component: Type): string;
+  }
+  
+
+  /**
+   * Resolve a <a href='/angular2/src/facade/lang/Type'><code>Type</code></a> for <a href='/angular2/angular2.api/Directive'><code>Directive</code></a>.
+   * 
+   * This interface can be overridden by the application developer to create custom behavior.
+   * 
+   * See <a href='/angular2/angular2.api/Compiler'><code>Compiler</code></a>
+   */
+  class DirectiveResolver {
+    
+
+    /**
+     * Return <a href='/angular2/angular2.api/Directive'><code>Directive</code></a> for a given <a href='/angular2/src/facade/lang/Type'><code>Type</code></a>.
+     */
+     resolve(type: Type): DirectiveAnnotation;
+  }
+  
+
+  /**
+   * ## URL Resolution
+   * 
+   * ```
+   * var appRootUrl: AppRootUrl = ...;
+   * var componentUrlMapper: ComponentUrlMapper = ...;
+   * var urlResolver: UrlResolver = ...;
+   * 
+   * var componentType: Type = ...;
+   * var componentAnnotation: ComponentAnnotation = ...;
+   * var viewAnnotation: ViewAnnotation = ...;
+   * 
+   * // Resolving a URL
+   * 
+   * var url = viewAnnotation.templateUrl;
+   * var componentUrl = componentUrlMapper.getUrl(componentType);
+   * var componentResolvedUrl = urlResolver.resolve(appRootUrl.value, componentUrl);
+   * var templateResolvedUrl = urlResolver.resolve(componetResolvedUrl, url);
+   * ```
+   * 
+   * @exportedAs angular2/view
+   */
+  class Compiler {
+    
+     compileInHost(componentTypeOrBinding: Type | Binding): Promise<ProtoViewRef>;
+  }
+  
+
+  /**
+   * Entry point for creating, moving views in the view hierarchy and destroying views.
+   * This manager contains all recursion and delegates to helper methods
+   * in AppViewManagerUtils and the Renderer, so unit tests get simpler.
+   */
+  class AppViewManager {
+    
+
+    /**
+     * Returns associated Component <a href='/angular2/angular2.api/ViewRef'><code>ViewRef</code></a> from <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a>.
+     * 
+     * If an <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a> is from an element which has a component, this method returns
+     * the component's <a href='/angular2/angular2.api/ViewRef'><code>ViewRef</code></a>.
+     */
+     getComponentView(hostLocation: ElementRef): ViewRef;
+    
+
+    /**
+     * Returns a <a href='/angular2/angular2.api/ViewContainerRef'><code>ViewContainerRef</code></a> at the <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a> location.
+     */
+     getViewContainer(location: ElementRef): ViewContainerRef;
+    
+
+    /**
+     * Return the first child element of the host element view.
+     */
+     getHostElement(hostViewRef: ViewRef): ElementRef;
+    
+
+    /**
+     * Returns an ElementRef for the element with the given variable name
+     * in the current view.
+     * 
+     * - `hostLocation`: <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a> of any element in the View which defines the scope of
+     *   search.
+     * - `variableName`: Name of the variable to locate.
+     * - Returns <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a> of the found element or null. (Throws if not found.)
+     */
+     getNamedElementInComponentView(hostLocation: ElementRef, variableName: string): ElementRef;
+    
+
+    /**
+     * Returns the component instance for a given element.
+     * 
+     * The component is the execution context as seen by an expression at that <a href='/angular2/angular2.api/ElementRef'><code>ElementRef</code></a>
+     * location.
+     */
+     getComponent(hostLocation: ElementRef): any;
+    
+
+    /**
+     * Load component view into existing element.
+     * 
+     * Use this if a host element is already in the DOM and it is necessary to upgrade
+     * the element into Angular component by attaching a view but reusing the existing element.
+     * 
+     * - `hostProtoViewRef`: <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a> Proto view to use in creating a view for this
+     *   component.
+     * - `overrideSelector`: (optional) selector to use in locating the existing element to load
+     *   the view into. If not specified use the selector in the component definition of the
+     *   `hostProtoView`.
+     * - injector: <a href='/angular2/angular2.api/Injector'><code>Injector</code></a> to use as parent injector for the view.
+     * 
+     * See <a href='/angular2/angular2.api/AppViewManager#destroyRootHostView'><code>AppViewManager</code></a>.
+     * 
+     * ## Example
+     * 
+     * ```
+     * @ng.Component({
+     *   selector: 'child-component'
+     * })
+     * @ng.View({
+     *   template: 'Child'
+     * })
+     * class ChildComponent {
+     * 
+     * }
+     * 
+     * @ng.Component({
+     *   selector: 'my-app'
+     * })
+     * @ng.View({
+     *   template: `
+     *     Parent (<some-component></some-component>)
+     *   `
+     * })
+     * class MyApp {
+     *   viewRef: ng.ViewRef;
+     * 
+     *   constructor(public appViewManager: ng.AppViewManager, compiler: ng.Compiler) {
+     *     compiler.compileInHost(ChildComponent).then((protoView: ng.ProtoViewRef) => {
+     *       this.viewRef = appViewManager.createRootHostView(protoView, 'some-component', null);
+     *     })
+     *   }
+     * 
+     *   onDestroy() {
+     *     this.appViewManager.destroyRootHostView(this.viewRef);
+     *     this.viewRef = null;
+     *   }
+     * }
+     * 
+     * ng.bootstrap(MyApp);
+     * ```
+     */
+     createRootHostView(hostProtoViewRef: ProtoViewRef, overrideSelector: string, injector: Injector): ViewRef;
+    
+
+    /**
+     * Remove the View created with <a href='/angular2/angular2.api/AppViewManager#createRootHostView'><code>AppViewManager</code></a>.
+     */
+     destroyRootHostView(hostViewRef: ViewRef): void;
+    
+
+    /**
+     * See <a href='/angular2/angular2.api/AppViewManager#destroyViewInContainer'><code>AppViewManager</code></a>.
+     */
+     createViewInContainer(viewContainerLocation: ElementRef, atIndex: number, protoViewRef: ProtoViewRef, context?: ElementRef, bindings?: ResolvedBinding[]): ViewRef;
+    
+
+    /**
+     * See <a href='/angular2/angular2.api/AppViewManager#createViewInContainer'><code>AppViewManager</code></a>.
+     */
+     destroyViewInContainer(viewContainerLocation: ElementRef, atIndex: number): void;
+    
+
+    /**
+     * See <a href='/angular2/angular2.api/AppViewManager#detachViewInContainer'><code>AppViewManager</code></a>.
+     */
+     attachViewInContainer(viewContainerLocation: ElementRef, atIndex: number, viewRef: ViewRef): ViewRef;
+    
+
+    /**
+     * See <a href='/angular2/angular2.api/AppViewManager#attachViewInContainer'><code>AppViewManager</code></a>.
+     */
+     detachViewInContainer(viewContainerLocation: ElementRef, atIndex: number): ViewRef;
+  }
+  
+
+  /**
+   * An iterable live list of components in the Light DOM.
+   * 
+   * Injectable Objects that contains a live list of child directives in the light DOM of a directive.
+   * The directives are kept in depth-first pre-order traversal of the DOM.
+   * 
+   * The `QueryList` is iterable, therefore it can be used in both javascript code with `for..of` loop
+   * as well as in
+   * template with `*ng-for="of"` directive.
+   * 
+   * NOTE: In the future this class will implement an `Observable` interface. For now it uses a plain
+   * list of observable
+   * callbacks.
+   * 
+   * # Example:
+   * 
+   * Assume that `<tabs>` component would like to get a list its children which are `<pane>`
+   * components as shown in this
+   * example:
+   * 
+   * ```html
+   * <tabs>
+   *   <pane title="Overview">...</pane>
+   *   <pane *ng-for="#o of objects" [title]="o.title">{{o.text}}</pane>
+   * </tabs>
+   * ```
+   * 
+   * In the above example the list of `<tabs>` elements needs to get a list of `<pane>` elements so
+   * that it could render
+   * tabs with the correct titles and in the correct order.
+   * 
+   * A possible solution would be for a `<pane>` to inject `<tabs>` component and then register itself
+   * with `<tabs>`
+   * component's on `hydrate` and deregister on `dehydrate` event. While a reasonable approach, this
+   * would only work
+   * partialy since `*ng-for` could rearrange the list of `<pane>` components which would not be
+   * reported to `<tabs>`
+   * component and thus the list of `<pane>` components would be out of sync with respect to the list
+   * of `<pane>` elements.
+   * 
+   * A preferred solution is to inject a `QueryList` which is a live list of directives in the
+   * component`s light DOM.
+   * 
+   * ```javascript
+   * @Component({
+   *   selector: 'tabs'
+   * })
+   * @View({
+   *  template: `
+   *    <ul>
+   *      <li *ng-for="#pane of panes">{{pane.title}}</li>
+   *    </ul>
+   *    <content></content>
+   *  `
+   * })
+   * class Tabs {
+   *   panes: QueryList<Pane>
+   * 
+   *   constructor(@Query(Pane) panes:QueryList<Pane>) {
+   *     this.panes = panes;
+   *   }
+   * }
+   * 
+   * @Component({
+   *   selector: 'pane',
+   *   properties: ['title']
+   * })
+   * @View(...)
+   * class Pane {
+   *   title:string;
+   * }
+   * ```
+   * 
+   * @exportedAs angular2/view
+   */
+  class QueryList<T> extends BaseQueryList<T> {
+    
+     onChange(callback: any): void;
+    
+     removeCallback(callback: any): void;
+  }
+  
+
+  /**
+   * Reference to the element.
+   * 
+   * Represents an opeque refference to the underlying element. The element is a DOM ELement in
+   * a Browser, but may represent other types on other rendering platforms. In the browser the
+   * `ElementRef` can be sent to the web-worker. Web Workers can not have references to the
+   * DOM Elements.
+   * 
+   * @exportedAs angular2/view
+   */
+  class ElementRef implements RenderElementRef {
+    
+
+    /**
+     * Reference to the <a href='/angular2/angular2.api/ViewRef'><code>ViewRef</code></a> where the `ElementRef` is inside of.
+     */
+     parentView: ViewRef;
+    
+
+    /**
+     * Index of the element inside the <a href='/angular2/angular2.api/ViewRef'><code>ViewRef</code></a>.
+     * 
+     * This is used internally by the Angular framework to locate elements.
+     */
+     boundElementIndex: number;
+    
+     renderView: RenderViewRef;
+    
+
+    /**
+     * Returns the native Element implementation.
+     * 
+     * In the browser this represents the DOM Element.
+     * 
+     * The `nativeElement` can be used as an escape hatch when direct DOM manipulation is needed. Use
+     * this with caution, as it creates tight coupling between your application and the Browser, which
+     * will not work in WebWorkers.
+     * 
+     * NOTE: This method will return null in the webworker scenario!
+     */
+     nativeElement: any;
+  }
+  
+
+  /**
+   * Abstract reference to the element which can be marshaled across web-worker boundry.
+   * 
+   * This interface is used by the <a href='/angular2/angular2.api/Renderer'><code>Renderer</code></a> api.
+   */
+  interface RenderElementRef {
+    
+
+    /**
+     * Reference to the <a href='/angular2/angular2.api/RenderViewRef'><code>RenderViewRef</code></a> where the `RenderElementRef` is inside of.
+     */
+     renderView: RenderViewRef;
+    
+
+    /**
+     * Index of the element inside the <a href='/angular2/angular2.api/ViewRef'><code>ViewRef</code></a>.
+     * 
+     * This is used internally by the Angular framework to locate elements.
+     */
+     boundElementIndex: number;
+  }
+  
+
+  /**
+   * A reference to an Angular View.
+   * 
+   * A View is a fundemental building block of Application UI. A View is the smallest set of
+   * elements which are created and destroyed together. A View can chane properties on the elements
+   * within the view, but it can not change the structure of those elements.
+   * 
+   * To change structure of the elements, the Views can contain zero or more <a href='/angular2/angular2.api/ViewContainerRef'><code>ViewContainerRef</code></a>s
+   * which allow the views to be nested.
+   * 
+   * ## Example
+   * 
+   * Given this template
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * The above example we have two <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>s:
+   * 
+   * Outter <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separet <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>s.
+   * 
+   * The outter/inner <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>s are then assambled into views like so:
+   * 
+   * ```
+   * <!-- ViewRef: outter-0 -->
+   * Count: 2
+   * <ul>
+   *   <template view-container-ref></template>
+   *   <!-- ViewRef: inner-1 --><li>first</li><!-- /ViewRef: inner-1 -->
+   *   <!-- ViewRef: inner-2 --><li>second</li><!-- /ViewRef: inner-2 -->
+   * </ul>
+   * <!-- /ViewRef: outter-0 -->
+   * ```
+   * 
+   * @exportedAs angular2/view
+   */
+  class ViewRef {
+    
+
+    /**
+     * Return <a href='/angular2/angular2.api/RenderViewRef'><code>RenderViewRef</code></a>
+     */
+     render: RenderViewRef;
+    
+
+    /**
+     * Set local variable for a view.
+     */
+     setLocal(contextName: string, value: any): void;
+  }
+  
+
+  /**
+   * A reference to an an Angular ProtoView.
+   * 
+   * A ProtoView is a reference to a template for easy creation of views.
+   * (See <a href='/angular2/angular2.api/AppViewManager#createViewInContainer'><code>AppViewManager</code></a> and <a href='/angular2/angular2.api/AppViewManager#createRootHostView'><code>AppViewManager</code></a>).
+   * 
+   * A `ProtoView` is a foctary for creating `View`s.
+   * 
+   * ## Example
+   * 
+   * Given this template
+   * 
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <li *ng-for="var item of items">{{item}}</li>
+   * </ul>
+   * ```
+   * 
+   * The above example we have two <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>s:
+   * 
+   * Outter <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>:
+   * ```
+   * Count: {{items.length}}
+   * <ul>
+   *   <template ng-for var-item [ng-for-of]="items"></template>
+   * </ul>
+   * ```
+   * 
+   * Inner <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>:
+   * ```
+   *   <li>{{item}}</li>
+   * ```
+   * 
+   * Notice that the original template is broken down into two separet <a href='/angular2/angular2.api/ProtoViewRef'><code>ProtoViewRef</code></a>s.
+   * 
+   * @exportedAs angular2/view
+   */
+  class ProtoViewRef {
+  }
+  
+
+  /**
+   * @exportedAs angular2/core
+   */
+  class ViewContainerRef {
+    
+     viewManager: AppViewManager;
+    
+     element: ElementRef;
+    
+     clear(): void;
+    
+     get(index: number): ViewRef;
+    
+     length: number;
+    
+     create(protoViewRef?: ProtoViewRef, atIndex?: number, context?: ElementRef, bindings?: ResolvedBinding[]): ViewRef;
+    
+     insert(viewRef: ViewRef, atIndex?: number): ViewRef;
+    
+     indexOf(viewRef: ViewRef): number;
+    
+     remove(atIndex?: number): void;
+    
+
+    /**
+     * The method can be used together with insert to implement a view move, i.e.
+     * moving the dom nodes while the directives in the view stay intact.
+     */
+     detach(atIndex?: number): ViewRef;
+  }
+  
+
+  /**
+   * Service for dynamically loading a Component into an arbitrary position in the internal Angular
+   * application tree.
+   * 
+   * @exportedAs angular2/view
+   */
+  class DynamicComponentLoader {
+    
+
+    /**
+     * Loads a root component that is placed at the first element that matches the component's
+     * selector.
+     * 
+     * The loaded component receives injection normally as a hosted view.
+     */
+     loadAsRoot(typeOrBinding: Type | Binding, overrideSelector: string, injector: Injector): Promise<ComponentRef>;
+    
+
+    /**
+     * Loads a component into the component view of the provided ElementRef
+     * next to the element with the given name
+     * The loaded component receives
+     * injection normally as a hosted view.
+     */
+     loadIntoLocation(typeOrBinding: Type | Binding, hostLocation: ElementRef, anchorName: string, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+    
+
+    /**
+     * Loads a component next to the provided ElementRef. The loaded component receives
+     * injection normally as a hosted view.
+     */
+     loadNextToLocation(typeOrBinding: Type | Binding, location: ElementRef, bindings?: ResolvedBinding[]): Promise<ComponentRef>;
+  }
+  
+
+  /**
+   * @exportedAs angular2/view
+   */
+  class ComponentRef {
+    
+     location: ElementRef;
+    
+     instance: any;
+    
+     dispose: Function;
+    
+     hostView: ViewRef;
+  }
+  
+  interface NgZoneArgs {
+    onTurnStart?: /*() => void*/ Function;
+    onTurnDone?: /*() => void*/ Function;
+    onErrorHandler?: /*(error, stack) => void*/ Function;
   }
 
-  interface ComponentTypeDecorator extends  TypeDecorator {
-    View(obj: ViewArgs): ViewTypeDecorator;
+  /**
+   * A wrapper around zones that lets you schedule tasks after it has executed a task.
+   * 
+   * The wrapper maintains an "inner" and an "mount" `Zone`. The application code will executes
+   * in the "inner" zone unless `runOutsideAngular` is explicitely called.
+   * 
+   * A typical application will create a singleton `NgZone`. The outer `Zone` is a fork of the root
+   * `Zone`. The default `onTurnDone` runs the Angular change detection.
+   * 
+   * @exportedAs angular2/core
+   */
+  class NgZone {
+    
+
+  /**
+   * Initializes the zone hooks.
+   * 
+   * @param {() => void} onTurnStart called before code executes in the inner zone for each VM turn
+   * @param {() => void} onTurnDone called at the end of a VM turn if code has executed in the inner
+   * zone
+   * @param {(error, stack) => void} onErrorHandler called when an exception is thrown by a macro or
+   * micro task
+   */
+  initCallbacks(args?: NgZoneArgs): void;
+    
+
+    /**
+     * Runs `fn` in the inner zone and returns whatever it returns.
+     * 
+     * In a typical app where the inner zone is the Angular zone, this allows one to make use of the
+     * Angular's auto digest mechanism.
+     * 
+     * ```
+     * var zone: NgZone = [ref to the application zone];
+     * 
+     * zone.run(() => {
+     *   // the change detection will run after this function and the microtasks it enqueues have
+     * executed.
+     * });
+     * ```
+     */
+     run(fn: any): any;
+    
+
+    /**
+     * Runs `fn` in the outer zone and returns whatever it returns.
+     * 
+     * In a typical app where the inner zone is the Angular zone, this allows one to escape Angular's
+     * auto-digest mechanism.
+     * 
+     * ```
+     * var zone: NgZone = [ref to the application zone];
+     * 
+     * zone.runOusideAngular(() => {
+     *   element.onClick(() => {
+     *     // Clicking on the element would not trigger the change detection
+     *   });
+     * });
+     * ```
+     */
+     runOutsideAngular(fn: any): any;
   }
-
-  interface ViewTypeDecorator extends  TypeDecorator {
-    View(obj: ViewArgs): ViewTypeDecorator;
+  
+  class Observable {
+    
+     observer(generator: any): Object;
   }
+  
 
-  var Component: any;
+  /**
+   * Use Rx.Observable but provides an adapter to make it work as specified here:
+   * https://github.com/jhusain/observable-spec
+   * 
+   * Once a reference implementation of the spec is available, switch to it.
+   */
+  class EventEmitter extends Observable {
+    
+     observer(generator: any): Rx.IDisposable;
+    
+     toRx(): Rx.Observable<any>;
+    
+     next(value: any): void;
+    
+     throw(error: any): void;
+    
+     return(value?: any): void;
+  }
+  
+  class ProtoViewFactory {
+    
+     createAppProtoViews(hostComponentBinding: DirectiveBinding, rootRenderProtoView:ProtoViewDto, allDirectives: List<DirectiveBinding>): List<AppProtoView>;
+  }
+  
+  class RenderCompiler {
+    
 
-  var View: any;
+    /**
+     * Creats a ProtoViewDto that contains a single nested component with the given componentId.
+     */
+     compileHost(directiveMetadata: DirectiveMetadata): Promise<ProtoViewDto>;
+    
 
-  var Self: any;
-
-  var Parent: any;
-
-  var Ancestor: any;
-
-  var Unbounded: any;
-
-  var Attribute: any;
+    /**
+     * Compiles a single DomProtoView. Non recursive so that
+     * we don't need to serialize all possible components over the wire,
+     * but only the needed ones based on previous calls.
+     */
+     compile(view: ViewDefinition): Promise<ProtoViewDto>;
+  }
+  
 
+  /**
+   * Cache that stores the AppProtoView of the template of a component.
+   * Used to prevent duplicate work and resolve cyclic dependencies.
+   */
+  class CompilerCache {
+    
+     set(component: Type, protoView: AppProtoView): void;
+    
+     get(component: Type): AppProtoView;
+    
+     setHost(component: Type, protoView: AppProtoView): void;
+    
+     getHost(component: Type): AppProtoView;
+    
+     clear(): void;
+  }
+  
 
   /**
    * A collection of the Angular core directives that are likely to be used in each and every Angular
    * application.
-   *
+   * 
    * This collection can be used to quickly enumerate all the built-in directives in the `@View`
    * annotation. For example,
    * instead of writing:
-   *
+   * 
    * ```
    * import {If, NgFor, NgSwitch, NgSwitchWhen, NgSwitchDefault} from 'angular2/angular2';
    * import {OtherDirective} from 'myDirectives';
-   *
+   * 
    * @Component({
    *  selector: 'my-component'
    * })
@@ -4678,11 +4946,11 @@ declare module "angular2/angular2" {
    * }
    * ```
    * one could enumerate all the core directives at once:
-   *
+   * 
    * ```
    * import {coreDirectives} from 'angular2/angular2';
    * import {OtherDirective} from 'myDirectives';
-   *
+   * 
    * @Component({
    *  selector: 'my-component'
    * })
@@ -4696,29 +4964,31 @@ declare module "angular2/angular2" {
    * ```
    */
   var coreDirectives : List<Type> ;
-
+  
   class CSSClass {
-    rawClass: any;
-    onCheck(): void;
+    
+     rawClass: void;
+    
+     onCheck(): void;
   }
-
+  
 
   /**
    * The `NgFor` directive instantiates a template once per item from an iterable. The context for
    * each instantiated template inherits from the outer context with the given loop variable set
    * to the current item from the iterable.
-   *
+   * 
    * It is possible to alias the `index` to a local variable that will be set to the current loop
    * iteration in the template context.
-   *
+   * 
    * When the contents of the iterator changes, `NgFor` makes the corresponding changes to the DOM:
-   *
+   * 
    * * When an item is added, a new instance of the template is added to the DOM.
    * * When an item is removed, its template instance is removed from the DOM.
    * * When items are reordered, their respective templates are reordered in the DOM.
-   *
+   * 
    * # Example
-   *
+   * 
    * ```
    * <ul>
    *   <li *ng-for="#error of errors; #i = index">
@@ -4726,32 +4996,37 @@ declare module "angular2/angular2" {
    *   </li>
    * </ul>
    * ```
-   *
+   * 
    * # Syntax
-   *
+   * 
    * - `<li *ng-for="#item of items; #i = index">...</li>`
    * - `<li template="ng-for #item of items; #i = index">...</li>`
-   * - `<template [ng-for] #item [ng-for-of]="items" #i="index"><li>...</li></template>`
-   *
+   * - `<template ng-for #item [ng-for-of]="items" #i="index"><li>...</li></template>`
+   * 
    * @exportedAs angular2/directives
    */
   class NgFor {
-    viewContainer: ViewContainerRef;
-    protoViewRef: ProtoViewRef;
-    pipes: PipeRegistry;
-    ngForOf: any;
-    onCheck(): any;
+    
+     viewContainer: ViewContainerRef;
+    
+     protoViewRef: ProtoViewRef;
+    
+     pipes: PipeRegistry;
+    
+     ngForOf: void;
+    
+     onCheck(): void;
   }
-
+  
 
   /**
    * Removes or recreates a portion of the DOM tree based on an {expression}.
-   *
+   * 
    * If the expression assigned to `ng-if` evaluates to a false value then the element
    * is removed from the DOM, otherwise a clone of the element is reinserted into the DOM.
-   *
+   * 
    * # Example:
-   *
+   * 
    * ```
    * <div *ng-if="errorCount > 0" class="error">
    *   <!-- Error message displayed when the errorCount property on the current context is greater
@@ -4759,53 +5034,66 @@ declare module "angular2/angular2" {
    *   {{errorCount}} errors detected
    * </div>
    * ```
-   *
+   * 
    * # Syntax
-   *
+   * 
    * - `<div *ng-if="condition">...</div>`
    * - `<div template="ng-if condition">...</div>`
    * - `<template [ng-if]="condition"><div>...</div></template>`
-   *
+   * 
    * @exportedAs angular2/directives
    */
   class NgIf {
-    viewContainer: ViewContainerRef;
-    protoViewRef: ProtoViewRef;
-    prevCondition: boolean;
-    ngIf: any;
+    
+     viewContainer: ViewContainerRef;
+    
+     protoViewRef: ProtoViewRef;
+    
+     prevCondition: boolean;
+    
+     ngIf: void;
   }
-
+  
 
   /**
    * The `NgNonBindable` directive tells Angular not to compile or bind the contents of the current
    * DOM element. This is useful if the element contains what appears to be Angular directives and
    * bindings but which should be ignored by Angular. This could be the case if you have a site that
    * displays snippets of code, for instance.
-   *
+   * 
    * Example:
-   *
+   * 
    * ```
    * <div>Normal: {{1 + 2}}</div> // output "Normal: 3"
    * <div non-bindable>Ignored: {{1 + 2}}</div> // output "Ignored: {{1 + 2}}"
    * ```
-   *
+   * 
    * @exportedAs angular2/directives
    */
   class NgNonBindable {
   }
-
-  class SwitchView {
-    create(): any;
-    destroy(): any;
+  
+  class NgStyle {
+    
+     rawStyle: void;
+    
+     onCheck(): void;
   }
-
+  
+  class SwitchView {
+    
+     create(): void;
+    
+     destroy(): void;
+  }
+  
 
   /**
    * The `NgSwitch` directive is used to conditionally swap DOM structure on your template based on a
    * scope expression.
    * Elements within `NgSwitch` but without `NgSwitchWhen` or `NgSwitchDefault` directives will be
    * preserved at the location as specified in the template.
-   *
+   * 
    * `NgSwitch` simply chooses nested elements and makes them visible based on which element matches
    * the value obtained from the evaluated expression. In other words, you define a container element
    * (where you place the directive), place an expression on the **`[ng-switch]="..."` attribute**),
@@ -4814,102 +5102,105 @@ declare module "angular2/angular2" {
    * The when attribute is used to inform NgSwitch which element to display when the expression is
    * evaluated. If a matching expression is not found via a when attribute then an element with the
    * default attribute is displayed.
-   *
+   * 
    * # Example:
-   *
+   * 
    * ```
    * <ANY [ng-switch]="expression">
    *   <template [ng-switch-when]="whenExpression1">...</template>
    *   <template [ng-switch-when]="whenExpression1">...</template>
-   *   <template [ng-switch-default]>...</template>
+   *   <template ng-switch-default>...</template>
    * </ANY>
    * ```
-   *
+   * 
    * @exportedAs angular2/directives
    */
   class NgSwitch {
-    ngSwitch: any;
+    
+     ngSwitch: void;
   }
-
+  
 
   /**
    * Defines a case statement as an expression.
-   *
+   * 
    * If multiple `NgSwitchWhen` match the `NgSwitch` value, all of them are displayed.
-   *
+   * 
    * Example:
-   *
+   * 
    * ```
    * // match against a context variable
    * <template [ng-switch-when]="contextVariable">...</template>
-   *
+   * 
    * // match against a constant string
-   * <template [ng-switch-when]="'stringValue'">...</template>
+   * <template ng-switch-when="stringValue">...</template>
    * ```
-   *
+   * 
    * @exportedAs angular2/directives
    */
   class NgSwitchWhen {
-    onDestroy(): any;
-    ngSwitchWhen: any;
+    
+     onDestroy(): void;
+    
+     ngSwitchWhen: void;
   }
-
+  
 
   /**
    * Defines a default case statement.
-   *
+   * 
    * Default case statements are displayed when no `NgSwitchWhen` match the `ng-switch` value.
-   *
+   * 
    * Example:
-   *
+   * 
    * ```
-   * <template [ng-switch-default]>...</template>
+   * <template ng-switch-default>...</template>
    * ```
-   *
+   * 
    * @exportedAs angular2/directives
    */
   class NgSwitchDefault {
   }
-
+  
 
   /**
-   * Connection class used by MockBackend
-   *
-   * This class is typically not instantiated directly, but instances can be retrieved by subscribing
-   * to the `connections` Observable of
-   * <a href='/angular2/angular2/MockBackend'><code>MockBackend</code></a> in order to mock responses to requests.
+   * Mock Connection to represent a <a href='/angular2/angular2.api/Connection'><code>Connection</code></a> for tests.
    */
-  class MockConnection implements  Connection {
+  class MockConnection {
+    
 
     /**
      * Describes the state of the connection, based on `XMLHttpRequest.readyState`, but with
      * additional states. For example, state 5 indicates an aborted connection.
      */
-    readyState: ReadyStates;
+     readyState: ReadyStates;
+    
 
     /**
-     * <a href='/angular2/angular2/Request'><code>Request</code></a> instance used to create the connection.
+     * <a href='/angular2/angular2.api/Request'><code>Request</code></a> instance used to create the connection.
      */
-    request: Request;
+     request: Request;
+    
 
     /**
-     * [RxJS
-     * Observable](https://github.com/Reactive-Extensions/RxJS/blob/master/doc/api/core/observable.md)
-     * of <a href='/angular2/angular2/Response'><code>Response</code></a>. Can be subscribed to in order to be notified when a response is available.
+     * <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> of <a href='/angular2/angular2.api/Response'><code>Response</code></a>. Can be subscribed to in order to be notified when a
+     * response is available.
      */
-    response: Rx.Subject<Response>;
+     response: EventEmitter;
+    
 
     /**
      * Changes the `readyState` of the connection to a custom state of 5 (cancelled).
      */
-    dispose(): any;
+     dispose(): void;
+    
 
     /**
      * Sends a mock response to the connection. This response is the value that is emitted to the
-     * `Observable` returned by <a href='/angular2/angular2/Http'><code>Http</code></a>.
-     *
+     * <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> returned by <a href='/angular2/angular2.api/Http'><code>Http</code></a>.
+     * 
      * #Example
-     *
+     * 
      * ```
      * var connection;
      * backend.connections.subscribe(c => connection = c);
@@ -4917,32 +5208,35 @@ declare module "angular2/angular2" {
      * connection.mockRespond(new Response('fake response')); //logs 'fake response'
      * ```
      */
-    mockRespond(res: Response): any;
+     mockRespond(res: Response): void;
+    
 
     /**
      * Not yet implemented!
-     *
-     * Sends the provided <a href='/angular2/angular2/Response'><code>Response</code></a> to the `downloadObserver` of the `Request`
+     * 
+     * Sends the provided <a href='/angular2/angular2.api/Response'><code>Response</code></a> to the `downloadObserver` of the `Request`
      * associated with this connection.
      */
-    mockDownload(res: Response): any;
+     mockDownload(res: Response): void;
+    
 
     /**
-     * Emits the provided error object as an error to the <a href='/angular2/angular2/Response'><code>Response</code></a> observable returned
-     * from <a href='/angular2/angular2/Http'><code>Http</code></a>.
+     * Emits the provided error object as an error to the <a href='/angular2/angular2.api/Response'><code>Response</code></a> <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a>
+     * returned
+     * from <a href='/angular2/angular2.api/Http'><code>Http</code></a>.
      */
-    mockError(err?: any): any;
+     mockError(err?: any): void;
   }
-
+  
 
   /**
-   * A mock backend for testing the <a href='/angular2/angular2/Http'><code>Http</code></a> service.
-   *
+   * A mock backend for testing the <a href='/angular2/angular2.api/Http'><code>Http</code></a> service.
+   * 
    * This class can be injected in tests, and should be used to override bindings
-   * to other backends, such as <a href='/angular2/angular2/XHRBackend'><code>XHRBackend</code></a>.
-   *
+   * to other backends, such as <a href='/angular2/angular2.api/XHRBackend'><code>XHRBackend</code></a>.
+   * 
    * #Example
-   *
+   * 
    * ```
    * import {MockBackend, DefaultOptions, Http} from 'angular2/http';
    * it('should get some data', inject([AsyncTestCompleter], (async) => {
@@ -4963,23 +5257,23 @@ declare module "angular2/angular2" {
    *   connection.mockRespond(new Response('awesome'));
    * }));
    * ```
-   *
+   * 
    * This method only exists in the mock implementation, not in real Backends.
    */
-  class MockBackend implements  ConnectionBackend {
+  class MockBackend {
+    
 
     /**
-     * [RxJS
-     * Subject](https://github.com/Reactive-Extensions/RxJS/blob/master/doc/api/subjects/subject.md)
-     * of <a href='/angular2/angular2/MockConnection'><code>MockConnection</code></a> instances that have been created by this backend. Can be subscribed
+     * <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a>
+     * of <a href='/angular2/angular2.api/MockConnection'><code>MockConnection</code></a> instances that have been created by this backend. Can be subscribed
      * to in order to respond to connections.
-     *
+     * 
      * #Example
-     *
+     * 
      * ```
      * import {MockBackend, Http, BaseRequestOptions} from 'angular2/http';
      * import {Injector} from 'angular2/di';
-     *
+     * 
      * it('should get a response', () => {
      *   var connection; //this will be set when a new connection is emitted from the backend.
      *   var text; //this will be set from mock response
@@ -4994,297 +5288,417 @@ declare module "angular2/angular2" {
      *   http.request('something.json').subscribe(res => {
      *     text = res.text();
      *   });
-     *   connection.mockRespond(new Response('Something'));
+     *   connection.mockRespond(new Response({body: 'Something'}));
      *   expect(text).toBe('Something');
      * });
      * ```
-     *
+     * 
      * This property only exists in the mock implementation, not in real Backends.
      */
-    connections: Rx.Subject<MockConnection>;
+     connections: EventEmitter;
+    
 
     /**
      * An array representation of `connections`. This array will be updated with each connection that
      * is created by this backend.
-     *
+     * 
      * This property only exists in the mock implementation, not in real Backends.
      */
-    connectionsArray: Array<MockConnection>;
+     connectionsArray: Array<MockConnection>;
+    
 
     /**
-     * [Observable](https://github.com/Reactive-Extensions/RxJS/blob/master/doc/api/core/observable.md)
-     * of <a href='/angular2/angular2/MockConnection'><code>MockConnection</code></a> instances that haven't yet been resolved (i.e. with a `readyState`
+     * <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> of <a href='/angular2/angular2.api/MockConnection'><code>MockConnection</code></a> instances that haven't yet been resolved (i.e.
+     * with a `readyState`
      * less than 4). Used internally to verify that no connections are pending via the
      * `verifyNoPendingRequests` method.
-     *
+     * 
      * This property only exists in the mock implementation, not in real Backends.
      */
-    pendingConnections: Rx.Observable<MockConnection>;
+     pendingConnections: EventEmitter;
+    
 
     /**
      * Checks all connections, and raises an exception if any connection has not received a response.
-     *
+     * 
      * This method only exists in the mock implementation, not in real Backends.
      */
-    verifyNoPendingRequests(): any;
+     verifyNoPendingRequests(): void;
+    
 
     /**
      * Can be used in conjunction with `verifyNoPendingRequests` to resolve any not-yet-resolve
      * connections, if it's expected that there are connections that have not yet received a response.
-     *
+     * 
      * This method only exists in the mock implementation, not in real Backends.
      */
-    resolveAllConnections(): any;
+     resolveAllConnections(): void;
+    
 
     /**
-     * Creates a new <a href='/angular2/angular2/MockConnection'><code>MockConnection</code></a>. This is equivalent to calling `new
+     * Creates a new <a href='/angular2/angular2.api/MockConnection'><code>MockConnection</code></a>. This is equivalent to calling `new
      * MockConnection()`, except that it also will emit the new `Connection` to the `connections`
-     * observable of this `MockBackend` instance. This method will usually only be used by tests
+     * emitter of this `MockBackend` instance. This method will usually only be used by tests
      * against the framework itself, not by end-users.
      */
-    createConnection(req: Request): any;
+     createConnection(req: Request): Connection;
   }
-
+  
 
   /**
-   * Creates `Request` instances with default values.
-   *
+   * Creates `Request` instances from provided values.
+   * 
    * The Request's interface is inspired by the Request constructor defined in the [Fetch
    * Spec](https://fetch.spec.whatwg.org/#request-class),
    * but is considered a static value whose body can be accessed many times. There are other
    * differences in the implementation, but this is the most significant.
    */
-  class Request implements  IRequest {
+  class Request {
+    
 
     /**
      * Http method with which to perform the request.
-     *
+     * 
      * Defaults to GET.
      */
-    method: RequestMethods;
-    mode: RequestModesOpts;
-    credentials: RequestCredentialsOpts;
+     method: RequestMethods;
+    
+     mode: RequestModesOpts;
+    
+     credentials: RequestCredentialsOpts;
+    
 
     /**
      * Headers object based on the `Headers` class in the [Fetch
-     * Spec](https://fetch.spec.whatwg.org/#headers-class). <a href='/angular2/angular2/Headers'><code>Headers</code></a> class reference.
+     * Spec](https://fetch.spec.whatwg.org/#headers-class). <a href='/angular2/angular2.api/Headers'><code>Headers</code></a> class reference.
      */
-    headers: Headers;
+     headers: Headers;
+    
 
     /**
      * Url of the remote resource
      */
-    url: string;
+     url: string;
+    
+     cache: RequestCacheOpts;
+    
 
     /**
      * Returns the request's body as string, assuming that body exists. If body is undefined, return
      * empty
      * string.
      */
-    text(): String;
+     text(): String;
   }
-
+  
 
   /**
-   * Creates `Response` instances with default values.
-   *
+   * Creates `Response` instances from provided values.
+   * 
    * Though this object isn't
    * usually instantiated by end-users, it is the primary object interacted with when it comes time to
    * add data to a view.
-   *
+   * 
    * #Example
-   *
+   * 
    * ```
    * http.request('my-friends.txt').subscribe(response => this.friends = response.text());
    * ```
-   *
-   * The Response's interface is inspired by the Request constructor defined in the [Fetch
+   * 
+   * The Response's interface is inspired by the Response constructor defined in the [Fetch
    * Spec](https://fetch.spec.whatwg.org/#response-class), but is considered a static value whose body
    * can be accessed many times. There are other differences in the implementation, but this is the
    * most significant.
    */
-  class Response implements  IResponse {
+  class Response {
+    
 
     /**
      * One of "basic", "cors", "default", "error, or "opaque".
-     *
+     * 
      * Defaults to "default".
      */
-    type: ResponseTypes;
+     type: ResponseTypes;
+    
 
     /**
      * True if the response's status is within 200-299
      */
-    ok: boolean;
+     ok: boolean;
+    
 
     /**
      * URL of response.
-     *
+     * 
      * Defaults to empty string.
      */
-    url: string;
+     url: string;
+    
 
     /**
      * Status code returned by server.
-     *
+     * 
      * Defaults to 200.
      */
-    status: number;
+     status: number;
+    
 
     /**
      * Text representing the corresponding reason phrase to the `status`, as defined in [ietf rfc 2616
      * section 6.1.1](https://tools.ietf.org/html/rfc2616#section-6.1.1)
-     *
+     * 
      * Defaults to "OK"
      */
-    statusText: string;
+     statusText: string;
+    
 
     /**
      * Non-standard property
-     *
+     * 
      * Denotes how many of the response body's bytes have been loaded, for example if the response is
      * the result of a progress event.
      */
-    bytesLoaded: number;
+     bytesLoaded: number;
+    
 
     /**
      * Non-standard property
-     *
+     * 
      * Denotes how many bytes are expected in the final response body.
      */
-    totalBytes: number;
+     totalBytes: number;
+    
 
     /**
      * Headers object based on the `Headers` class in the [Fetch
      * Spec](https://fetch.spec.whatwg.org/#headers-class).
      */
-    headers: Headers;
+     headers: Headers;
+    
 
     /**
      * Not yet implemented
      */
-    blob(): Blob;
+     blob(): any;
+    
 
     /**
      * Attempts to return body as parsed `JSON` object, or raises an exception.
      */
-    json(): JSON;
+     json(): Object;
+    
 
     /**
      * Returns the body as a string, presuming `toString()` can be called on the response body.
      */
-    text(): string;
+     text(): string;
+    
 
     /**
      * Not yet implemented
      */
-    arrayBuffer(): ArrayBuffer;
+     arrayBuffer(): any;
   }
-
+  
 
   /**
-   * Performs http requests using `XMLHttpRequest` as the default backend.
-   *
-   * `Http` is available as an injectable class, with methods to perform http requests. Calling
-   * `request` returns an
-   * [Observable](https://github.com/Reactive-Extensions/RxJS/blob/master/doc/api/core/observable.md),
-   * which will emit a single <a href='/angular2/angular2/Response'><code>Response</code></a> when a response is
-   * received.
-   *
+   * Interface for options to construct a Request, based on
+   * [RequestInit](https://fetch.spec.whatwg.org/#requestinit) from the Fetch spec.
+   */
+  interface IRequestOptions {
+    
+     url?: string;
+    
+     method?: RequestMethods;
+    
+     headers?: Headers;
+    
+     body?: string;
+    
+     mode?: RequestModesOpts;
+    
+     credentials?: RequestCredentialsOpts;
+    
+     cache?: RequestCacheOpts;
+  }
+  
+
+  /**
+   * Interface for options to construct a Response, based on
+   * [ResponseInit](https://fetch.spec.whatwg.org/#responseinit) from the Fetch spec.
+   */
+  interface IResponseOptions {
+    
+     body?: string | Object | FormData;
+    
+     status?: number;
+    
+     statusText?: string;
+    
+     headers?: Headers;
+    
+     type?: ResponseTypes;
+    
+     url?: string;
+  }
+  
+
+  /**
+   * Abstract class from which real connections are derived.
+   */
+  class Connection {
+    
+     readyState: ReadyStates;
+    
+     request: Request;
+    
+     response: EventEmitter;
+    
+     dispose(): void;
+  }
+  
+
+  /**
+   * Abstract class from which real backends are derived.
+   * 
+   * The primary purpose of a `ConnectionBackend` is to create new connections to fulfill a given
+   * <a href='/angular2/angular2.api/Request'><code>Request</code></a>.
+   */
+  class ConnectionBackend {
+    
+     createConnection(request: any): Connection;
+  }
+  
+
+  /**
+   * Injectable version of <a href='/angular2/angular2.api/RequestOptions'><code>RequestOptions</code></a>, with overridable default values.
+   * 
    * #Example
-   *
+   * 
    * ```
-   * import {Http, httpInjectables} from 'angular2/http';
-   * @Component({selector: 'http-app', appInjector: [httpInjectables]})
-   * @View({templateUrl: 'people.html'})
-   * class PeopleComponent {
-   *   constructor(http: Http) {
-   *     http('people.json')
-   *       // Call map on the response observable to get the parsed people object
-   *       .map(res => res.json())
-   *       // Subscribe to the observable to get the parsed people object and attach it to the
-   *       // component
-   *       .subscribe(people => this.people = people);
+   * import {Http, BaseRequestOptions, Request} from 'angular2/http';
+   * ...
+   * class MyComponent {
+   *   constructor(baseRequestOptions:BaseRequestOptions, http:Http) {
+   *     var options = baseRequestOptions.merge({body: 'foobar', url: 'https://foo'});
+   *     var request = new Request(options);
+   *     http.request(request).subscribe(res => this.bars = res.json());
    *   }
    * }
-   * ```
-   *
-   * The default construct used to perform requests, `XMLHttpRequest`, is abstracted as a "Backend" (
-   * <a href='/angular2/angular2/XHRBackend'><code>XHRBackend</code></a> in this case), which could be mocked with dependency injection by replacing
-   * the <a href='/angular2/angular2/XHRBackend'><code>XHRBackend</code></a> binding, as in the following example:
-   *
-   * #Example
-   *
-   * ```
-   * import {MockBackend, BaseRequestOptions, Http} from 'angular2/http';
-   * var injector = Injector.resolveAndCreate([
-   *   BaseRequestOptions,
-   *   MockBackend,
-   *   bind(Http).toFactory(
-   *       function(backend, defaultOptions) {
-   *         return new Http(backend, defaultOptions);
-   *       },
-   *       [MockBackend, BaseRequestOptions])
-   * ]);
-   * var http = injector.get(Http);
-   * http.get('request-from-mock-backend.json').subscribe((res:Response) => doSomething(res));
+   * 
    * ```
    */
-  class Http {
-
-    /**
-     * Performs any type of http request. First argument is required, and can either be a url or
-     * a <a href='/angular2/angular2/Request'><code>Request</code></a> instance. If the first argument is a url, an optional <a href='/angular2/angular2/RequestOptions'><code>RequestOptions</code></a>
-     * object can be provided as the 2nd argument. The options object will be merged with the values
-     * of <a href='/angular2/angular2/BaseRequestOptions'><code>BaseRequestOptions</code></a> before performing the request.
-     */
-    request(url: string | Request, options?: IRequestOptions): Rx.Observable<Response>;
-
-    /**
-     * Performs a request with `get` http method.
-     */
-    get(url: string, options?: IRequestOptions): any;
-
-    /**
-     * Performs a request with `post` http method.
-     */
-    post(url: string, body: URLSearchParams | FormData | Blob | string, options?: IRequestOptions): any;
-
-    /**
-     * Performs a request with `put` http method.
-     */
-    put(url: string, body: URLSearchParams | FormData | Blob | string, options?: IRequestOptions): any;
-
-    /**
-     * Performs a request with `delete` http method.
-     */
-    delete(url: string, options?: IRequestOptions): any;
-
-    /**
-     * Performs a request with `patch` http method.
-     */
-    patch(url: string, body: URLSearchParams | FormData | Blob | string, options?: IRequestOptions): any;
-
-    /**
-     * Performs a request with `head` http method.
-     */
-    head(url: string, options?: IRequestOptions): any;
+  class BaseRequestOptions extends RequestOptions {
   }
-
+  
 
   /**
-   * Creates <a href='/angular2/angular2/XHRConnection'><code>XHRConnection</code></a> instances.
-   *
+   * Creates a request options object similar to the `RequestInit` description
+   * in the [Fetch
+   * Spec](https://fetch.spec.whatwg.org/#requestinit) to be optionally provided when instantiating a
+   * <a href='/angular2/angular2.api/Request'><code>Request</code></a>.
+   * 
+   * All values are null by default.
+   */
+  class RequestOptions implements IRequestOptions {
+    
+
+    /**
+     * Http method with which to execute the request.
+     * 
+     * Defaults to "GET".
+     */
+     method: RequestMethods;
+    
+
+    /**
+     * Headers object based on the `Headers` class in the [Fetch
+     * Spec](https://fetch.spec.whatwg.org/#headers-class).
+     */
+     headers: Headers;
+    
+
+    /**
+     * Body to be used when creating the request.
+     */
+     body: string;
+    
+     mode: RequestModesOpts;
+    
+     credentials: RequestCredentialsOpts;
+    
+     cache: RequestCacheOpts;
+    
+     url: string;
+    
+
+    /**
+     * Creates a copy of the `RequestOptions` instance, using the optional input as values to override
+     * existing values.
+     */
+     merge(options?: IRequestOptions): RequestOptions;
+  }
+  
+
+  /**
+   * Injectable version of <a href='/angular2/angular2.api/ResponseOptions'><code>ResponseOptions</code></a>, with overridable default values.
+   */
+  class BaseResponseOptions extends ResponseOptions {
+    
+     body: string | Object | ArrayBuffer | JSON | FormData | Blob;
+    
+     status: number;
+    
+     headers: Headers;
+    
+     statusText: string;
+    
+     type: ResponseTypes;
+    
+     url: string;
+  }
+  
+
+  /**
+   * Creates a response options object similar to the
+   * [ResponseInit](https://fetch.spec.whatwg.org/#responseinit) description
+   * in the Fetch
+   * Spec to be optionally provided when instantiating a
+   * <a href='/angular2/angular2.api/Response'><code>Response</code></a>.
+   * 
+   * All values are null by default.
+   */
+  class ResponseOptions implements IResponseOptions {
+    
+     body: string | Object;
+    
+     status: number;
+    
+     headers: Headers;
+    
+     statusText: string;
+    
+     type: ResponseTypes;
+    
+     url: string;
+    
+     merge(options?: IResponseOptions): ResponseOptions;
+  }
+  
+
+  /**
+   * Creates <a href='/angular2/angular2.api/XHRConnection'><code>XHRConnection</code></a> instances.
+   * 
    * This class would typically not be used by end users, but could be
    * overridden if a different backend implementation should be used,
    * such as in a node backend.
-   *
+   * 
    * #Example
-   *
+   * 
    * ```
    * import {Http, MyNodeBackend, httpInjectables, BaseRequestOptions} from 'angular2/http';
    * @Component({
-   *   appInjector: [
+   *   viewInjector: [
    *     httpInjectables,
    *     bind(Http).toFactory((backend, options) => {
    *       return new Http(backend, options);
@@ -5297,185 +5711,157 @@ declare module "angular2/angular2" {
    * }
    * ```
    */
-  class XHRBackend implements  ConnectionBackend {
-    createConnection(request: Request): XHRConnection;
+  class XHRBackend implements ConnectionBackend {
+    
+     createConnection(request: Request): XHRConnection;
   }
-
+  
 
   /**
    * Creates connections using `XMLHttpRequest`. Given a fully-qualified
    * request, an `XHRConnection` will immediately create an `XMLHttpRequest` object and send the
    * request.
-   *
+   * 
    * This class would typically not be created or interacted with directly inside applications, though
-   * the <a href='/angular2/angular2/MockConnection'><code>MockConnection</code></a> may be interacted with in tests.
+   * the <a href='/angular2/angular2.api/MockConnection'><code>MockConnection</code></a> may be interacted with in tests.
    */
-  class XHRConnection implements  Connection {
-    request: Request;
+  class XHRConnection implements Connection {
+    
+     request: Request;
+    
 
     /**
-     * Response
-     * [Subject](https://github.com/Reactive-Extensions/RxJS/blob/master/doc/api/subjects/subject.md)
-     * which emits a single <a href='/angular2/angular2/Response'><code>Response</code></a> value on load event of `XMLHttpRequest`.
+     * Response <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> which emits a single <a href='/angular2/angular2.api/Response'><code>Response</code></a> value on load event of
+     * `XMLHttpRequest`.
      */
-    response: Rx.Subject<Response>;
-    readyState: ReadyStates;
+     response: EventEmitter;
+    
+     readyState: ReadyStates;
+    
 
     /**
      * Calls abort on the underlying XMLHttpRequest.
      */
-    dispose(): void;
+     dispose(): void;
   }
-
+  
 
   /**
-   * Injectable version of <a href='/angular2/angular2/RequestOptions'><code>RequestOptions</code></a>.
-   *
+   * Performs http requests using `XMLHttpRequest` as the default backend.
+   * 
+   * `Http` is available as an injectable class, with methods to perform http requests. Calling
+   * `request` returns an <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> which will emit a single <a href='/angular2/angular2.api/Response'><code>Response</code></a> when a
+   * response is received.
+   * 
+   * 
+   * ## Breaking Change
+   * 
+   * Previously, methods of `Http` would return an RxJS Observable directly. For now,
+   * the `toRx()` method of <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> needs to be called in order to get the RxJS
+   * Subject. `EventEmitter` does not provide combinators like `map`, and has different semantics for
+   * subscribing/observing. This is temporary; the result of all `Http` method calls will be either an
+   * Observable
+   * or Dart Stream when [issue #2794](https://github.com/angular/angular/issues/2794) is resolved.
+   * 
    * #Example
-   *
+   * 
    * ```
-   * import {Http, BaseRequestOptions, Request} from 'angular2/http';
-   * ...
-   * class MyComponent {
-   *   constructor(baseRequestOptions:BaseRequestOptions, http:Http) {
-   *     var options = baseRequestOptions.merge({body: 'foobar'});
-   *     var request = new Request('https://foo', options);
-   *     http.request(request).subscribe(res => this.bars = res.json());
+   * import {Http, httpInjectables} from 'angular2/http';
+   * @Component({selector: 'http-app', viewInjector: [httpInjectables]})
+   * @View({templateUrl: 'people.html'})
+   * class PeopleComponent {
+   *   constructor(http: Http) {
+   *     http.get('people.json')
+   *       //Get the RxJS Subject
+   *       .toRx()
+   *       // Call map on the response observable to get the parsed people object
+   *       .map(res => res.json())
+   *       // Subscribe to the observable to get the parsed people object and attach it to the
+   *       // component
+   *       .subscribe(people => this.people = people);
    *   }
    * }
-   *
    * ```
-   */
-  class BaseRequestOptions extends  RequestOptions {
-  }
-
-
-  /**
-   * Creates a request options object with default properties as described in the [Fetch
-   * Spec](https://fetch.spec.whatwg.org/#requestinit) to be optionally provided when instantiating a
-   * <a href='/angular2/angular2/Request'><code>Request</code></a>. This class is used implicitly by <a href='/angular2/angular2/Http'><code>Http</code></a> to merge in provided request
-   * options with the default options specified here. These same default options are injectable via
-   * the <a href='/angular2/angular2/BaseRequestOptions'><code>BaseRequestOptions</code></a> class.
-   */
-  class RequestOptions implements  IRequestOptions {
-
-    /**
-     * Http method with which to execute the request.
-     *
-     * Defaults to "GET".
-     */
-    method: RequestMethods;
-
-    /**
-     * Headers object based on the `Headers` class in the [Fetch
-     * Spec](https://fetch.spec.whatwg.org/#headers-class).
-     */
-    headers: Headers;
-
-    /**
-     * Body to be used when creating the request.
-     */
-    body: URLSearchParams | FormData | Blob | string;
-    mode: RequestModesOpts;
-    credentials: RequestCredentialsOpts;
-    cache: RequestCacheOpts;
-
-    /**
-     * Creates a copy of the `RequestOptions` instance, using the optional input as values to override
-     * existing values.
-     */
-    merge(opts?: IRequestOptions): RequestOptions;
-  }
-
-
-  /**
-   * Alias to the `request` method of <a href='/angular2/angular2/Http'><code>Http</code></a>, for those who'd prefer a simple function instead
-   * of an object. In order to get TypeScript type information about the `HttpFactory`, the <a href='*'>IHttp</a> interface can be used as shown in the following example.
-   *
+   * 
+   * To use the <a href='/angular2/angular2.api/EventEmitter'><code>EventEmitter</code></a> returned by `Http`, simply pass a generator (See "interface
+   * Generator" in the Async Generator spec: https://github.com/jhusain/asyncgenerator) to the
+   * `observer` method of the returned emitter, with optional methods of `next`, `throw`, and `return`.
+   * 
    * #Example
-   *
+   * 
    * ```
-   * import {httpInjectables, HttpFactory, IHttp} from 'angular2/http';
-   * @Component({
-   *   appInjector: [httpInjectables]
-   * })
-   * @View({
-   *   templateUrl: 'people.html'
-   * })
-   * class MyComponent {
-   *  constructor(@Inject(HttpFactory) http:IHttp) {
-   *    http('people.json').subscribe(res => this.people = res.json());
-   *  }
-   * }
+   * http.get('people.json').observer({next: (value) => this.people = people});
    * ```
-   */
-  function HttpFactory(backend: XHRBackend, defaultOptions: BaseRequestOptions): any;
-
-
-  /**
-   * Provides an interface to provide type information for <a href='/angular2/angular2/HttpFactory'><code>HttpFactory</code></a> when injecting.
-   *
+   * 
+   * The default construct used to perform requests, `XMLHttpRequest`, is abstracted as a "Backend" (
+   * <a href='/angular2/angular2.api/XHRBackend'><code>XHRBackend</code></a> in this case), which could be mocked with dependency injection by replacing
+   * the <a href='/angular2/angular2.api/XHRBackend'><code>XHRBackend</code></a> binding, as in the following example:
+   * 
    * #Example
-   *
+   * 
    * ```
-   * * import {httpInjectables, HttpFactory, IHttp} from 'angular2/http';
-   * @Component({
-   *   appInjector: [httpInjectables]
-   * })
-   * @View({
-   *   templateUrl: 'people.html'
-   * })
-   * class MyComponent {
-   *  constructor(@Inject(HttpFactory) http:IHttp) {
-   *    http('people.json').subscribe(res => this.people = res.json());
-   *  }
-   * }
+   * import {MockBackend, BaseRequestOptions, Http} from 'angular2/http';
+   * var injector = Injector.resolveAndCreate([
+   *   BaseRequestOptions,
+   *   MockBackend,
+   *   bind(Http).toFactory(
+   *       function(backend, defaultOptions) {
+   *         return new Http(backend, defaultOptions);
+   *       },
+   *       [MockBackend, BaseRequestOptions])
+   * ]);
+   * var http = injector.get(Http);
+   * http.get('request-from-mock-backend.json').toRx().subscribe((res:Response) => doSomething(res));
    * ```
    */
-  interface IHttp {
-  }
+  class Http {
+    
 
-  interface IRequestOptions {
-    method: RequestMethods;
-    headers: Headers;
-    body: URLSearchParams | FormData | Blob | string;
-    mode: RequestModesOpts;
-    credentials: RequestCredentialsOpts;
-    cache: RequestCacheOpts;
-  }
+    /**
+     * Performs any type of http request. First argument is required, and can either be a url or
+     * a <a href='/angular2/angular2.api/Request'><code>Request</code></a> instance. If the first argument is a url, an optional <a href='/angular2/angular2.api/RequestOptions'><code>RequestOptions</code></a>
+     * object can be provided as the 2nd argument. The options object will be merged with the values
+     * of <a href='/angular2/angular2.api/BaseRequestOptions'><code>BaseRequestOptions</code></a> before performing the request.
+     */
+     request(url: string | Request, options?: IRequestOptions): EventEmitter;
+    
 
-  interface IRequest {
-    method: RequestMethods;
-    mode: RequestModesOpts;
-    credentials: RequestCredentialsOpts;
-  }
+    /**
+     * Performs a request with `get` http method.
+     */
+     get(url: string, options?: IRequestOptions): EventEmitter;
+    
 
-  interface IResponse {
-    headers: Headers;
-    ok: boolean;
-    status: number;
-    statusText: string;
-    type: ResponseTypes;
-    url: string;
-    totalBytes: number;
-    bytesLoaded: number;
-    blob(): Blob;
-    arrayBuffer(): ArrayBuffer;
-    text(): string;
-    json(): Object;
-  }
+    /**
+     * Performs a request with `post` http method.
+     */
+     post(url: string, body: string, options?: IRequestOptions): EventEmitter;
+    
 
-  interface Connection {
-    readyState: ReadyStates;
-    request: IRequest;
-    response: Rx.Subject<IResponse>;
-    dispose(): void;
-  }
+    /**
+     * Performs a request with `put` http method.
+     */
+     put(url: string, body: string, options?: IRequestOptions): EventEmitter;
+    
 
-  interface ConnectionBackend {
-    createConnection(observer: any, config: IRequest): Connection;
-  }
+    /**
+     * Performs a request with `delete` http method.
+     */
+     delete(url: string, options?: IRequestOptions): EventEmitter;
+    
 
+    /**
+     * Performs a request with `patch` http method.
+     */
+     patch(url: string, body: string, options?: IRequestOptions): EventEmitter;
+    
+
+    /**
+     * Performs a request with `head` http method.
+     */
+     head(url: string, options?: IRequestOptions): EventEmitter;
+  }
+  
 
   /**
    * Polyfill for [Headers](https://developer.mozilla.org/en-US/docs/Web/API/Headers/Headers), as
@@ -5483,69 +5869,96 @@ declare module "angular2/angular2" {
    * difference from the spec is the lack of an `entries` method.
    */
   class Headers {
-    append(name: string, value: string): void;
-    delete(name: string): void;
-    forEach(fn: Function): any;
-    get(header: string): string;
-    has(header: string): any;
-    keys(): any;
-    set(header: string, value: string | List<string>): void;
-    values(): any;
-    getAll(header: string): Array<string>;
-    entries(): any;
-  }
+    
 
-  class URLSearchParams {
-    paramsMap: Map<string, List<string>>;
-    rawParams: string;
-    has(param: string): boolean;
-    get(param: string): string;
-    getAll(param: string): List<string>;
-    append(param: string, val: string): void;
-    toString(): string;
-    delete(param: any): void;
-  }
+    /**
+     * Appends a header to existing list of header values for a given header name.
+     */
+     append(name: string, value: string): void;
+    
 
+    /**
+     * Deletes all header values for the given name.
+     */
+     delete(name: string): void;
+    
+     forEach(fn: Function): void;
+    
+
+    /**
+     * Returns first header that matches given name.
+     */
+     get(header: string): string;
+    
+
+    /**
+     * Check for existence of header by given name.
+     */
+     has(header: string): boolean;
+    
+
+    /**
+     * Provides names of set headers
+     */
+     keys(): List<string>;
+    
+
+    /**
+     * Sets or overrides header value for given name.
+     */
+     set(header: string, value: string | List<string>): void;
+    
+
+    /**
+     * Returns values of all headers.
+     */
+     values(): List<List<string>>;
+    
+
+    /**
+     * Returns list of header values for a given name.
+     */
+     getAll(header: string): Array<string>;
+    
+
+    /**
+     * This method is not implemented.
+     */
+     entries(): void;
+  }
+  
 
   /**
-   * Provides a basic set of injectables to use the <a href='/angular2/angular2/Http'><code>Http</code></a> service in any application.
-   *
-   * #Example
-   *
-   * ```
-   * import {httpInjectables, Http} from 'angular2/http';
-   * @Component({selector: 'http-app', appInjector: [httpInjectables]})
-   * @View({template: '{{data}}'})
-   * class MyApp {
-   *   constructor(http:Http) {
-   *     http.request('data.txt').subscribe(res => this.data = res.text());
-   *   }
-   * }
-   * ```
+   * Acceptable response types to be associated with a <a href='/angular2/angular2.api/Response'><code>Response</code></a>, based on
+   * [ResponseType](https://fetch.spec.whatwg.org/#responsetype) from the Fetch spec.
    */
-  var httpInjectables : List<any> ;
-
-  enum RequestModesOpts {
+  enum ResponseTypes {
+    Basic,
     Cors,
-    NoCors,
-    SameOrigin
-  }
-
-  enum RequestCacheOpts {
     Default,
-    NoStore,
-    Reload,
-    NoCache,
-    ForceCache,
-    OnlyIfCached
+    Error,
+    Opaque
   }
+  
 
-  enum RequestCredentialsOpts {
-    Omit,
-    SameOrigin,
-    Include
+  /**
+   * All possible states in which a connection can be, based on
+   * [States](http://www.w3.org/TR/XMLHttpRequest/#states) from the `XMLHttpRequest` spec, but with an
+   * additional "CANCELLED" state.
+   */
+  enum ReadyStates {
+    UNSENT,
+    OPEN,
+    HEADERS_RECEIVED,
+    LOADING,
+    DONE,
+    CANCELLED
   }
+  
 
+  /**
+   * Supported http methods.
+   */
   enum RequestMethods {
     GET,
     POST,
@@ -5555,31 +5968,93 @@ declare module "angular2/angular2" {
     HEAD,
     PATCH
   }
+  
 
-  enum ReadyStates {
-    UNSENT,
-    OPEN,
-    HEADERS_RECEIVED,
-    LOADING,
-    DONE,
-    CANCELLED
+  /**
+   * Acceptable credentials option to be associated with a <a href='/angular2/angular2.api/Request'><code>Request</code></a>, based on
+   * [RequestCredentials](https://fetch.spec.whatwg.org/#requestcredentials) from the Fetch spec.
+   */
+  enum RequestCredentialsOpts {
+    Omit,
+    SameOrigin,
+    Include
   }
+  
 
-  enum ResponseTypes {
-    Basic,
-    Cors,
+  /**
+   * Acceptable cache option to be associated with a <a href='/angular2/angular2.api/Request'><code>Request</code></a>, based on
+   * [RequestCache](https://fetch.spec.whatwg.org/#requestcache) from the Fetch spec.
+   */
+  enum RequestCacheOpts {
     Default,
-    Error,
-    Opaque
+    NoStore,
+    Reload,
+    NoCache,
+    ForceCache,
+    OnlyIfCached
   }
+  
 
+  /**
+   * Acceptable origin modes to be associated with a <a href='/angular2/angular2.api/Request'><code>Request</code></a>, based on
+   * [RequestMode](https://fetch.spec.whatwg.org/#requestmode) from the Fetch spec.
+   */
+  enum RequestModesOpts {
+    Cors,
+    NoCors,
+    SameOrigin
+  }
+  
+
+  /**
+   * Map-like representation of url search parameters, based on
+   * [URLSearchParams](https://url.spec.whatwg.org/#urlsearchparams) in the url living standard.
+   */
+  class URLSearchParams {
+    
+     paramsMap: Map<string, List<string>>;
+    
+     rawParams: string;
+    
+     has(param: string): boolean;
+    
+     get(param: string): string;
+    
+     getAll(param: string): List<string>;
+    
+     append(param: string, val: string): void;
+    
+     toString(): string;
+    
+     delete(param: any): void;
+  }
+  
+
+  /**
+   * Provides a basic set of injectables to use the <a href='/angular2/angular2.api/Http'><code>Http</code></a> service in any application.
+   * 
+   * #Example
+   * 
+   * ```
+   * import {httpInjectables, Http} from 'angular2/http';
+   * @Component({selector: 'http-app', viewInjector: [httpInjectables]})
+   * @View({template: '{{data}}'})
+   * class MyApp {
+   *   constructor(http:Http) {
+   *     http.request('data.txt').subscribe(res => this.data = res.text());
+   *   }
+   * }
+   * ```
+   */
+  var httpInjectables : List<any> ;
+  
 
   /**
    * General notes:
-   *
+   * 
    * The methods for creating / destroying views in this API are used in the AppViewHydrator
    * and RenderViewHydrator as well.
-   *
+   * 
    * We are already parsing expressions on the render side:
    * - this makes the ElementBinders more compact
    *   (e.g. no need to distinguish interpolations from regular expressions from literals)
@@ -5591,114 +6066,143 @@ declare module "angular2/angular2" {
    *   its output will be stored in precompiled templates.
    */
   class EventBinding {
-    fullName: string;
-    source: ASTWithSource;
+    
+     fullName: string;
+    
+     source: ASTWithSource;
   }
-
+  
   enum PropertyBindingType {
     PROPERTY,
     ATTRIBUTE,
     CLASS,
     STYLE
   }
-
+  
   class ElementPropertyBinding {
-    type: PropertyBindingType;
-    astWithSource: ASTWithSource;
-    property: string;
-    unit: string;
+    
+     type: PropertyBindingType;
+    
+     astWithSource: ASTWithSource;
+    
+     property: string;
+    
+     unit: string;
   }
-
+  
   class ElementBinder {
-    index: number;
-    parentIndex: number;
-    distanceToParent: number;
-    directives: List<DirectiveBinder>;
-    nestedProtoView: ProtoViewDto;
-    propertyBindings: List<ElementPropertyBinding>;
-    variableBindings: Map<string, string>;
-    eventBindings: List<EventBinding>;
-    textBindings: List<ASTWithSource>;
-    readAttributes: Map<string, string>;
+    
+     index: number;
+    
+     parentIndex: number;
+    
+     distanceToParent: number;
+    
+     directives: List<DirectiveBinder>;
+    
+     nestedProtoView: ProtoViewDto;
+    
+     propertyBindings: List<ElementPropertyBinding>;
+    
+     variableBindings: Map<string, string>;
+    
+     eventBindings: List<EventBinding>;
+    
+     textBindings: List<ASTWithSource>;
+    
+     readAttributes: Map<string, string>;
   }
-
+  
   class DirectiveBinder {
-    directiveIndex: number;
-    propertyBindings: Map<string, ASTWithSource>;
-    eventBindings: List<EventBinding>;
-    hostPropertyBindings: List<ElementPropertyBinding>;
+    
+     directiveIndex: number;
+    
+     propertyBindings: Map<string, ASTWithSource>;
+    
+     eventBindings: List<EventBinding>;
+    
+     hostPropertyBindings: List<ElementPropertyBinding>;
   }
-
+  
   enum ViewType {
     HOST,
     COMPONENT,
     EMBEDDED
   }
-
+  
   class ProtoViewDto {
-    render: RenderProtoViewRef;
-    elementBinders: List<ElementBinder>;
-    variableBindings: Map<string, string>;
-    type: ViewType;
+    
+     render: RenderProtoViewRef;
+    
+     elementBinders: List<ElementBinder>;
+    
+     variableBindings: Map<string, string>;
+    
+     type: ViewType;
   }
-
+  
   class DirectiveMetadata {
-    id: any;
-    selector: string;
-    compileChildren: boolean;
-    events: List<string>;
-    properties: List<string>;
-    readAttributes: List<string>;
-    type: number;
-    callOnDestroy: boolean;
-    callOnChange: boolean;
-    callOnCheck: boolean;
-    callOnInit: boolean;
-    callOnAllChangesDone: boolean;
-    changeDetection: string;
-    exportAs: string;
-    hostListeners: Map<string, string>;
-    hostProperties: Map<string, string>;
-    hostAttributes: Map<string, string>;
-    hostActions: Map<string, string>;
+    
+     id: any;
+    
+     selector: string;
+    
+     compileChildren: boolean;
+    
+     events: List<string>;
+    
+     properties: List<string>;
+    
+     readAttributes: List<string>;
+    
+     type: number;
+    
+     callOnDestroy: boolean;
+    
+     callOnChange: boolean;
+    
+     callOnCheck: boolean;
+    
+     callOnInit: boolean;
+    
+     callOnAllChangesDone: boolean;
+    
+     changeDetection: string;
+    
+     exportAs: string;
+    
+     hostListeners: Map<string, string>;
+    
+     hostProperties: Map<string, string>;
+    
+     hostAttributes: Map<string, string>;
+    
+     hostActions: Map<string, string>;
   }
-
+  
   class RenderProtoViewRef {
   }
-
+  
   class RenderViewRef {
   }
-
+  
   class ViewDefinition {
-    componentId: string;
-    templateAbsUrl: string;
-    template: string;
-    directives: List<DirectiveMetadata>;
-    styleAbsUrls: List<string>;
-    styles: List<string>;
+    
+     componentId: string;
+    
+     templateAbsUrl: string;
+    
+     template: string;
+    
+     directives: List<DirectiveMetadata>;
+    
+     styleAbsUrls: List<string>;
+    
+     styles: List<string>;
   }
-
-  class RenderCompiler {
-
-    /**
-     * Creats a ProtoViewDto that contains a single nested component with the given componentId.
-     */
-    compileHost(directiveMetadata: DirectiveMetadata): Promise<ProtoViewDto>;
-
-    /**
-     * Compiles a single DomProtoView. Non recursive so that
-     * we don't need to serialize all possible components over the wire,
-     * but only the needed ones based on previous calls.
-     */
-    compile(view: ViewDefinition): Promise<ProtoViewDto>;
-  }
-
-  interface RenderElementRef {
-    renderView: RenderViewRef;
-    boundElementIndex: number;
-  }
-
+  
   class Renderer {
+    
 
     /**
      * Creates a root host view that includes the given element.
@@ -5708,455 +6212,664 @@ declare module "angular2/angular2" {
      * main document)
      * @return {RenderViewRef} the created view
      */
-    createRootHostView(hostProtoViewRef: RenderProtoViewRef, hostElementSelector: string): RenderViewRef;
+     createRootHostView(hostProtoViewRef: RenderProtoViewRef, hostElementSelector: string): RenderViewRef;
+    
 
     /**
      * Creates a regular view out of the given ProtoView
      */
-    createView(protoViewRef: RenderProtoViewRef): RenderViewRef;
+     createView(protoViewRef: RenderProtoViewRef): RenderViewRef;
+    
 
     /**
      * Destroys the given view after it has been dehydrated and detached
      */
-    destroyView(viewRef: RenderViewRef): any;
+     destroyView(viewRef: RenderViewRef): void;
+    
 
     /**
      * Attaches a componentView into the given hostView at the given element
      */
-    attachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): any;
+     attachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): void;
+    
 
     /**
      * Detaches a componentView into the given hostView at the given element
      */
-    detachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): any;
+     detachComponentView(location: RenderElementRef, componentViewRef: RenderViewRef): void;
+    
 
     /**
      * Attaches a view into a ViewContainer (in the given parentView at the given element) at the
      * given index.
      */
-    attachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): any;
+     attachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): void;
+    
 
     /**
      * Detaches a view into a ViewContainer (in the given parentView at the given element) at the
      * given index.
      */
-    detachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): any;
+     detachViewInContainer(location: RenderElementRef, atIndex: number, viewRef: RenderViewRef): void;
+    
 
     /**
      * Hydrates a view after it has been attached. Hydration/dehydration is used for reusing views
      * inside of the view pool.
      */
-    hydrateView(viewRef: RenderViewRef): any;
+     hydrateView(viewRef: RenderViewRef): void;
+    
 
     /**
      * Dehydrates a view after it has been attached. Hydration/dehydration is used for reusing views
      * inside of the view pool.
      */
-    dehydrateView(viewRef: RenderViewRef): any;
+     dehydrateView(viewRef: RenderViewRef): void;
+    
 
     /**
      * Returns the native element at the given location.
      * Attention: In a WebWorker scenario, this should always return null!
      */
-    getNativeElementSync(location: RenderElementRef): any;
+     getNativeElementSync(location: RenderElementRef): any;
+    
 
     /**
      * Sets a property on an element.
      */
-    setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): any;
+     setElementProperty(location: RenderElementRef, propertyName: string, propertyValue: any): void;
+    
 
     /**
      * Sets an attribute on an element.
      */
-    setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): any;
+     setElementAttribute(location: RenderElementRef, attributeName: string, attributeValue: string): void;
+    
 
     /**
      * Sets a class on an element.
      */
-    setElementClass(location: RenderElementRef, className: string, isAdd: boolean): any;
+     setElementClass(location: RenderElementRef, className: string, isAdd: boolean): void;
+    
 
     /**
      * Sets a style on an element.
      */
-    setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): any;
+     setElementStyle(location: RenderElementRef, styleName: string, styleValue: string): void;
+    
 
     /**
      * Calls a method on an element.
      */
-    invokeElementMethod(location: RenderElementRef, methodName: string, args: List<any>): any;
+     invokeElementMethod(location: RenderElementRef, methodName: string, args: List<any>): void;
+    
 
     /**
      * Sets the value of a text node.
      */
-    setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): any;
+     setText(viewRef: RenderViewRef, textNodeIndex: number, text: string): void;
+    
 
     /**
      * Sets the dispatcher for all events of the given view
      */
-    setEventDispatcher(viewRef: RenderViewRef, dispatcher: EventDispatcher): any;
+     setEventDispatcher(viewRef: RenderViewRef, dispatcher: EventDispatcher): void;
   }
-
+  
 
   /**
    * A dispatcher for all events happening in a view.
    */
   interface EventDispatcher {
+    
 
     /**
      * Called when an event was triggered for a on-* attribute on an element.
      * @param {Map<string, any>} locals Locals to be used to evaluate the
      *   event expressions
      */
-    dispatchEvent(elementIndex: number, eventName: string, locals: Map<string, any>): any;
+     dispatchEvent(elementIndex: number, eventName: string, locals: Map<string, any>): void;
   }
-
+  
   class TreeNode<T extends TreeNode<any>> {
+    
 
     /**
      * Adds a child to the parent node. The child MUST NOT be a part of a tree.
      */
-    addChild(child: T): void;
+     addChild(child: T): void;
+    
 
     /**
      * Adds a child to the parent node after a given sibling.
      * The child MUST NOT be a part of a tree and the sibling must be present.
      */
-    addChildAfter(child: T, prevSibling: T): void;
+     addChildAfter(child: T, prevSibling: T): void;
+    
 
     /**
      * Detaches a node from the parent's tree.
      */
-    remove(): void;
-    parent: any;
-    children: T[];
+     remove(): void;
+    
+     parent: void;
+    
+     children: T[];
   }
-
-  class DependencyWithVisibility extends  Dependency {
-    visibility: Visibility;
+  
+  class DirectiveDependency extends Dependency {
+    
+     attributeName: string;
+    
+     queryDecorator: Query;
   }
-
-  class DirectiveDependency extends  DependencyWithVisibility {
-    attributeName: string;
-    queryDecorator: Query;
+  
+  class DirectiveBinding extends ResolvedBinding {
+    
+     resolvedHostInjectables: List<ResolvedBinding>;
+    
+     resolvedViewInjectables: List<ResolvedBinding>;
+    
+     metadata: DirectiveMetadata;
+    
+     callOnDestroy: boolean;
+    
+     callOnChange: boolean;
+    
+     callOnAllChangesDone: boolean;
+    
+     displayName: string;
+    
+     eventEmitters: List<string>;
+    
+     hostActions: Map<string, string>;
+    
+     changeDetection: void;
   }
-
-  class DirectiveBinding extends  ResolvedBinding {
-    resolvedAppInjectables: List<ResolvedBinding>;
-    resolvedHostInjectables: List<ResolvedBinding>;
-    resolvedViewInjectables: List<ResolvedBinding>;
-    metadata: DirectiveMetadata;
-    callOnDestroy: boolean;
-    callOnChange: boolean;
-    callOnAllChangesDone: boolean;
-    displayName: string;
-    eventEmitters: List<string>;
-    hostActions: Map<string, string>;
-    changeDetection: any;
-  }
-
+  
   class PreBuiltObjects {
-    viewManager: AppViewManager;
-    view: AppView;
-    protoView: AppProtoView;
+    
+     viewManager: AppViewManager;
+    
+     view: AppView;
+    
+     protoView: AppProtoView;
   }
-
+  
   class EventEmitterAccessor {
-    eventName: string;
-    getter: Function;
-    subscribe(view:AppView, boundElementIndex: number, directive: Object): any;
+    
+     eventName: string;
+    
+     getter: Function;
+    
+     subscribe(view:AppView, boundElementIndex: number, directive: Object): Object;
   }
-
+  
   class HostActionAccessor {
-    methodName: string;
-    getter: Function;
-    subscribe(view:AppView, boundElementIndex: number, directive: Object): any;
+    
+     methodName: string;
+    
+     getter: Function;
+    
+     subscribe(view:AppView, boundElementIndex: number, directive: Object): Object;
   }
-
-  class BindingData {
-    binding: ResolvedBinding;
-    visibility: number;
-    getKeyId(): any;
-    createEventEmitterAccessors(): any;
-    createHostActionAccessors(): any;
-  }
-
-
-  /**
-   * Difference between di.Injector and ElementInjector
-   *
-   * di.Injector:
-   *  - imperative based (can create child injectors imperativly)
-   *  - Lazy loading of code
-   *  - Component/App Level services which are usually not DOM Related.
-   *
-   *
-   * ElementInjector:
-   *   - ProtoBased (Injector structure fixed at compile time)
-   *   - understands @Ancestor, @Parent, @Child, @Descendent
-   *   - Fast
-   *   - Query mechanism for children
-   *   - 1:1 to DOM structure.
-   *
-   *  PERF BENCHMARK:
-   * http://www.williambrownstreet.net/blog/2014/04/faster-angularjs-rendering-angularjs-and-reactjs/
-   */
+  
   class ProtoElementInjector {
-    view: AppView;
-    attributes: Map<string, string>;
-    eventEmitterAccessors: List<List<EventEmitterAccessor>>;
-    hostActionAccessors: List<List<HostActionAccessor>>;
-    parent: ProtoElementInjector;
-    index: int;
-    distanceToParent: number;
-    directiveVariableBindings: Map<string, number>;
-    instantiate(parent: ElementInjector): ElementInjector;
-    directParent(): ProtoElementInjector;
-    hasBindings: boolean;
-    getBindingAtIndex(index: number): any;
+    
+     view: AppView;
+    
+     attributes: Map<string, string>;
+    
+     eventEmitterAccessors: List<List<EventEmitterAccessor>>;
+    
+     hostActionAccessors: List<List<HostActionAccessor>>;
+    
+     protoInjector: ProtoInjector;
+    
+     parent: ProtoElementInjector;
+    
+     index: int;
+    
+     distanceToParent: number;
+    
+     directiveVariableBindings: Map<string, number>;
+    
+     instantiate(parent: ElementInjector): ElementInjector;
+    
+     directParent(): ProtoElementInjector;
+    
+     hasBindings: boolean;
+    
+     getBindingAtIndex(index: number): any;
   }
-
-  class ElementInjector extends  TreeNode<ElementInjector> {
-    hydrated: boolean;
-    dehydrate(): void;
-    onAllChangesDone(): void;
-    hydrate(injector: Injector, host: ElementInjector, preBuiltObjects: PreBuiltObjects): void;
-    hasVariableBinding(name: string): boolean;
-    getVariableBinding(name: string): any;
-    get(token: any): any;
-    hasDirective(type: Type): boolean;
-    getEventEmitterAccessors(): List<List<EventEmitterAccessor>>;
-    getHostActionAccessors(): List<List<HostActionAccessor>>;
-    getDirectiveVariableBindings(): Map<string, number>;
-    getComponent(): any;
-    getElementRef(): ElementRef;
-    getViewContainerRef(): ViewContainerRef;
-    directParent(): ElementInjector;
-    addDirectivesMatchingQuery(query: Query, list: any[]): void;
-    link(parent: ElementInjector): void;
-    linkAfter(parent: ElementInjector, prevSibling: ElementInjector): void;
-    unlink(): void;
-    getDirectiveAtIndex(index: number): any;
-    hasInstances(): boolean;
-    getLightDomAppInjector(): Injector;
-    getShadowDomAppInjector(): Injector;
-    getHost(): ElementInjector;
-    getBoundElementIndex(): number;
+  
+  class ElementInjector extends TreeNode<ElementInjector> implements DependencyProvider {
+    
+     hydrated: boolean;
+    
+     dehydrate(): void;
+    
+     onAllChangesDone(): void;
+    
+     hydrate(imperativelyCreatedInjector: Injector, host: ElementInjector, preBuiltObjects: PreBuiltObjects): void;
+    
+     hasVariableBinding(name: string): boolean;
+    
+     getVariableBinding(name: string): any;
+    
+     get(token: any): any;
+    
+     hasDirective(type: Type): boolean;
+    
+     getEventEmitterAccessors(): List<List<EventEmitterAccessor>>;
+    
+     getHostActionAccessors(): List<List<HostActionAccessor>>;
+    
+     getDirectiveVariableBindings(): Map<string, number>;
+    
+     getComponent(): any;
+    
+     getElementRef(): ElementRef;
+    
+     getViewContainerRef(): ViewContainerRef;
+    
+     directParent(): ElementInjector;
+    
+     isComponentKey(key: Key): boolean;
+    
+     getDependency(injector: Injector, binding: ResolvedBinding, dep: Dependency): any;
+    
+     addDirectivesMatchingQuery(query: Query, list: any[]): void;
+    
+     link(parent: ElementInjector): void;
+    
+     linkAfter(parent: ElementInjector, prevSibling: ElementInjector): void;
+    
+     unlink(): void;
+    
+     getDirectiveAtIndex(index: number): any;
+    
+     hasInstances(): boolean;
+    
+     getHost(): ElementInjector;
+    
+     getBoundElementIndex(): number;
   }
-
+  
+  class QueryError extends BaseException {
+    
+     message: string;
+    
+     toString(): string;
+  }
+  
+  class QueryRef {
+    
+     query: Query;
+    
+     list: QueryList<any>;
+    
+     originator: ElementInjector;
+    
+     update(): void;
+    
+     visit(inj: ElementInjector, aggregator: any[]): void;
+  }
+  
   class AST {
-    eval(context: any, locals: Locals): any;
-    isAssignable: boolean;
-    assign(context: any, locals: Locals, value: any): any;
-    visit(visitor: AstVisitor): any;
-    toString(): string;
+    
+     eval(context: any, locals: Locals): void;
+    
+     isAssignable: boolean;
+    
+     assign(context: any, locals: Locals, value: any): void;
+    
+     visit(visitor: AstVisitor): any;
+    
+     toString(): string;
   }
-
-  class EmptyExpr extends  AST {
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class EmptyExpr extends AST {
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): void;
   }
-
-  class ImplicitReceiver extends  AST {
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class ImplicitReceiver extends AST {
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
+  
 
   /**
    * Multiple expressions separated by a semicolon.
    */
-  class Chain extends  AST {
-    expressions: List<any>;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  class Chain extends AST {
+    
+     expressions: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class Conditional extends  AST {
-    condition: AST;
-    trueExp: AST;
-    falseExp: AST;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class Conditional extends AST {
+    
+     condition: AST;
+    
+     trueExp: AST;
+    
+     falseExp: AST;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class If extends  AST {
-    condition: AST;
-    trueExp: AST;
-    falseExp: AST;
-    eval(context: any, locals: any): any;
-    visit(visitor: AstVisitor): any;
+  
+  class If extends AST {
+    
+     condition: AST;
+    
+     trueExp: AST;
+    
+     falseExp: AST;
+    
+     eval(context: any, locals: any): void;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class AccessMember extends  AST {
-    receiver: AST;
-    name: string;
-    getter: Function;
-    setter: Function;
-    eval(context: any, locals: Locals): any;
-    isAssignable: boolean;
-    assign(context: any, locals: Locals, value: any): any;
-    visit(visitor: AstVisitor): any;
+  
+  class AccessMember extends AST {
+    
+     receiver: AST;
+    
+     name: string;
+    
+     getter: Function;
+    
+     setter: Function;
+    
+     eval(context: any, locals: Locals): any;
+    
+     isAssignable: boolean;
+    
+     assign(context: any, locals: Locals, value: any): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class SafeAccessMember extends  AST {
-    receiver: AST;
-    name: string;
-    getter: Function;
-    setter: Function;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class SafeAccessMember extends AST {
+    
+     receiver: AST;
+    
+     name: string;
+    
+     getter: Function;
+    
+     setter: Function;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class KeyedAccess extends  AST {
-    obj: AST;
-    key: AST;
-    eval(context: any, locals: Locals): any;
-    isAssignable: boolean;
-    assign(context: any, locals: Locals, value: any): any;
-    visit(visitor: AstVisitor): any;
+  
+  class KeyedAccess extends AST {
+    
+     obj: AST;
+    
+     key: AST;
+    
+     eval(context: any, locals: Locals): any;
+    
+     isAssignable: boolean;
+    
+     assign(context: any, locals: Locals, value: any): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class BindingPipe extends  AST {
-    exp: AST;
-    name: string;
-    args: List<any>;
-    visit(visitor: AstVisitor): any;
+  
+  class BindingPipe extends AST {
+    
+     exp: AST;
+    
+     name: string;
+    
+     args: List<any>;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class LiteralPrimitive extends  AST {
-    value: any;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class LiteralPrimitive extends AST {
+    
+     value: void;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class LiteralArray extends  AST {
-    expressions: List<any>;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class LiteralArray extends AST {
+    
+     expressions: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class LiteralMap extends  AST {
-    keys: List<any>;
-    values: List<any>;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class LiteralMap extends AST {
+    
+     keys: List<any>;
+    
+     values: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class Interpolation extends  AST {
-    strings: List<any>;
-    expressions: List<any>;
-    eval(context: any, locals: any): any;
-    visit(visitor: AstVisitor): any;
+  
+  class Interpolation extends AST {
+    
+     strings: List<any>;
+    
+     expressions: List<any>;
+    
+     eval(context: any, locals: any): any;
+    
+     visit(visitor: AstVisitor): void;
   }
-
-  class Binary extends  AST {
-    operation: string;
-    left: AST;
-    right: AST;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class Binary extends AST {
+    
+     operation: string;
+    
+     left: AST;
+    
+     right: AST;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class PrefixNot extends  AST {
-    expression: AST;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class PrefixNot extends AST {
+    
+     expression: AST;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class Assignment extends  AST {
-    target: AST;
-    value: AST;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class Assignment extends AST {
+    
+     target: AST;
+    
+     value: AST;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class MethodCall extends  AST {
-    receiver: AST;
-    name: string;
-    fn: Function;
-    args: List<any>;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class MethodCall extends AST {
+    
+     receiver: AST;
+    
+     name: string;
+    
+     fn: Function;
+    
+     args: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class SafeMethodCall extends  AST {
-    receiver: AST;
-    name: string;
-    fn: Function;
-    args: List<any>;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class SafeMethodCall extends AST {
+    
+     receiver: AST;
+    
+     name: string;
+    
+     fn: Function;
+    
+     args: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class FunctionCall extends  AST {
-    target: AST;
-    args: List<any>;
-    eval(context: any, locals: Locals): any;
-    visit(visitor: AstVisitor): any;
+  
+  class FunctionCall extends AST {
+    
+     target: AST;
+    
+     args: List<any>;
+    
+     eval(context: any, locals: Locals): any;
+    
+     visit(visitor: AstVisitor): any;
   }
-
-  class ASTWithSource extends  AST {
-    ast: AST;
-    source: string;
-    location: string;
-    eval(context: any, locals: Locals): any;
-    isAssignable: boolean;
-    assign(context: any, locals: Locals, value: any): any;
-    visit(visitor: AstVisitor): any;
-    toString(): string;
+  
+  class ASTWithSource extends AST {
+    
+     ast: AST;
+    
+     source: string;
+    
+     location: string;
+    
+     eval(context: any, locals: Locals): any;
+    
+     isAssignable: boolean;
+    
+     assign(context: any, locals: Locals, value: any): any;
+    
+     visit(visitor: AstVisitor): any;
+    
+     toString(): string;
   }
-
+  
   class TemplateBinding {
-    key: string;
-    keyIsVar: boolean;
-    name: string;
-    expression: ASTWithSource;
+    
+     key: string;
+    
+     keyIsVar: boolean;
+    
+     name: string;
+    
+     expression: ASTWithSource;
   }
-
+  
   interface AstVisitor {
-    visitAccessMember(ast: AccessMember): any;
-    visitAssignment(ast: Assignment): any;
-    visitBinary(ast: Binary): any;
-    visitChain(ast: Chain): any;
-    visitConditional(ast: Conditional): any;
-    visitIf(ast: If): any;
-    visitPipe(ast: BindingPipe): any;
-    visitFunctionCall(ast: FunctionCall): any;
-    visitImplicitReceiver(ast: ImplicitReceiver): any;
-    visitInterpolation(ast: Interpolation): any;
-    visitKeyedAccess(ast: KeyedAccess): any;
-    visitLiteralArray(ast: LiteralArray): any;
-    visitLiteralMap(ast: LiteralMap): any;
-    visitLiteralPrimitive(ast: LiteralPrimitive): any;
-    visitMethodCall(ast: MethodCall): any;
-    visitPrefixNot(ast: PrefixNot): any;
-    visitSafeAccessMember(ast: SafeAccessMember): any;
-    visitSafeMethodCall(ast: SafeMethodCall): any;
+    
+     visitAccessMember(ast: AccessMember): any;
+    
+     visitAssignment(ast: Assignment): any;
+    
+     visitBinary(ast: Binary): any;
+    
+     visitChain(ast: Chain): any;
+    
+     visitConditional(ast: Conditional): any;
+    
+     visitIf(ast: If): any;
+    
+     visitPipe(ast: BindingPipe): any;
+    
+     visitFunctionCall(ast: FunctionCall): any;
+    
+     visitImplicitReceiver(ast: ImplicitReceiver): any;
+    
+     visitInterpolation(ast: Interpolation): any;
+    
+     visitKeyedAccess(ast: KeyedAccess): any;
+    
+     visitLiteralArray(ast: LiteralArray): any;
+    
+     visitLiteralMap(ast: LiteralMap): any;
+    
+     visitLiteralPrimitive(ast: LiteralPrimitive): any;
+    
+     visitMethodCall(ast: MethodCall): any;
+    
+     visitPrefixNot(ast: PrefixNot): any;
+    
+     visitSafeAccessMember(ast: SafeAccessMember): any;
+    
+     visitSafeMethodCall(ast: SafeMethodCall): any;
   }
-
-  class AstTransformer implements  AstVisitor {
-    visitImplicitReceiver(ast: ImplicitReceiver): any;
-    visitInterpolation(ast: Interpolation): any;
-    visitLiteralPrimitive(ast: LiteralPrimitive): any;
-    visitAccessMember(ast: AccessMember): any;
-    visitSafeAccessMember(ast: SafeAccessMember): any;
-    visitMethodCall(ast: MethodCall): any;
-    visitSafeMethodCall(ast: SafeMethodCall): any;
-    visitFunctionCall(ast: FunctionCall): any;
-    visitLiteralArray(ast: LiteralArray): any;
-    visitLiteralMap(ast: LiteralMap): any;
-    visitBinary(ast: Binary): any;
-    visitPrefixNot(ast: PrefixNot): any;
-    visitConditional(ast: Conditional): any;
-    visitPipe(ast: BindingPipe): any;
-    visitKeyedAccess(ast: KeyedAccess): any;
-    visitAll(asts: List<any>): any;
-    visitChain(ast: Chain): any;
-    visitAssignment(ast: Assignment): any;
-    visitIf(ast: If): any;
+  
+  class AstTransformer implements AstVisitor {
+    
+     visitImplicitReceiver(ast: ImplicitReceiver): ImplicitReceiver;
+    
+     visitInterpolation(ast: Interpolation): Interpolation;
+    
+     visitLiteralPrimitive(ast: LiteralPrimitive): LiteralPrimitive;
+    
+     visitAccessMember(ast: AccessMember): AccessMember;
+    
+     visitSafeAccessMember(ast: SafeAccessMember): SafeAccessMember;
+    
+     visitMethodCall(ast: MethodCall): MethodCall;
+    
+     visitSafeMethodCall(ast: SafeMethodCall): SafeMethodCall;
+    
+     visitFunctionCall(ast: FunctionCall): FunctionCall;
+    
+     visitLiteralArray(ast: LiteralArray): LiteralArray;
+    
+     visitLiteralMap(ast: LiteralMap): LiteralMap;
+    
+     visitBinary(ast: Binary): Binary;
+    
+     visitPrefixNot(ast: PrefixNot): PrefixNot;
+    
+     visitConditional(ast: Conditional): Conditional;
+    
+     visitPipe(ast: BindingPipe): BindingPipe;
+    
+     visitKeyedAccess(ast: KeyedAccess): KeyedAccess;
+    
+     visitAll(asts: List<any>): List<any>;
+    
+     visitChain(ast: Chain): Chain;
+    
+     visitAssignment(ast: Assignment): Assignment;
+    
+     visitIf(ast: If): If;
   }
-
+  
 }
 
 
 
+declare module "angular2/angular2" {
+  export = ng;
+}
diff --git a/angular2/router-2.0.0-alpha.30.d.ts b/angular2/router-2.0.0-alpha.30.d.ts
new file mode 100644
index 0000000000..bffbf48816
--- /dev/null
+++ b/angular2/router-2.0.0-alpha.30.d.ts
@@ -0,0 +1,352 @@
+// Type definitions for Angular v2.0.0-alpha.30
+// Project: http://angular.io/
+// Definitions by: angular team <https://github.com/angular/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// ***********************************************************
+// This file is generated by the Angular build process.
+// Please do not create manual edits or send pull requests
+// modifying this file.
+// ***********************************************************
+///<reference path="./angular2-2.0.0-alpha.30.d.ts"/>
+
+
+
+/**
+ * @module
+ * @public
+ * @description
+ * Maps application URLs into application states, to support deep-linking and navigation.
+ */
+declare module ng {
+
+  /**
+   * # Router
+   * The router is responsible for mapping URLs to components.
+   * 
+   * You can see the state of the router by inspecting the read-only field `router.navigating`.
+   * This may be useful for showing a spinner, for instance.
+   * 
+   * ## Concepts
+   * Routers and component instances have a 1:1 correspondence.
+   * 
+   * The router holds reference to a number of "outlets." An outlet is a placeholder that the
+   * router dynamically fills in depending on the current URL.
+   * 
+   * When the router navigates from a URL, it must first recognizes it and serialize it into an
+   * `Instruction`.
+   * The router uses the `RouteRegistry` to get an `Instruction`.
+   * 
+   * @exportedAs angular2/router
+   */
+  class Router {
+    
+     navigating: boolean;
+    
+     lastNavigationAttempt: string;
+    
+     previousUrl: string;
+    
+     registry: RouteRegistry;
+    
+     parent: Router;
+    
+     hostComponent: any;
+    
+
+    /**
+     * Constructs a child router. You probably don't need to use this unless you're writing a reusable
+     * component.
+     */
+     childRouter(hostComponent: any): Router;
+    
+
+    /**
+     * Register an object to notify of route changes. You probably don't need to use this unless
+     * you're writing a reusable component.
+     */
+     registerOutlet(outlet: RouterOutlet): Promise<boolean>;
+    
+
+    /**
+     * Dynamically update the routing configuration and trigger a navigation.
+     * 
+     * # Usage
+     * 
+     * ```
+     * router.config({ 'path': '/', 'component': IndexCmp});
+     * ```
+     * 
+     * Or:
+     * 
+     * ```
+     * router.config([
+     *   { 'path': '/', 'component': IndexComp },
+     *   { 'path': '/user/:id', 'component': UserComp },
+     * ]);
+     * ```
+     */
+     config(config: StringMap<string, any>| List<StringMap<string, any>>): Promise<any>;
+    
+
+    /**
+     * Navigate to a URL. Returns a promise that resolves when navigation is complete.
+     * 
+     * If the given URL begins with a `/`, router will navigate absolutely.
+     * If the given URL does not begin with `/`, the router will navigate relative to this component.
+     */
+     navigate(url: string): Promise<any>;
+    
+
+    /**
+     * Subscribe to URL updates from the router
+     */
+     subscribe(onNext: any): void;
+    
+
+    /**
+     * Updates this router and all descendant routers according to the given instruction
+     */
+     commit(instruction: Instruction): Promise<any>;
+    
+
+    /**
+     * Removes the contents of this router's outlet and all descendant outlets
+     */
+     deactivate(): Promise<any>;
+    
+
+    /**
+     * Given a URL, returns an instruction representing the component graph
+     */
+     recognize(url: string): Promise<Instruction>;
+    
+
+    /**
+     * Navigates to either the last URL successfully navigated to, or the last URL requested if the
+     * router has yet to successfully navigate.
+     */
+     renavigate(): Promise<any>;
+    
+
+    /**
+     * Generate a URL from a component name and optional map of parameters. The URL is relative to the
+     * app's base href.
+     */
+     generate(linkParams: List<any>): string;
+  }
+  
+  class RootRouter extends Router {
+    
+     commit(instruction: any): Promise<any>;
+  }
+  
+
+  /**
+   * A router outlet is a placeholder that Angular dynamically fills based on the application's route.
+   * 
+   * ## Use
+   * 
+   * ```
+   * <router-outlet></router-outlet>
+   * ```
+   */
+  class RouterOutlet {
+    
+
+    /**
+     * Given an instruction, update the contents of this outlet.
+     */
+     activate(instruction: Instruction): Promise<any>;
+    
+     deactivate(): Promise<any>;
+    
+     canDeactivate(instruction: Instruction): Promise<boolean>;
+  }
+  
+
+  /**
+   * The RouterLink directive lets you link to specific parts of your app.
+   * 
+   * Consider the following route configuration:
+   * 
+   * ```
+   * @RouteConfig({
+   *   path: '/user', component: UserCmp, as: 'user'
+   * });
+   * class MyComp {}
+   * ```
+   * 
+   * When linking to this `user` route, you can write:
+   * 
+   * ```
+   * <a [router-link]="['./user']">link to user component</a>
+   * ```
+   * 
+   * RouterLink expects the value to be an array of route names, followed by the params
+   * for that level of routing. For instance `['/team', {teamId: 1}, 'user', {userId: 2}]`
+   * means that we want to generate a link for the `team` route with params `{teamId: 1}`,
+   * and with a child route `user` with params `{userId: 2}`.
+   * 
+   * The first route name should be prepended with `/`, `./`, or `../`.
+   * If the route begins with `/`, the router will look up the route from the root of the app.
+   * If the route begins with `./`, the router will instead look in the current component's
+   * children for the route. And if the route begins with `../`, the router will look at the
+   * current component's parent.
+   * 
+   * @exportedAs angular2/router
+   */
+  class RouterLink {
+    
+     visibleHref: string;
+    
+     routeParams: void;
+    
+     onClick(): boolean;
+  }
+  
+  class RouteParams {
+    
+     params: StringMap<string, string>;
+    
+     get(param: string): string;
+  }
+  
+
+  /**
+   * The RouteRegistry holds route configurations for each component in an Angular app.
+   * It is responsible for creating Instructions from URLs, and generating URLs based on route and
+   * parameters.
+   */
+  class RouteRegistry {
+    
+
+    /**
+     * Given a component and a configuration object, add the route to this registry
+     */
+     config(parentComponent: any, config: StringMap<string, any>): void;
+    
+
+    /**
+     * Reads the annotations of a component and configures the registry based on them
+     */
+     configFromComponent(component: any): void;
+    
+
+    /**
+     * Given a URL and a parent component, return the most specific instruction for navigating
+     * the application into the state specified by the url
+     */
+     recognize(url: string, parentComponent: any): Promise<Instruction>;
+    
+
+    /**
+     * Given a normalized list with component names and params like: `['user', {id: 3 }]`
+     * generates a url with a leading slash relative to the provided `parentComponent`.
+     */
+     generate(linkParams: List<any>, parentComponent: any): string;
+  }
+  
+  class LocationStrategy {
+    
+     path(): string;
+    
+     pushState(ctx: any, title: string, url: string): void;
+    
+     forward(): void;
+    
+     back(): void;
+    
+     onPopState(fn: any): void;
+    
+     getBaseHref(): string;
+  }
+  
+  class HashLocationStrategy extends LocationStrategy {
+    
+     onPopState(fn: EventListener): void;
+    
+     getBaseHref(): string;
+    
+     path(): string;
+    
+     pushState(state: any, title: string, url: string): void;
+    
+     forward(): void;
+    
+     back(): void;
+  }
+  
+  class HTML5LocationStrategy extends LocationStrategy {
+    
+     onPopState(fn: EventListener): void;
+    
+     getBaseHref(): string;
+    
+     path(): string;
+    
+     pushState(state: any, title: string, url: string): void;
+    
+     forward(): void;
+    
+     back(): void;
+  }
+  
+
+  /**
+   * This is the service that an application developer will directly interact with.
+   * 
+   * Responsible for normalizing the URL against the application's base href.
+   * A normalized URL is absolute from the URL host, includes the application's base href, and has no
+   * trailing slash:
+   * - `/my/app/user/123` is normalized
+   * - `my/app/user/123` **is not** normalized
+   * - `/my/app/user/123/` **is not** normalized
+   */
+  class Location {
+    
+     path(): string;
+    
+     normalize(url: string): string;
+    
+     normalizeAbsolutely(url: string): string;
+    
+     go(url: string): void;
+    
+     forward(): void;
+    
+     back(): void;
+    
+     subscribe(onNext: any, onThrow?: any, onReturn?: any): void;
+  }
+  
+  var appBaseHrefToken : OpaqueToken ;
+  
+  class Instruction {
+    reuseComponentsFrom(oldInstruction: Instruction): void;
+    params(): StringMap<string, string>;
+    hasChild(): boolean;
+  }
+
+  /**
+   * Responsible for performing each step of navigation.
+   * "Steps" are conceptually similar to "middleware"
+   */
+  class Pipeline {
+    
+     steps: List<Function>;
+    
+     process(instruction: Instruction): Promise<any>;
+  }
+  
+  var routerDirectives : List<any> ;
+  
+  var routerInjectables : List<any> ;
+  
+  var RouteConfig:any;
+  
+}
+
+declare module "angular2/router" {
+  export = ng;
+}
diff --git a/angular2/router.d.ts b/angular2/router.d.ts
new file mode 100644
index 0000000000..dbf50aea07
--- /dev/null
+++ b/angular2/router.d.ts
@@ -0,0 +1,352 @@
+// Type definitions for Angular v2.0.0-alpha.30
+// Project: http://angular.io/
+// Definitions by: angular team <https://github.com/angular/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// ***********************************************************
+// This file is generated by the Angular build process.
+// Please do not create manual edits or send pull requests
+// modifying this file.
+// ***********************************************************
+///<reference path="./angular2.d.ts"/>
+
+
+
+/**
+ * @module
+ * @public
+ * @description
+ * Maps application URLs into application states, to support deep-linking and navigation.
+ */
+declare module ng {
+
+  /**
+   * # Router
+   * The router is responsible for mapping URLs to components.
+   * 
+   * You can see the state of the router by inspecting the read-only field `router.navigating`.
+   * This may be useful for showing a spinner, for instance.
+   * 
+   * ## Concepts
+   * Routers and component instances have a 1:1 correspondence.
+   * 
+   * The router holds reference to a number of "outlets." An outlet is a placeholder that the
+   * router dynamically fills in depending on the current URL.
+   * 
+   * When the router navigates from a URL, it must first recognizes it and serialize it into an
+   * `Instruction`.
+   * The router uses the `RouteRegistry` to get an `Instruction`.
+   * 
+   * @exportedAs angular2/router
+   */
+  class Router {
+    
+     navigating: boolean;
+    
+     lastNavigationAttempt: string;
+    
+     previousUrl: string;
+    
+     registry: RouteRegistry;
+    
+     parent: Router;
+    
+     hostComponent: any;
+    
+
+    /**
+     * Constructs a child router. You probably don't need to use this unless you're writing a reusable
+     * component.
+     */
+     childRouter(hostComponent: any): Router;
+    
+
+    /**
+     * Register an object to notify of route changes. You probably don't need to use this unless
+     * you're writing a reusable component.
+     */
+     registerOutlet(outlet: RouterOutlet): Promise<boolean>;
+    
+
+    /**
+     * Dynamically update the routing configuration and trigger a navigation.
+     * 
+     * # Usage
+     * 
+     * ```
+     * router.config({ 'path': '/', 'component': IndexCmp});
+     * ```
+     * 
+     * Or:
+     * 
+     * ```
+     * router.config([
+     *   { 'path': '/', 'component': IndexComp },
+     *   { 'path': '/user/:id', 'component': UserComp },
+     * ]);
+     * ```
+     */
+     config(config: StringMap<string, any>| List<StringMap<string, any>>): Promise<any>;
+    
+
+    /**
+     * Navigate to a URL. Returns a promise that resolves when navigation is complete.
+     * 
+     * If the given URL begins with a `/`, router will navigate absolutely.
+     * If the given URL does not begin with `/`, the router will navigate relative to this component.
+     */
+     navigate(url: string): Promise<any>;
+    
+
+    /**
+     * Subscribe to URL updates from the router
+     */
+     subscribe(onNext: any): void;
+    
+
+    /**
+     * Updates this router and all descendant routers according to the given instruction
+     */
+     commit(instruction: Instruction): Promise<any>;
+    
+
+    /**
+     * Removes the contents of this router's outlet and all descendant outlets
+     */
+     deactivate(): Promise<any>;
+    
+
+    /**
+     * Given a URL, returns an instruction representing the component graph
+     */
+     recognize(url: string): Promise<Instruction>;
+    
+
+    /**
+     * Navigates to either the last URL successfully navigated to, or the last URL requested if the
+     * router has yet to successfully navigate.
+     */
+     renavigate(): Promise<any>;
+    
+
+    /**
+     * Generate a URL from a component name and optional map of parameters. The URL is relative to the
+     * app's base href.
+     */
+     generate(linkParams: List<any>): string;
+  }
+  
+  class RootRouter extends Router {
+    
+     commit(instruction: any): Promise<any>;
+  }
+  
+
+  /**
+   * A router outlet is a placeholder that Angular dynamically fills based on the application's route.
+   * 
+   * ## Use
+   * 
+   * ```
+   * <router-outlet></router-outlet>
+   * ```
+   */
+  class RouterOutlet {
+    
+
+    /**
+     * Given an instruction, update the contents of this outlet.
+     */
+     activate(instruction: Instruction): Promise<any>;
+    
+     deactivate(): Promise<any>;
+    
+     canDeactivate(instruction: Instruction): Promise<boolean>;
+  }
+  
+
+  /**
+   * The RouterLink directive lets you link to specific parts of your app.
+   * 
+   * Consider the following route configuration:
+   * 
+   * ```
+   * @RouteConfig({
+   *   path: '/user', component: UserCmp, as: 'user'
+   * });
+   * class MyComp {}
+   * ```
+   * 
+   * When linking to this `user` route, you can write:
+   * 
+   * ```
+   * <a [router-link]="['./user']">link to user component</a>
+   * ```
+   * 
+   * RouterLink expects the value to be an array of route names, followed by the params
+   * for that level of routing. For instance `['/team', {teamId: 1}, 'user', {userId: 2}]`
+   * means that we want to generate a link for the `team` route with params `{teamId: 1}`,
+   * and with a child route `user` with params `{userId: 2}`.
+   * 
+   * The first route name should be prepended with `/`, `./`, or `../`.
+   * If the route begins with `/`, the router will look up the route from the root of the app.
+   * If the route begins with `./`, the router will instead look in the current component's
+   * children for the route. And if the route begins with `../`, the router will look at the
+   * current component's parent.
+   * 
+   * @exportedAs angular2/router
+   */
+  class RouterLink {
+    
+     visibleHref: string;
+    
+     routeParams: void;
+    
+     onClick(): boolean;
+  }
+  
+  class RouteParams {
+    
+     params: StringMap<string, string>;
+    
+     get(param: string): string;
+  }
+  
+
+  /**
+   * The RouteRegistry holds route configurations for each component in an Angular app.
+   * It is responsible for creating Instructions from URLs, and generating URLs based on route and
+   * parameters.
+   */
+  class RouteRegistry {
+    
+
+    /**
+     * Given a component and a configuration object, add the route to this registry
+     */
+     config(parentComponent: any, config: StringMap<string, any>): void;
+    
+
+    /**
+     * Reads the annotations of a component and configures the registry based on them
+     */
+     configFromComponent(component: any): void;
+    
+
+    /**
+     * Given a URL and a parent component, return the most specific instruction for navigating
+     * the application into the state specified by the url
+     */
+     recognize(url: string, parentComponent: any): Promise<Instruction>;
+    
+
+    /**
+     * Given a normalized list with component names and params like: `['user', {id: 3 }]`
+     * generates a url with a leading slash relative to the provided `parentComponent`.
+     */
+     generate(linkParams: List<any>, parentComponent: any): string;
+  }
+  
+  class LocationStrategy {
+    
+     path(): string;
+    
+     pushState(ctx: any, title: string, url: string): void;
+    
+     forward(): void;
+    
+     back(): void;
+    
+     onPopState(fn: any): void;
+    
+     getBaseHref(): string;
+  }
+  
+  class HashLocationStrategy extends LocationStrategy {
+    
+     onPopState(fn: EventListener): void;
+    
+     getBaseHref(): string;
+    
+     path(): string;
+    
+     pushState(state: any, title: string, url: string): void;
+    
+     forward(): void;
+    
+     back(): void;
+  }
+  
+  class HTML5LocationStrategy extends LocationStrategy {
+    
+     onPopState(fn: EventListener): void;
+    
+     getBaseHref(): string;
+    
+     path(): string;
+    
+     pushState(state: any, title: string, url: string): void;
+    
+     forward(): void;
+    
+     back(): void;
+  }
+  
+
+  /**
+   * This is the service that an application developer will directly interact with.
+   * 
+   * Responsible for normalizing the URL against the application's base href.
+   * A normalized URL is absolute from the URL host, includes the application's base href, and has no
+   * trailing slash:
+   * - `/my/app/user/123` is normalized
+   * - `my/app/user/123` **is not** normalized
+   * - `/my/app/user/123/` **is not** normalized
+   */
+  class Location {
+    
+     path(): string;
+    
+     normalize(url: string): string;
+    
+     normalizeAbsolutely(url: string): string;
+    
+     go(url: string): void;
+    
+     forward(): void;
+    
+     back(): void;
+    
+     subscribe(onNext: any, onThrow?: any, onReturn?: any): void;
+  }
+  
+  var appBaseHrefToken : OpaqueToken ;
+  
+  class Instruction {
+    reuseComponentsFrom(oldInstruction: Instruction): void;
+    params(): StringMap<string, string>;
+    hasChild(): boolean;
+  }
+
+  /**
+   * Responsible for performing each step of navigation.
+   * "Steps" are conceptually similar to "middleware"
+   */
+  class Pipeline {
+    
+     steps: List<Function>;
+    
+     process(instruction: Instruction): Promise<any>;
+  }
+  
+  var routerDirectives : List<any> ;
+  
+  var routerInjectables : List<any> ;
+  
+  var RouteConfig:any;
+  
+}
+
+declare module "angular2/router" {
+  export = ng;
+}
diff --git a/angularjs/angular-animate.d.ts b/angularjs/angular-animate.d.ts
index 3ecc95b5b7..1ecc3d0d76 100644
--- a/angularjs/angular-animate.d.ts
+++ b/angularjs/angular-animate.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Angular JS 1.3 (ngAnimate module)
 // Project: http://angularjs.org
-// Definitions by: Michel Salib <https://github.com/michelsalib>, Adi Dahiya <https://github.com/adidahiya>, Raphael Schweizer <https://github.com/rasch>
+// Definitions by: Michel Salib <https://github.com/michelsalib>, Adi Dahiya <https://github.com/adidahiya>, Raphael Schweizer <https://github.com/rasch>, Cody Schaaf <https://github.com/codyschaaf>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="angular.d.ts" />
@@ -10,15 +10,22 @@ declare module "angular-animate" {
     export = _;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// ngAnimate module (angular-animate.js)
-///////////////////////////////////////////////////////////////////////////////
+/**
+ * ngAnimate module (angular-animate.js)
+ */
 declare module angular.animate {
+    interface IAnimateFactory extends Function {
+        enter?: (element: ng.IAugmentedJQuery, doneFn: Function) => IAnimateCssRunner|void;
+        leave?: (element: ng.IAugmentedJQuery, doneFn: Function) => IAnimateCssRunner|void;
+        addClass?: (element: ng.IAugmentedJQuery, className: string, doneFn: Function) => IAnimateCssRunner|void;
+        removeClass?: (element: ng.IAugmentedJQuery, className: string, doneFn: Function) => IAnimateCssRunner|void;
+        setClass?: (element: ng.IAugmentedJQuery, className: string, doneFn: Function) => IAnimateCssRunner|void;
+    }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // AnimateService
-    // see http://docs.angularjs.org/api/ngAnimate/service/$animate
-    ///////////////////////////////////////////////////////////////////////////
+    /**
+     * AnimateService
+     * see http://docs.angularjs.org/api/ngAnimate/service/$animate
+     */
     interface IAnimateService extends angular.IAnimateService {
         /**
         * Globally enables / disables animations.
@@ -113,10 +120,10 @@ declare module angular.animate {
         cancel(animationPromise: IPromise<void>): void;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // AngularProvider
-    // see http://docs.angularjs.org/api/ngAnimate/provider/$animateProvider
-    ///////////////////////////////////////////////////////////////////////////
+    /**
+     * AngularProvider
+     * see http://docs.angularjs.org/api/ngAnimate/provider/$animateProvider
+     */
     interface IAnimateProvider {
         /**
          * Registers a new injectable animation factory function.
@@ -135,12 +142,120 @@ declare module angular.animate {
         classNameFilter(expression?: RegExp): RegExp;
     }
 
-	///////////////////////////////////////////////////////////////////////////
-    // Angular Animation Options
-	// see https://docs.angularjs.org/api/ngAnimate/#applying-directive-specific-styles-to-an-animation
-	///////////////////////////////////////////////////////////////////////////
-	interface IAnimationOptions {
-		to?: Object;
-		from?: Object;
-	}
+    /**
+     * Angular Animation Options
+     * see https://docs.angularjs.org/api/ngAnimate/#applying-directive-specific-styles-to-an-animation
+     */
+    interface IAnimationOptions {
+        /**
+         * The ending CSS styles (a key/value object) that will be applied across the animation via a CSS transition.
+         */
+        to?: Object;
+
+        /**
+         * The starting CSS styles (a key/value object) that will be applied at the start of the animation.
+         */
+        from?: Object;
+
+        /**
+         * The DOM event (e.g. enter, leave, move). When used, a generated CSS class of ng-EVENT and
+         * ng-EVENT-active will be applied to the element during the animation. Multiple events can be provided when
+         * spaces are used as a separator. (Note that this will not perform any DOM operation.)
+         */
+        event?: string;
+
+        /**
+         * The CSS easing value that will be applied to the transition or keyframe animation (or both).
+         */
+        easing?: string;
+
+        /**
+         * The raw CSS transition style that will be used (e.g. 1s linear all).
+         */
+        transition?: string;
+
+        /**
+         * The raw CSS keyframe animation style that will be used (e.g. 1s my_animation linear).
+         */
+        keyframe?: string;
+
+        /**
+         * A space separated list of CSS classes that will be added to the element and spread across the animation.
+         */
+        addClass?: string;
+
+        /**
+         * A space separated list of CSS classes that will be removed from the element and spread across
+         * the animation.
+         */
+        removeClass?: string;
+
+        /**
+         * A number value representing the total duration of the transition and/or keyframe (note that a value
+         * of 1 is 1000ms). If a value of 0 is provided then the animation will be skipped entirely.
+         */
+        duration?: number;
+
+        /**
+         * A number value representing the total delay of the transition and/or keyframe (note that a value of
+         * 1 is 1000ms). If a value of true is used then whatever delay value is detected from the CSS classes will be
+         * mirrored on the elements styles (e.g. by setting delay true then the style value of the element will be
+         * transition-delay: DETECTED_VALUE). Using true is useful when you want the CSS classes and inline styles to
+         * all share the same CSS delay value.
+         */
+        delay?: number;
+
+        /**
+         * A numeric time value representing the delay between successively animated elements (Click here to
+         * learn how CSS-based staggering works in ngAnimate.)
+         */
+        stagger?: number;
+
+        /**
+         * The numeric index representing the stagger item (e.g. a value of 5 is equal to the sixth item
+         * in the stagger; therefore when a stagger option value of 0.1 is used then there will be a stagger delay of 600ms)
+         * applyClassesEarly - Whether or not the classes being added or removed will be used when detecting the animation.
+         * This is set by $animate when enter/leave/move animations are fired to ensure that the CSS classes are resolved in time.
+         * (Note that this will prevent any transitions from occuring on the classes being added and removed.)
+         */
+        staggerIndex?: number;
+    }
+
+    interface IAnimateCssRunner {
+        /**
+         * Starts the animation
+         *
+         * @returns The animation runner with a done function for supplying a callback.
+         */
+        start(): IAnimateCssRunnerStart;
+
+        /**
+         * Ends (aborts) the animation
+         */
+        end(): void;
+    }
+
+    interface IAnimateCssRunnerStart extends IPromise<void> {
+        /**
+         * Allows you to add done callbacks to the running animation
+         *
+         * @param callbackFn: the callback function to be run
+         */
+        done(callbackFn: (animationFinished: boolean) => void): void;
+    }
+
+    /**
+     * AnimateCssService
+     * see http://docs.angularjs.org/api/ngAnimate/service/$animateCss
+     */
+    interface IAnimateCssService {
+        (element: JQuery, animateCssOptions: IAnimationOptions): IAnimateCssRunner;
+    }
+
+}
+
+declare module angular {
+    interface IModule {
+        animate(cssSelector: string, animateFactory: angular.animate.IAnimateFactory): IModule;
+    }
 }
diff --git a/angularjs/angular-cookies.d.ts b/angularjs/angular-cookies.d.ts
index cdea69d369..e34518b8ab 100644
--- a/angularjs/angular-cookies.d.ts
+++ b/angularjs/angular-cookies.d.ts
@@ -11,23 +11,23 @@ declare module "angular-cookies" {
     export = _;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// ngCookies module (angular-cookies.js)
-///////////////////////////////////////////////////////////////////////////////
+/**
+ * ngCookies module (angular-cookies.js)
+ */
 declare module angular.cookies {
 
-    ///////////////////////////////////////////////////////////////////////////
-    // CookieService
-    // see http://docs.angularjs.org/api/ngCookies.$cookies
-    ///////////////////////////////////////////////////////////////////////////
+    /**
+     * CookieService
+     * see http://docs.angularjs.org/api/ngCookies.$cookies
+     */
     interface ICookiesService {
         [index: string]: any;
     }
 
-    ///////////////////////////////////////////////////////////////////////////
-    // CookieStoreService
-    // see http://docs.angularjs.org/api/ngCookies.$cookieStore
-    ///////////////////////////////////////////////////////////////////////////
+    /**
+     * CookieStoreService
+     * see http://docs.angularjs.org/api/ngCookies.$cookieStore
+     */
     interface ICookiesService {
         get(key: string): string;
         getObject(key: string): any;
@@ -37,4 +37,27 @@ declare module angular.cookies {
         remove(key: string, options?: any): void;
     }
 
+    /**
+     * CookieStoreService DEPRECATED
+     * see https://code.angularjs.org/1.2.26/docs/api/ngCookies/service/$cookieStore
+     */
+    interface ICookieStoreService {
+        /**
+         * Returns the value of given cookie key
+         * @param key Id to use for lookup
+         */
+        get(key: string): any;
+        /**
+         * Sets a value for given cookie key
+         * @param key Id for the value
+         * @param value Value to be stored
+         */
+        put(key: string, value: any): void;
+        /**
+         * Remove given cookie
+         * @param key Id of the key-value pair to delete
+         */
+        remove(key: string): void;
+    }
+
 }
diff --git a/angularjs/angular-mocks.d.ts b/angularjs/angular-mocks.d.ts
index 1c1966c1b0..e6b668a7b7 100644
--- a/angularjs/angular-mocks.d.ts
+++ b/angularjs/angular-mocks.d.ts
@@ -15,12 +15,6 @@ declare module "angular-mocks/ngAnimateMock" {
     export = _;
 }
 
-///////////////////////////////////////////////////////////////////////////////
-// functions attached to global object (window)
-///////////////////////////////////////////////////////////////////////////////
-declare var module: (...modules: any[]) => any;
-declare var inject: (...fns: Function[]) => any;
-
 ///////////////////////////////////////////////////////////////////////////////
 // ngMock module (angular-mocks.js)
 ///////////////////////////////////////////////////////////////////////////////
@@ -33,30 +27,32 @@ declare module angular {
     interface IAngularStatic {
         mock: IMockStatic;
     }
+    
+    // see https://docs.angularjs.org/api/ngMock/function/angular.mock.inject
+    interface IInjectStatic {
+        (...fns: Function[]): any;
+        (...inlineAnnotatedConstructor: any[]): any; // this overload is undocumented, but works
+        strictDi(val?: boolean): void;
+    }
 
     interface IMockStatic {
-        // see http://docs.angularjs.org/api/angular.mock.dump
+        // see https://docs.angularjs.org/api/ngMock/function/angular.mock.dump
         dump(obj: any): string;
 
-        // see http://docs.angularjs.org/api/angular.mock.inject
-        inject: {
-            (...fns: Function[]): any;
-            (...inlineAnnotatedConstructor: any[]): any; // this overload is undocumented, but works
-            strictDi(val?: boolean): void;
-        }
+        inject: IInjectStatic
 
-        // see http://docs.angularjs.org/api/angular.mock.module
+        // see https://docs.angularjs.org/api/ngMock/function/angular.mock.module
         module(...modules: any[]): any;
 
-        // see http://docs.angularjs.org/api/angular.mock.TzDate
+        // see https://docs.angularjs.org/api/ngMock/type/angular.mock.TzDate
         TzDate(offset: number, timestamp: number): Date;
         TzDate(offset: number, timestamp: string): Date;
     }
 
     ///////////////////////////////////////////////////////////////////////////
     // ExceptionHandlerService
-    // see http://docs.angularjs.org/api/ngMock.$exceptionHandler
-    // see http://docs.angularjs.org/api/ngMock.$exceptionHandlerProvider
+    // see https://docs.angularjs.org/api/ngMock/service/$exceptionHandler
+    // see https://docs.angularjs.org/api/ngMock/provider/$exceptionHandlerProvider
     ///////////////////////////////////////////////////////////////////////////
     interface IExceptionHandlerProvider extends IServiceProvider {
         mode(mode: string): void;
@@ -64,7 +60,7 @@ declare module angular {
 
     ///////////////////////////////////////////////////////////////////////////
     // TimeoutService
-    // see http://docs.angularjs.org/api/ngMock.$timeout
+    // see https://docs.angularjs.org/api/ngMock/service/$timeout
     // Augments the original service
     ///////////////////////////////////////////////////////////////////////////
     interface ITimeoutService {
@@ -75,7 +71,7 @@ declare module angular {
 
     ///////////////////////////////////////////////////////////////////////////
     // IntervalService
-    // see http://docs.angularjs.org/api/ngMock.$interval
+    // see https://docs.angularjs.org/api/ngMock/service/$interval
     // Augments the original service
     ///////////////////////////////////////////////////////////////////////////
     interface IIntervalService {
@@ -84,7 +80,7 @@ declare module angular {
 
     ///////////////////////////////////////////////////////////////////////////
     // LogService
-    // see http://docs.angularjs.org/api/ngMock.$log
+    // see https://docs.angularjs.org/api/ngMock/service/$log
     // Augments the original service
     ///////////////////////////////////////////////////////////////////////////
     interface ILogService {
@@ -98,7 +94,7 @@ declare module angular {
 
     ///////////////////////////////////////////////////////////////////////////
     // HttpBackendService
-    // see http://docs.angularjs.org/api/ngMock.$httpBackend
+    // see https://docs.angularjs.org/api/ngMock/service/$httpBackend
     ///////////////////////////////////////////////////////////////////////////
     interface IHttpBackendService {
         flush(count?: number): void;
@@ -237,3 +233,9 @@ declare module angular {
     }
 
 }
+
+///////////////////////////////////////////////////////////////////////////////
+// functions attached to global object (window)
+///////////////////////////////////////////////////////////////////////////////
+declare var module: (...modules: any[]) => any;
+declare var inject: angular.IInjectStatic;
diff --git a/angularjs/angular-tests.ts b/angularjs/angular-tests.ts
index 9750599999..fed501acd7 100755
--- a/angularjs/angular-tests.ts
+++ b/angularjs/angular-tests.ts
@@ -281,6 +281,7 @@ function test_IAttributes(attributes: ng.IAttributes){
 }
 
 test_IAttributes({
+    $normalize: function (classVal){},
     $addClass: function (classVal){},
     $removeClass: function(classVal){},
     $set: function(key, value){},
diff --git a/angularjs/angular.d.ts b/angularjs/angular.d.ts
index c7c90efe55..018ecbaaf3 100755
--- a/angularjs/angular.d.ts
+++ b/angularjs/angular.d.ts
@@ -249,12 +249,12 @@ declare module angular {
         isString(value: any): boolean;
         isUndefined(value: any): boolean;
         lowercase(str: string): string;
-        
+
         /**
          * Deeply extends the destination object dst by copying own enumerable properties from the src object(s) to dst. You can specify multiple src objects. If you want to preserve original objects, you can do so by passing an empty object as the target: var object = angular.merge({}, object1, object2).
-         * 
+         *
          * Unlike extend(), merge() recursively descends into object properties of source objects, performing a deep copy.
-         * 
+         *
          * @param dst Destination object.
          * @param src Source object(s).
          */
@@ -419,6 +419,15 @@ declare module angular {
          */
         [name: string]: any;
 
+        /**
+         * Converts an attribute name (e.g. dash/colon/underscore-delimited string, optionally prefixed with x- or data-) to its normalized, camelCase form.
+         * 
+         * Also there is special case for Moz prefix starting with upper case letter.
+         * 
+         * For further information check out the guide on @see https://docs.angularjs.org/guide/directive#matching-directives
+         */
+        $normalize(name: string): void;
+
         /**
          * Adds the CSS class value specified by the classVal parameter to the
          * element. If animations are enabled then an animation will be triggered
@@ -524,11 +533,14 @@ declare module angular {
     }
 
     interface IModelValidators {
-        [index: string]: (modelValue: any, viewValue: string) => boolean;
+        /**
+         * viewValue is any because it can be an object that is called in the view like $viewValue.name:$viewValue.subName
+         */
+        [index: string]: (modelValue: any, viewValue: any) => boolean;
     }
 
     interface IAsyncModelValidators {
-        [index: string]: (modelValue: any, viewValue: string) => IPromise<any>;
+        [index: string]: (modelValue: any, viewValue: any) => IPromise<any>;
     }
 
     interface IModelParser {
@@ -560,11 +572,11 @@ declare module angular {
 
         /**
          * Dispatches an event name downwards to all child scopes (and their children) notifying the registered $rootScope.Scope listeners.
-         * 
+         *
          * The event life cycle starts at the scope on which $broadcast was called. All listeners listening for name event on this scope get notified. Afterwards, the event propagates to all direct and indirect scopes of the current scope and calls all registered listeners along the way. The event cannot be canceled.
-         * 
+         *
          * Any exception emitted from the listeners will be passed onto the $exceptionHandler service.
-         * 
+         *
          * @param name Event name to broadcast.
          * @param args Optional one or more arguments which will be passed onto the event listeners.
          */
@@ -577,7 +589,7 @@ declare module angular {
          * The event life cycle starts at the scope on which $emit was called. All listeners listening for name event on this scope get notified. Afterwards, the event traverses upwards toward the root scope and calls all registered listeners along the way. The event will stop propagating if one of the listeners cancels it.
          *
          * Any exception emitted from the listeners will be passed onto the $exceptionHandler service.
-         * 
+         *
          * @param name Event name to emit.
          * @param args Optional one or more arguments which will be passed onto the event listeners.
          */
@@ -757,16 +769,16 @@ declare module angular {
 
     /**
      * $filter - $filterProvider - service in module ng
-     * 
+     *
      * Filters are used for formatting data displayed to the user.
-     * 
+     *
      * see https://docs.angularjs.org/api/ng/service/$filter
      */
     interface IFilterService {
         /**
          * Usage:
          * $filter(name);
-         * 
+         *
          * @param name Name of the filter function to retrieve
          */
         (name: string): Function;
@@ -774,15 +786,15 @@ declare module angular {
 
     /**
      * $filterProvider - $filter - provider in module ng
-     * 
+     *
      * Filters are just functions which transform input to an output. However filters need to be Dependency Injected. To achieve this a filter definition consists of a factory function which is annotated with dependencies and is responsible for creating a filter function.
-     * 
+     *
      * see https://docs.angularjs.org/api/ng/provider/$filterProvider
      */
     interface IFilterProvider extends IServiceProvider {
         /**
          * register(name);
-         * 
+         *
          * @param name Name of the filter function, or an object map of filters where the keys are the filter names and the values are the filter factories. Note: Filter names must be valid angular Expressions identifiers, such as uppercase or orderBy. Names with special characters, such as hyphens and dots, are not allowed. If you wish to namespace your filters, then you can use capitalization (myappSubsectionFilterx) or underscores (myapp_subsection_filterx).
          */
         register(name: string | {}): IServiceProvider;
@@ -1033,10 +1045,10 @@ declare module angular {
     interface IPromise<T> {
         /**
          * Regardless of when the promise was or will be resolved or rejected, then calls one of the success or error callbacks asynchronously as soon as the result is available. The callbacks are called with a single argument: the result or rejection reason. Additionally, the notify callback may be called zero or more times to provide a progress indication, before the promise is resolved or rejected.
-         *
+         * The successCallBack may return IPromise<void> for when a $q.reject() needs to be returned
          * This method returns a new promise which is resolved or rejected via the return value of the successCallback, errorCallback. It also notifies via the return value of the notifyCallback method. The promise can not be resolved or rejected from the notifyCallback method.
          */
-        then<TResult>(successCallback: (promiseValue: T) => IHttpPromise<TResult>|IPromise<TResult>|TResult, errorCallback?: (reason: any) => any, notifyCallback?: (state: any) => any): IPromise<TResult>;
+        then<TResult>(successCallback: (promiseValue: T) => IHttpPromise<TResult>|IPromise<TResult>|TResult|IPromise<void>, errorCallback?: (reason: any) => any, notifyCallback?: (state: any) => any): IPromise<TResult>;
 
         /**
          * Shorthand for promise.then(null, errorCallback)
@@ -1074,31 +1086,31 @@ declare module angular {
 
     /**
      * $cacheFactory - service in module ng
-     * 
+     *
      * Factory that constructs Cache objects and gives access to them.
-     * 
+     *
      * see https://docs.angularjs.org/api/ng/service/$cacheFactory
      */
     interface ICacheFactoryService {
         /**
          * Factory that constructs Cache objects and gives access to them.
-         * 
+         *
          * @param cacheId Name or id of the newly created cache.
          * @param optionsMap Options object that specifies the cache behavior. Properties:
-         * 
+         *
          * capacity — turns the cache into LRU cache.
          */
         (cacheId: string, optionsMap?: { capacity?: number; }): ICacheObject;
 
         /**
-         * Get information about all the caches that have been created. 
+         * Get information about all the caches that have been created.
          * @returns key-value map of cacheId to the result of calling cache#info
          */
         info(): any;
 
         /**
          * Get access to a cache object by the cacheId used when it was created.
-         * 
+         *
          * @param cacheId Name or id of a cache to access.
          */
         get(cacheId: string): ICacheObject;
@@ -1106,9 +1118,9 @@ declare module angular {
 
     /**
      * $cacheFactory.Cache - type in module ng
-     * 
+     *
      * A cache object used to store and retrieve data, primarily used by $http and the script directive to cache templates and other data.
-     * 
+     *
      * see https://docs.angularjs.org/api/ng/type/$cacheFactory.Cache
      */
     interface ICacheObject {
@@ -1131,9 +1143,9 @@ declare module angular {
 
         /**
          * Inserts a named entry into the Cache object to be retrieved later, and incrementing the size of the cache if the key was not already present in the cache. If behaving like an LRU cache, it will also remove stale entries from the set.
-         * 
+         *
          * It will not insert undefined values into the cache.
-         * 
+         *
          * @param key the key under which the cached data is stored.
          * @param value the value to store alongside the key. If it is undefined, the key will not be stored.
          */
@@ -1141,14 +1153,14 @@ declare module angular {
 
         /**
          * Retrieves named data stored in the Cache object.
-         * 
+         *
          * @param key the key of the data to be retrieved
          */
         get(key: string): any;
 
         /**
          * Removes an entry from the Cache object.
-         * 
+         *
          * @param key the key of the entry to be removed
          */
         remove(key: string): void;
@@ -1163,7 +1175,7 @@ declare module angular {
          */
         destroy(): void;
     }
-    
+
     ///////////////////////////////////////////////////////////////////////////
     // CompileService
     // see http://docs.angularjs.org/api/ng.$compile
@@ -1416,6 +1428,11 @@ declare module angular {
     */
     interface IHttpProviderDefaults {
         cache?: boolean;
+        /**
+         * Transform function or an array of such functions. The transform function takes the http request body and
+         * headers and returns its transformed (typically serialized) version.
+         */
+        transformRequest?: ((data: any, headersGetter?: any) => any)|((data: any, headersGetter?: any) => any)[];
         xsrfCookieName?: string;
         xsrfHeaderName?: string;
         withCredentials?: boolean;
diff --git a/arcgis-js-api/arcgis-js-api.d.ts b/arcgis-js-api/arcgis-js-api.d.ts
index 1f6523a237..ba5e0fb9f4 100644
--- a/arcgis-js-api/arcgis-js-api.d.ts
+++ b/arcgis-js-api/arcgis-js-api.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ArcGIS API for JavaScript v3.13
+// Type definitions for ArcGIS API for JavaScript v3.14
 // Project: http://js.arcgis.com
 // Definitions by: Esri <http://www.esri.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -16,12 +16,12 @@ declare module "esri" {
   import Extent = require("esri/geometry/Extent");
   import TileInfo = require("esri/layers/TileInfo");
   import BasemapLayer = require("esri/dijit/BasemapLayer");
+  import Symbol = require("esri/symbols/Symbol");
   import BookmarkItem = require("esri/dijit/BookmarkItem");
   import Units = require("esri/units");
   import Color = require("esri/Color");
   import LocationProviderBase = require("esri/tasks/locationproviders/LocationProviderBase");
   import PictureMarkerSymbol = require("esri/symbols/PictureMarkerSymbol");
-  import Geocoder = require("esri/dijit/Geocoder");
   import RouteParameters = require("esri/tasks/RouteParameters");
   import SimpleLineSymbol = require("esri/symbols/SimpleLineSymbol");
   import Font = require("esri/symbols/Font");
@@ -31,16 +31,19 @@ declare module "esri" {
   import LayerSource = require("esri/layers/LayerSource");
   import GraphicsLayer = require("esri/layers/GraphicsLayer");
   import SpatialReference = require("esri/SpatialReference");
-  import Symbol = require("esri/symbols/Symbol");
   import Layer = require("esri/layers/layer");
+  import SimpleFillSymbol = require("esri/symbols/SimpleFillSymbol");
+  import ArcGISImageServiceLayer = require("esri/layers/ArcGISImageServiceLayer");
+  import SimpleMarkerSymbol = require("esri/symbols/SimpleMarkerSymbol");
   import Locator = require("esri/tasks/locator");
   import InfoWindowBase = require("esri/InfoWindowBase");
   import LOD = require("esri/layers/LOD");
+  import Polyline = require("esri/geometry/Polyline");
+  import Polygon = require("esri/geometry/Polygon");
   import FillSymbol = require("esri/symbols/FillSymbol");
   import PrintTemplate = require("esri/tasks/PrintTemplate");
   import QueryTask = require("esri/tasks/QueryTask");
   import TextSymbol = require("esri/symbols/TextSymbol");
-  import SimpleMarkerSymbol = require("esri/symbols/SimpleMarkerSymbol");
   import StandardGeographyQueryTask = require("esri/tasks/geoenrichment/StandardGeographyQueryTask");
   import WMTSLayerInfo = require("esri/layers/WMTSLayerInfo");
 
@@ -245,6 +248,18 @@ declare module "esri" {
     /** Whether the widget is visible by default. */
     visible?: boolean;
   }
+  export interface BlendRendererOptions {
+    /** This determines how colors are blended together. */
+    blendMode?: string;
+    /** An array of objects to blend containing the field name and color to use. */
+    fields: any[];
+    /** The field to normalize. */
+    normalizationField?: string;
+    /** An array of objects which determines opacity. */
+    opacityStops: any[];
+    /** The symbol in which the BlendRenderer is applied. */
+    symbol: Symbol;
+  }
   export interface BookmarksOptions {
     /** An array of BookmarkItem objects or a json object with the BookmarkItem format to initially display in the bookmark widget. */
     bookmarks?: BookmarkItem[];
@@ -279,7 +294,7 @@ declare module "esri" {
   }
   export interface CircleOptions2 {
     /** The center point of the circle. */
-    center: any;
+    center: Point | number[];
     /** Applicable when the spatial reference of the center point is either set to Web Mercator or geographic/geodesic as true would apply. */
     geodesic?: boolean;
     /** A circle can be thought of similar to a polygon. */
@@ -537,7 +552,7 @@ declare module "esri" {
   }
   export interface DirectionsOptions {
     /** Defines the values that label each stop. */
-    alphabet?: any;
+    alphabet?: string | string[] | boolean;
     /** When true, solve will start when the last destination is complete and enter key is hit. */
     autoSolve?: boolean;
     /** Display the 'Add Destination' button. */
@@ -556,10 +571,6 @@ declare module "esri" {
     fromSymbol?: PictureMarkerSymbol;
     /** The symbol that displays when the from location is dragged to a new location. */
     fromSymbolDrag?: PictureMarkerSymbol;
-    /** Define optional geocoder options view the Geocoder help for details on the object properties. */
-    geocoderOptions?: any;
-    /** List of Geocoder widgets used for each stop. */
-    geocoders?: Geocoder[];
     /** If available, this geometry service is used to provide latitude/longitude values for stops whose reverse geocoding did not return an address (Added at v3.11). */
     geometryTaskUrl?: string;
     /** Reference to the map object. */
@@ -586,6 +597,8 @@ declare module "esri" {
     routeSymbol?: SimpleLineSymbol;
     /** Specify the service that will be used to calculate directions. */
     routeTaskUrl?: string;
+    /** Used to define optional search options. */
+    searchOptions?: any;
     /** Define the info template for the popup that appears when the popup for a route segment is displayed. */
     segmentInfoTemplate?: InfoTemplate;
     /** Specify the symbol used to render the individual route segments that display on the map when a direction step is clicked. */
@@ -617,7 +630,7 @@ declare module "esri" {
     /** List of graphics used to display the point marker. */
     stopGraphics?: Graphic[];
     /** An array of points that define the stop locations. */
-    stops?: any;
+    stops?: Point[] | number[][] | string[] | any[];
     /** Define the info template for the popup that appears when a stop is clicked. */
     stopsInfoTemplate?: InfoTemplate;
     /** The symbol that displays on the map for the locations between the origin and final destination locations. */
@@ -642,6 +655,8 @@ declare module "esri" {
     traffic?: boolean;
     /** The traffic layer used for real-time traffic. */
     trafficLayer?: ArcGISDynamicMapServiceLayer;
+    /** An example of when to use this is when working with a proxied ArcGIS Online route service item with stored credentials. */
+    travelModesServiceUrl?: string;
   }
   export interface DissolveBoundariesOptions {
     /** The URL to the GPServer used to execute an analysis job. */
@@ -709,7 +724,7 @@ declare module "esri" {
     /** Marker symbol used to display the insertable vertices. */
     ghostVertexSymbol?: MarkerSymbol;
     /** If users want to place the text symbol editor to a user defined HTML element. */
-    textSymbolEditorHolder?: any;
+    textSymbolEditorHolder?: Node | string;
     /** When true, if the geometry is re-sized the aspect ration will be preserved. */
     uniformScaling?: boolean;
     /** Marker symbol used to draw the vertices. */
@@ -719,6 +734,16 @@ declare module "esri" {
     /** Create a new settings object that defines the capabilities of the widget. */
     settings?: any;
   }
+  export interface ElevationProfileOptions {
+    /** This object contains properties used to render the chart. */
+    chartOptions?: any;
+    /** Reference to the map. */
+    map: Map;
+    /** The URL to the elevation profile service. */
+    profileTaskUrl: string;
+    /** The measurement unit of the scalebar units. */
+    scalebarUnits?: string;
+  }
   export interface EnrichLayerOptions {
     /** The URL to the GPServer used to execute an analysis job. */
     analysisGpServer?: string;
@@ -823,6 +848,10 @@ declare module "esri" {
     /** Initial visibility of the layer. */
     visible?: boolean;
   }
+  export interface FeatureLayerStatisticsOptions {
+    /** The feature layer that will be the source for calculating statistics. */
+    layer: FeatureLayer;
+  }
   export interface FeatureTableOptions {
     /** A dGrid property. */
     allowSelectAll?: boolean;
@@ -963,7 +992,7 @@ declare module "esri" {
   }
   export interface GeocoderOptions {
     /** By default, the Geocoder widget uses the Esri World Locator to find search locations. */
-    arcgisGeocoder?: any;
+    arcgisGeocoder?: boolean | any;
     /** When false, the geocoder will not display the auto-complete results menu. */
     autoComplete?: boolean;
     /** When false, the geolocator will not navigate to the result after selection or search. */
@@ -1005,7 +1034,7 @@ declare module "esri" {
     /** Class attribute to set for the layer's node. */
     className?: string;
     /** List of attribute fields to be added as custom data attributes to graphics node. */
-    dataAttributes?: any;
+    dataAttributes?: string | string[];
     /** When true, graphics are displayed during panning. */
     displayOnPan?: boolean;
     /** Id to assign to the layer. */
@@ -1085,6 +1114,44 @@ declare module "esri" {
     /** Specify the geodatabase version to display. */
     gdbVersion?: string;
   }
+  export interface ImageServiceMeasureOptions {
+    /** Symbol to be used when drawing a polygon or extent. */
+    fillSymbol?: SimpleFillSymbol;
+    /** Image service layer with which the toolbar is associated. */
+    layer: ArcGISImageServiceLayer;
+    /** Symbol to be used when drawing a line. */
+    lineSymbol?: SimpleLineSymbol;
+    /** Map instance with which the toolbar is associate. */
+    map: Map;
+    /** Symbol to be used when drawing a point. */
+    markerSymbol?: SimpleMarkerSymbol;
+  }
+  export interface ImageServiceMeasureToolOptions {
+    /** The angular unit in which directions of line segments will be calculated. */
+    angularUnit?: string;
+    /** The area unit in which areas of polygons will be calculated. */
+    areaUnit?: string;
+    /** Symbol to be used when drawing a polygon or extent. */
+    fillSymbol?: SimpleFillSymbol;
+    /** Image service layer the toolbar is associated with. */
+    layer: ArcGISImageServiceLayer;
+    /** The linear unit in which height, length, or perimeters will be calculated. */
+    linearUnit?: string;
+    /** Symbol to be used when drawing a line. */
+    lineSymbol?: SimpleLineSymbol;
+    /** Map instance the toolbar is associated with. */
+    map: Map;
+    /** Symbol to be used when drawing a point. */
+    markerSymbol?: SimpleMarkerSymbol;
+  }
+  export interface ImageSpatialReferenceOptions {
+    /** The full Image Coordinate System object, which includes transformations and map spatial reference information specific to each image. */
+    ics?: any;
+    /** The OBJECTID of the image in a mosaic dataset. */
+    icsid?: number;
+    /** The url of the image service. */
+    url: string;
+  }
   export interface KMLLayerOptions {
     /** Class attribute to set for the layer's node. */
     className?: string;
@@ -1099,6 +1166,20 @@ declare module "esri" {
     /** Display mode for the label layer. */
     mode?: string;
   }
+  export interface LayerListOptions {
+    /** An array of operational layers. */
+    layers: any[];
+    /** Reference to the map. */
+    map: Map;
+    /** Indicates whether to remove underscores from the layer title. */
+    removeUnderscores?: boolean;
+    /** Indicates whether to show sublayers in the list of layers. */
+    subLayers?: boolean;
+    /** The CSS class selector used to uniquely style the widget. */
+    theme?: string;
+    /** Indicates whether to show the LayerList widget. */
+    visible?: boolean;
+  }
   export interface LayerOptions {
     /** Class attribute to set for the layer's node. */
     className?: string;
@@ -1183,7 +1264,7 @@ declare module "esri" {
     /** Specify a basemap for the map. */
     basemap?: string;
     /** The location where the map should be centered. */
-    center?: any;
+    center?: number[] | Point;
     /** When true, graphics are displayed during panning. */
     displayGraphicsOnPan?: boolean;
     /** If provided, the extent and projection of the map is set to the properties of Extent. */
@@ -1249,7 +1330,7 @@ declare module "esri" {
     /** The default length unit for the measure distance tool. */
     defaultLengthUnit?: Units;
     /** Allows the user to immediately measure previously-created geometry on dijit creation. */
-    geometry?: any;
+    geometry?: Point | Polyline | Polygon;
     /** Line symbol used to draw the lines for the measure line and measure distance tools. */
     lineSymbol?: SimpleLineSymbol;
     /** Reference to the map. */
@@ -1341,6 +1422,36 @@ declare module "esri" {
     /** The ArcGIS for Portal URL. */
     portalUrl?: string;
   }
+  export interface ObliqueViewerOptions {
+    /** Azimuth angle value for which to display oblique images. */
+    azimuthAngle?: number;
+    /** Image service field that denotes the sensor azimuth value for a record. */
+    azimuthField?: string;
+    /** Tolerance value applied when filtering azimuth images. */
+    azimuthTolerance?: number;
+    /** Image service field that denotes the sensor elevation value for a record. */
+    elevationField?: string;
+    /** Elevation value between 0 and 90 that differentiates an image as oblique or nadir. */
+    elevationThreshold?: number;
+    /** Image service layer to be used as source for oblique images. */
+    imageServiceLayer: ArcGISImageServiceLayer;
+    /** Map object associated with the widget. */
+    map: Map;
+    /** When true, the widget doesn't refresh itself with new oblique records when the map's extent changes. */
+    noQueryOnExtentChange?: boolean;
+    /** Raster info fields to be queried and displayed in the raster list. */
+    rasterInfoFields?: any[];
+    /** DOM Node or id, where the list element is to be placed. */
+    rasterListDiv?: string | Node;
+    /** When true, list is populated on data refresh. */
+    rasterListRefresh?: boolean;
+    /** DOM Node or id, where the oblique rotation gauge element is to be placed. */
+    rotationDiv?: string | Node;
+    /** When true, thumbnail images for records are displayed in the list. */
+    showThumbnail?: boolean;
+    /** Sorting function that takes query results and sorts them. */
+    sorter?: Function;
+  }
   export interface OpacitySliderOptions {
     /** Handles identified by their index values within the stops array. */
     handles: number[];
@@ -1595,7 +1706,7 @@ declare module "esri" {
     /** Toggle for showing the black handle bars. */
     showHandles?: boolean;
     /** Flexible toggle for showing labels (e.g. */
-    showLabels?: any;
+    showLabels?: boolean | string[];
     /** Toggle for showing the horizontal line indicators from the center of the handle. */
     showTicks?: boolean;
     /** Stores positions represented as numbers that fall between minimum and maximum. */
@@ -1623,7 +1734,7 @@ declare module "esri" {
   }
   export interface SearchOptions {
     /** The currently selected source. */
-    activeSourceIndex?: any;
+    activeSourceIndex?: number | string;
     /** Indicates whether to automatically add all the feature layers from the map. */
     addLayersFromMap?: boolean;
     /** Indicates whether to automatically navigate to the selected result. */
@@ -1710,6 +1821,8 @@ declare module "esri" {
     sizeInfo: any;
     /** Represents statistics data object. */
     statistics?: any;
+    /** The symbol used with the widget. */
+    symbol: Symbol;
     /** Additional options to customize slider. */
     zoomOptions?: any;
   }
@@ -1883,6 +1996,18 @@ declare module "esri" {
     /** When true, the template picker displays map service legend swatches for feature layers created in selection mode that have an associated map service added to the map as a dynamic map service layer. */
     useLegend?: boolean;
   }
+  export interface TimeClassBreaksAgerOptions {
+    /** The alpha opacity for the break. */
+    alpha: number;
+    /** The color for the break. */
+    color: Color;
+    /** The maximum age for the break info. */
+    maxAge: number;
+    /** The minimum age for the break info. */
+    minAge: number;
+    /** The size for the break. */
+    size: number;
+  }
   export interface TimeSliderOptions {
     /** When true, subtracts one second to the time extent's end time to exclude data at the exact end time instant. */
     excludeDataAtLeadingThumb?: boolean;
@@ -1937,6 +2062,42 @@ declare module "esri" {
     /** A predefined style. */
     style?: string;
   }
+  export interface VisibleScaleRangeSliderOptions {
+    /** Layer used to determine the suggested scale range and set the minScale, maxScale values. */
+    layer: FeatureLayer;
+    /** Reference to the map. */
+    map: Map;
+    /** Region of preview scale thumbnails. */
+    region?: string;
+  }
+  export interface WFSLayerOptions {
+    /** Full WFS body request sent to WFS server via POST method. */
+    getFeatureRequest?: string;
+    /** URL used when executing getFeature request. */
+    getFeatureUrl?: string;
+    /** The template that defines the content to display in the map info window when the user clicks on a feature. */
+    infoTemplate?: InfoTemplate;
+    /** For "ondemand" mode only. */
+    inverseFilter?: boolean;
+    /** When true, the XY coordinates should be swapped (this is required for some WFS vendors, versions, and WKIDS). */
+    inverseResponse?: boolean;
+    /** Specifies the maximum number of features to return in one response. */
+    maxFeatures?: number;
+    /** The query mode for the WFS layer. */
+    mode?: string;
+    /** For "ondemand" mode only. */
+    nsGeometryFieldName?: string;
+    /** The full layer name including the namespace as a prefix. */
+    nsLayerName?: string;
+    /** When true, more details will be printed to console when the first connection to a WFS server is established. */
+    showDetails?: boolean;
+    /** URL to the WFS server. */
+    url: string;
+    /** OGC WFS version number. */
+    version?: string;
+    /** The well-known ID of the spatial reference used by the WFSLayer. */
+    wkid?: string;
+  }
   export interface WMSLayerOptions {
     /** Specify the map image format, valid options are png,jpg,bmp,gif,svg. */
     format?: string;
@@ -2018,17 +2179,7 @@ declare module "esri/Color" {
      * Creates a new Color object.
      * @param color A named string, hex string, array of rgb or rgba values, an object with r, g, b, and a properties, or another Color object.
      */
-    constructor(color?: string);
-    /**
-     * Creates a new Color object.
-     * @param color A named string, hex string, array of rgb or rgba values, an object with r, g, b, and a properties, or another Color object.
-     */
-    constructor(color?: number[]);
-    /**
-     * Creates a new Color object.
-     * @param color A named string, hex string, array of rgb or rgba values, an object with r, g, b, and a properties, or another Color object.
-     */
-    constructor(color?: any);
+    constructor(color?: string | number[] | any);
     /**
      * Blend colors start and end with weight from 0 to 1, 0.5 being a 50/50 blend.
      * @param start The start color.
@@ -2065,17 +2216,7 @@ declare module "esri/Color" {
      * Takes a named string, hex string, array of rgb or rgba values, an object with r, g, b, and a properties, or another Color object and sets this color instance to that value.
      * @param color The new color value.
      */
-    setColor(color: string): Color;
-    /**
-     * Takes a named string, hex string, array of rgb or rgba values, an object with r, g, b, and a properties, or another Color object and sets this color instance to that value.
-     * @param color The new color value.
-     */
-    setColor(color: number[]): Color;
-    /**
-     * Takes a named string, hex string, array of rgb or rgba values, an object with r, g, b, and a properties, or another Color object and sets this color instance to that value.
-     * @param color The new color value.
-     */
-    setColor(color: any): Color;
+    setColor(color: string | number[] | any): Color;
     /**
      * Returns a css color string in rgb(a) representation.
      * @param includeAlpha If true, the alpha value will be included in the result.
@@ -2258,13 +2399,42 @@ declare module "esri/IdentityManagerBase" {
   export = IdentityManagerBase;
 }
 
+declare module "esri/ImageSpatialReference" {
+  import esri = require("esri");
+  import SpatialReference = require("esri/SpatialReference");
+
+  /** Defines the Image Coordinate System (ICS) for ImageServices. */
+  class ImageSpatialReference extends SpatialReference {
+    /** The full Image Coordinate System, which includes transformations and map spatial reference information specific to each image. */
+    ics: any;
+    /** The OBJECTID of the image in a mosaic dataset. */
+    icsid: number;
+    /**
+     * Creates an instance of ImageSpatialReference.
+     * @param params Options that may be passed into the constructor.
+     */
+    constructor(params: esri.ImageSpatialReferenceOptions);
+    /**
+     * Tests whether the input image coordinate system equals the image coordinate system of the instance calling this method.
+     * @param inSR The ImageSpatialReference to test the equality against this instance.
+     */
+    equals(inSR: ImageSpatialReference): boolean;
+    /**
+     * Converts the ImageSpatialReference instance to a JSON object.
+     * @param preserveUrl Indicates whether to preserve the URL in the output JSON object.
+     */
+    toJson(preserveUrl?: boolean): boolean;
+  }
+  export = ImageSpatialReference;
+}
+
 declare module "esri/InfoTemplate" {
   /** An InfoTemplate contains a title and content template string used to transform Graphic.attributes into an HTML representation. */
   class InfoTemplate {
     /** The template for defining how to format the content used in an InfoWindow. */
-    content: any;
+    content: string | Function;
     /** The template for defining how to format the title used in an InfoWindow. */
-    title: any;
+    title: string | Function;
     /** Creates a new empty InfoTemplate object. */
     constructor();
     /**
@@ -2272,7 +2442,7 @@ declare module "esri/InfoTemplate" {
      * @param title The template for defining how to format the title used in an InfoWindow.
      * @param content The template for defining how to format the content used in an InfoWindow.
      */
-    constructor(title: string, content: string);
+    constructor(title: string | Function, content: string | Function);
     /**
      * Creates a new InfoTemplate object using a JSON object.
      * @param json JSON object representing the InfoTemplate.
@@ -2282,22 +2452,12 @@ declare module "esri/InfoTemplate" {
      * Sets the content template.
      * @param template The template for the content.
      */
-    setContent(template: string): InfoTemplate;
-    /**
-     * Sets the content template.
-     * @param template The template for the content.
-     */
-    setContent(template: Function): InfoTemplate;
+    setContent(template: string | Function): InfoTemplate;
     /**
      * Sets the title template.
      * @param template The template for the title.
      */
-    setTitle(template: string): InfoTemplate;
-    /**
-     * Sets the title template.
-     * @param template The template for the title.
-     */
-    setTitle(template: Function): InfoTemplate;
+    setTitle(template: string | Function): InfoTemplate;
     /** Converts object to its ArcGIS Server JSON representation. */
     toJson(): any;
   }
@@ -2324,13 +2484,7 @@ declare module "esri/InfoWindowBase" {
      * @param value A string with HTML tags or a DOM node.
      * @param parentNode The parent node where the value will be placed.
      */
-    place(value: string, parentNode: Node): void;
-    /**
-     * Helper method.
-     * @param value A string with HTML tags or a DOM node.
-     * @param parentNode The parent node where the value will be placed.
-     */
-    place(value: HTMLElement, parentNode: Node): void;
+    place(value: string | HTMLElement, parentNode: Node): void;
     /**
      * Resize the info window to the specified width and height (in pixels).
      * @param width The new width of the InfoWindow in pixels.
@@ -2341,12 +2495,7 @@ declare module "esri/InfoWindowBase" {
      * Define the info window content.
      * @param content The content argument can be any of the following.
      */
-    setContent(content: string): void;
-    /**
-     * Define the info window content.
-     * @param content The content argument can be any of the following.
-     */
-    setContent(content: any): void;
+    setContent(content: string | any): void;
     /**
      * This method is called by the map when the object is set as its info window.
      * @param map The map object.
@@ -2356,12 +2505,7 @@ declare module "esri/InfoWindowBase" {
      * Set the input value as the title for the info window.
      * @param title  In most cases the title will be a string value but the same options are available as for the setContent method.
      */
-    setTitle(title: string): void;
-    /**
-     * Set the input value as the title for the info window.
-     * @param title  In most cases the title will be a string value but the same options are available as for the setContent method.
-     */
-    setTitle(title: any): void;
+    setTitle(title: string | any): void;
     /**
      * Display the info window at the specified location.
      * @param location Location is an instance of esri.geometry.Point.
@@ -2927,8 +3071,6 @@ declare module "esri/arcgis/Portal" {
 }
 
 declare module "esri/arcgis/utils" {
-  import Layer = require("esri/layers/layer");
-
   /** Utility methods to work with content from ArcGIS.com. */
   var utils: {
     /** Specify the domain where the map associated with the webmap id is located. */
@@ -2939,14 +3081,7 @@ declare module "esri/arcgis/utils" {
      * @param mapDiv Container ID for referencing map.
      * @param options Optional parameters that define the map functionality.
      */
-    createMap(itemIdOrItemInfo: string, mapDiv: string, options?: any): any;
-    /**
-     * Create a map using information from an ArcGIS.com item.
-     * @param itemIdOrItemInfo An itemId for an ArcGIS.com item or the response object obtained from calling the arcgisUtils.getItem method.
-     * @param mapDiv Container ID for referencing map.
-     * @param options Optional parameters that define the map functionality.
-     */
-    createMap(itemIdOrItemInfo: any, mapDiv: string, options?: any): any;
+    createMap(itemIdOrItemInfo: string | any, mapDiv: string, options?: any): any;
     /**
      * Get details about the input ArcGIS.com item.
      * @param itemId The itemId for a publicly shared ArcGIS.com item.
@@ -2956,13 +3091,13 @@ declare module "esri/arcgis/utils" {
      * Can be used with esri.dijit.Legend to get the layerInfos list to be passed into the Legend constructor.
      * @param createMapResponse Object returned by .createMap() in the .then() callback.
      */
-    getLegendLayers(createMapResponse: any): Layer[];
+    getLegendLayers(createMapResponse: any): any[];
   };
   export = utils;
 }
 
 declare module "esri/basemaps" {
-  /** Contains properties referencing default basemaps used in the JS API. */
+  /** This class contains properties referencing default basemaps used in the JS API that allow you to add map services as default basemaps in web applications. */
   var basemaps: {
     /** The Light Gray Canvas basemap is designed to be used as a neutral background map for overlaying and emphasizing other map layers. */
     gray: any;
@@ -3010,13 +3145,7 @@ declare module "esri/dijit/AttributeInspector" {
      * @param params See options list.
      * @param srcNodeRef HTML element where the attribute inspector should be rendered.
      */
-    constructor(params: esri.AttributeInspectorOptions, srcNodeRef: Node);
-    /**
-     * Creates a new Attribute Inspector object.
-     * @param params See options list.
-     * @param srcNodeRef HTML element where the attribute inspector should be rendered.
-     */
-    constructor(params: esri.AttributeInspectorOptions, srcNodeRef: string);
+    constructor(params: esri.AttributeInspectorOptions, srcNodeRef: Node | string);
     /** Destroys the widget, used for page clean up. */
     destroy(): void;
     /** Moves to the first feature. */
@@ -3061,13 +3190,7 @@ declare module "esri/dijit/Attribution" {
      * @param options An object that defines the attribution options.
      * @param srcNodeRef HTML element where the time slider should be rendered.
      */
-    constructor(options: esri.AttributionOptions, srcNodeRef: Node);
-    /**
-     * Creates a new Attribution object.
-     * @param options An object that defines the attribution options.
-     * @param srcNodeRef HTML element where the time slider should be rendered.
-     */
-    constructor(options: esri.AttributionOptions, srcNodeRef: string);
+    constructor(options: esri.AttributionOptions, srcNodeRef: Node | string);
     /** Destroy the attribution widget. */
     destroy(): void;
     /** Finalizes the creation of the widget. */
@@ -3118,13 +3241,7 @@ declare module "esri/dijit/BasemapGallery" {
      * @param params Parameters used to configure the widget.
      * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
      */
-    constructor(params: esri.BasemapGalleryOptions, srcNodeRef?: Node);
-    /**
-     * Creates a new BasemapGallery dijit.
-     * @param params Parameters used to configure the widget.
-     * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
-     */
-    constructor(params: esri.BasemapGalleryOptions, srcNodeRef?: string);
+    constructor(params: esri.BasemapGalleryOptions, srcNodeRef?: Node | string);
     /**
      * Add a new basemap to the BasemapGallery's list of basemaps.
      * @param basemap The basemap to add to the map.
@@ -3204,7 +3321,7 @@ declare module "esri/dijit/BasemapToggle" {
   class BasemapToggle {
     /** The secondary basemap to toggle to. */
     basemap: string;
-    /** Object containing the labels and URLs for the image of each basemap. */
+    /** Object containing the title and thumbnailURL for the image of each basemap. */
     basemaps: any;
     /** Whether the widget has been loaded. */
     loaded: boolean;
@@ -3219,13 +3336,7 @@ declare module "esri/dijit/BasemapToggle" {
      * @param params Various parameters to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.BasemapToggleOptions, srcNodeRef: Node);
-    /**
-     * Creates a new BasemapToggle dijit using the given DOM node.
-     * @param params Various parameters to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.BasemapToggleOptions, srcNodeRef: string);
+    constructor(params: esri.BasemapToggleOptions, srcNodeRef: Node | string);
     /** Destroys the widget. */
     destroy(): void;
     /** Hides the widget. */
@@ -3273,13 +3384,7 @@ declare module "esri/dijit/Bookmarks" {
      * @param params See options list for parameters.
      * @param srcNodeRef HTML element where the bookmark widget should be rendered.
      */
-    constructor(params: esri.BookmarksOptions, srcNodeRef: Node);
-    /**
-     * Creates a new Bookmark widget
-     * @param params See options list for parameters.
-     * @param srcNodeRef HTML element where the bookmark widget should be rendered.
-     */
-    constructor(params: esri.BookmarksOptions, srcNodeRef: string);
+    constructor(params: esri.BookmarksOptions, srcNodeRef: Node | string);
     /**
      * Add a new bookmark to the bookmark widget.
      * @param bookmarkItem A BookmarkItem or json object with the same structure that defines the new location.
@@ -3354,13 +3459,7 @@ declare module "esri/dijit/ClassedColorSlider" {
      * @param params Set of parameters used to specify the ClassedColorSlider widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: esri.ClassedColorSliderOptions, srcNodeRef: Node);
-    /**
-     * Creates a new ClassedColorSlider widget.
-     * @param params Set of parameters used to specify the ClassedColorSlider widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: esri.ClassedColorSliderOptions, srcNodeRef: string);
+    constructor(params: esri.ClassedColorSliderOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
     /** Fires when the ClassedColorSlider widget properties change. */
@@ -3415,13 +3514,7 @@ declare module "esri/dijit/ClassedSizeSlider" {
      * @param params Set of parameters used to specify the ClassedSizeSlider widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: esri.ClassedSizeSliderOptions, srcNodeRef: Node);
-    /**
-     * Creates a new ClassedSizeSlider widget within the provided DOM node srcNodeRef.
-     * @param params Set of parameters used to specify the ClassedSizeSlider widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: esri.ClassedSizeSliderOptions, srcNodeRef: string);
+    constructor(params: esri.ClassedSizeSliderOptions, srcNodeRef: Node | string);
     /** Fires when ClassedSizeSlider changes. */
     on(type: "change", listener: (event: { breakInfos: any; target: ClassedSizeSlider }) => void): esri.Handle;
     /** Fires when minValue or maxValue changes in ClassedSizeSlider. */
@@ -3478,13 +3571,7 @@ declare module "esri/dijit/ColorInfoSlider" {
      * @param params Set of parameters used to specify the ColorInfoSlider widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: esri.ColorInfoSliderOptions, srcNodeRef: Node);
-    /**
-     * Creates a new ColorInfoSlider widget within the provided DOM node srcNodeRef.
-     * @param params Set of parameters used to specify the ColorInfoSlider widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: esri.ColorInfoSliderOptions, srcNodeRef: string);
+    constructor(params: esri.ColorInfoSliderOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
     /** Fires when ColorInfoSlider changes. */
@@ -3515,13 +3602,7 @@ declare module "esri/dijit/ColorPicker" {
      * @param params Set of parameters used to specify the ColorPicker widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: esri.ColorPickerOptions, srcNodeRef: Node);
-    /**
-     * Creates a new ColorPicker widget.
-     * @param params Set of parameters used to specify the ColorPicker widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: esri.ColorPickerOptions, srcNodeRef: string);
+    constructor(params: esri.ColorPickerOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
     /** Fires when the selected color has changed. */
@@ -3544,8 +3625,6 @@ declare module "esri/dijit/Directions" {
   class Directions {
     /** Read-only: Get the directions to all the locations along the route. */
     directions: DirectionsFeatureSet;
-    /** An array of  objects that defines the potential matches for the input locations. */
-    geocoderResults: any[];
     /** Indicates whether the Directions widget adds a stop on each map click. */
     mapClickActive: boolean;
     /** Read-only: When true, the maximum number of stops for the route has been reached. */
@@ -3577,13 +3656,7 @@ declare module "esri/dijit/Directions" {
      * @param options Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(options: esri.DirectionsOptions, srcNodeRef: Node);
-    /**
-     * Creates a new Directions dijit using the given DOM node.
-     * @param options Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(options: esri.DirectionsOptions, srcNodeRef: string);
+    constructor(options: esri.DirectionsOptions, srcNodeRef: Node | string);
     /** Deprecated at v3.13. */
     activate(): void;
     /**
@@ -3591,49 +3664,13 @@ declare module "esri/dijit/Directions" {
      * @param stop A point that defines the stop location.
      * @param index The index location where the stop should be added.
      */
-    addStop(stop: Point, index?: number): any;
-    /**
-     * Add a stop to the directions widget at the specified index location.
-     * @param stop A point that defines the stop location.
-     * @param index The index location where the stop should be added.
-     */
-    addStop(stop: number[], index?: number): any;
-    /**
-     * Add a stop to the directions widget at the specified index location.
-     * @param stop A point that defines the stop location.
-     * @param index The index location where the stop should be added.
-     */
-    addStop(stop: string, index?: number): any;
-    /**
-     * Add a stop to the directions widget at the specified index location.
-     * @param stop A point that defines the stop location.
-     * @param index The index location where the stop should be added.
-     */
-    addStop(stop: any, index?: number): any;
+    addStop(stop: Point | number[] | string | any, index?: number): any;
     /**
      * Add multiple stops to the directions list starting at the specified location.
      * @param stops An array of points that define the stop locations.
      * @param index The index location where the stops will be added.
      */
-    addStops(stops: Point[], index?: number): any;
-    /**
-     * Add multiple stops to the directions list starting at the specified location.
-     * @param stops An array of points that define the stop locations.
-     * @param index The index location where the stops will be added.
-     */
-    addStops(stops: number[][], index?: number): any;
-    /**
-     * Add multiple stops to the directions list starting at the specified location.
-     * @param stops An array of points that define the stop locations.
-     * @param index The index location where the stops will be added.
-     */
-    addStops(stops: string[], index?: number): any;
-    /**
-     * Add multiple stops to the directions list starting at the specified location.
-     * @param stops An array of points that define the stop locations.
-     * @param index The index location where the stops will be added.
-     */
-    addStops(stops: any[], index?: number): any;
+    addStops(stops: Point[] | number[][] | string[] | any[], index?: number): any;
     /**
      * Center the map at the start of the specified route segment.
      * @param index The index of the segment where the map should be centered.
@@ -3677,45 +3714,12 @@ declare module "esri/dijit/Directions" {
      * @param stop A point that defines the stop location.
      * @param index The index of the stop to update.
      */
-    updateStop(stop: Point, index: number): any;
-    /**
-     * Update the existing stop at the specified index location.
-     * @param stop A point that defines the stop location.
-     * @param index The index of the stop to update.
-     */
-    updateStop(stop: number[], index: number): any;
-    /**
-     * Update the existing stop at the specified index location.
-     * @param stop A point that defines the stop location.
-     * @param index The index of the stop to update.
-     */
-    updateStop(stop: string, index: number): any;
-    /**
-     * Update the existing stop at the specified index location.
-     * @param stop A point that defines the stop location.
-     * @param index The index of the stop to update.
-     */
-    updateStop(stop: any, index: number): any;
+    updateStop(stop: Point | number[] | string | any, index: number): any;
     /**
      * Update multiple stops in the directions widget by specifying an array of stops information.
      * @param stops An array of points that define the stop locations.
      */
-    updateStops(stops: Point[]): any;
-    /**
-     * Update multiple stops in the directions widget by specifying an array of stops information.
-     * @param stops An array of points that define the stop locations.
-     */
-    updateStops(stops: number[][]): any;
-    /**
-     * Update multiple stops in the directions widget by specifying an array of stops information.
-     * @param stops An array of points that define the stop locations.
-     */
-    updateStops(stops: string[]): any;
-    /**
-     * Update multiple stops in the directions widget by specifying an array of stops information.
-     * @param stops An array of points that define the stop locations.
-     */
-    updateStops(stops: any[]): any;
+    updateStops(stops: Point[] | number[][] | string[] | any[]): any;
     /**
      * Sets the corresponding stop to point at the user's current location.
      * @param stopIndex Index of the stop that will point to the user's current location.
@@ -3751,12 +3755,45 @@ declare module "esri/dijit/Directions" {
   export = Directions;
 }
 
+declare module "esri/dijit/ElevationProfile" {
+  import esri = require("esri");
+  import Geometry = require("esri/geometry/Geometry");
+
+  /** (Currently in beta)The Elevation Profile widget allows a user to create an elevation profile based on a polyline geometry input parameter or existing features.NOTE: Currently there is a known issue when creating an elevation profile that crosses the international dateline multiple times. */
+  class ElevationProfile {
+    /** The measurement unit of the polyline geometry. */
+    measureUnits: string;
+    /** The polyline input geometry used to create the elevation profile. */
+    profileGeometry: Geometry;
+    /**
+     * Create a new ElevationProfile widget using the given DOM node.
+     * @param options See options table below for the full descriptions of the properties needed for this object.
+     * @param srcNode Reference or id of the HTML element where the widget should be rendered.
+     */
+    constructor(options: esri.ElevationProfileOptions, srcNode: Node | string);
+    /** Clears the elevation profile chart. */
+    clearProfile(): void;
+    /** Destroy the widget. */
+    destroy(): void;
+    /** Finalizes the creation of the ElevationProfile widget. */
+    startup(): void;
+    /** Fires when the elevation profile is cleared. */
+    on(type: "clear-profile", listener: (event: { target: ElevationProfile }) => void): esri.Handle;
+    /** Fires when the widget has fully loaded. */
+    on(type: "load", listener: (event: { target: ElevationProfile }) => void): esri.Handle;
+    /** Fires when the elevation profile is updated. */
+    on(type: "update-profile", listener: (event: { profileResults: any; target: ElevationProfile }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = ElevationProfile;
+}
+
 declare module "esri/dijit/FeatureTable" {
   import esri = require("esri");
   import FeatureLayer = require("esri/layers/FeatureLayer");
   import Map = require("esri/map");
 
-  /** (Beta at v3.12) Creates an instance of the FeatureTable widget within the provided DOM node. */
+  /** (Currently in beta) Creates an instance of the FeatureTable widget within the provided DOM node. */
   class FeatureTable {
     /** An optional dGrid property. */
     allowSelectAll: boolean;
@@ -3784,8 +3821,6 @@ declare module "esri/dijit/FeatureTable" {
     noDataMessage: string;
     /** Attribute fields to include in the FeatureTable. */
     outFields: string[];
-    /** Indicates whether the data is editable via the widget. */
-    readOnly: boolean;
     /** A dGrid property. */
     selectionMode: string;
     /**
@@ -3793,13 +3828,7 @@ declare module "esri/dijit/FeatureTable" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.FeatureTableOptions, srcNodeRef: Node);
-    /**
-     * Creates an instance of the FeatureTable widget within the provided DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.FeatureTableOptions, srcNodeRef: string);
+    constructor(params: esri.FeatureTableOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
     /** Fired when a row is deselected. */
@@ -3825,13 +3854,7 @@ declare module "esri/dijit/Gallery" {
      * @param params See options list.
      * @param srcNodeRef HTML element where the  gallery should be rendered.
      */
-    constructor(params: esri.GalleryOptions, srcNodeRef: Node);
-    /**
-     * Creates a new mobile Gallery.
-     * @param params See options list.
-     * @param srcNodeRef HTML element where the  gallery should be rendered.
-     */
-    constructor(params: esri.GalleryOptions, srcNodeRef: string);
+    constructor(params: esri.GalleryOptions, srcNodeRef: Node | string);
     /** Removes any object references and associated objects created by the gallery. */
     destroy(): void;
     /** Gets the item with the current focus. */
@@ -3874,38 +3897,20 @@ declare module "esri/dijit/Gauge" {
      * @param params See options list for parameters.
      * @param srcNodeRef HTML element where the  gauge should be rendered.
      */
-    constructor(params: esri.GaugeOptions, srcNodeRef: Node);
-    /**
-     * Create a new Gauge object.
-     * @param params See options list for parameters.
-     * @param srcNodeRef HTML element where the  gauge should be rendered.
-     */
-    constructor(params: esri.GaugeOptions, srcNodeRef: string);
+    constructor(params: esri.GaugeOptions, srcNodeRef: Node | string);
     /** Destroy the gauge. */
     destroy(): void;
     /**
      * Get the value of the property from the Gauge.
      * @param name Property to get value.
      */
-    get(name: string): any;
+    get(name: string): string | Graphic | number;
     /**
      * Set the value of a property from the Gauge.
      * @param name Property to set value.
      * @param value Value to set.
      */
-    set(name: string, value: string): Gauge;
-    /**
-     * Set the value of a property from the Gauge.
-     * @param name Property to set value.
-     * @param value Value to set.
-     */
-    set(name: string, value: Graphic): Gauge;
-    /**
-     * Set the value of a property from the Gauge.
-     * @param name Property to set value.
-     * @param value Value to set.
-     */
-    set(name: string, value: number): Gauge;
+    set(name: string, value: string | Graphic | number): Gauge;
     /** Finalizes the creation of the gauge. */
     startup(): void;
   }
@@ -3917,7 +3922,7 @@ declare module "esri/dijit/Geocoder" {
   import GraphicsLayer = require("esri/layers/GraphicsLayer");
   import Symbol = require("esri/symbols/Symbol");
 
-  /** Add a geographic search box to an application. */
+  /** Starting with version 3.13, the Search Widget supersedes the Geocoder Widget and is deprecated. */
   class Geocoder {
     /** Currently selected locator object. */
     activeGeocoder: any;
@@ -3958,13 +3963,7 @@ declare module "esri/dijit/Geocoder" {
      * @param params Set of parameters used to specify Geocoder options.
      * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
      */
-    constructor(params: esri.GeocoderOptions, srcNodeRef: Node);
-    /**
-     * Create a new Geocoder widget using the given DOM node.
-     * @param params Set of parameters used to specify Geocoder options.
-     * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
-     */
-    constructor(params: esri.GeocoderOptions, srcNodeRef: string);
+    constructor(params: esri.GeocoderOptions, srcNodeRef: Node | string);
     /** Unfocus the widget's text input. */
     blur(): void;
     /** Clears the values currently set in the widget. */
@@ -4028,13 +4027,7 @@ declare module "esri/dijit/HeatmapSlider" {
      * @param params Set of parameters used to specify the HeatmapSlider widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: esri.HeatmapSliderOptions, srcNodeRef: Node);
-    /**
-     * Creates a new HeatmapSlider widget within the provided DOM node srcNodeRef.
-     * @param params Set of parameters used to specify the HeatmapSlider widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: esri.HeatmapSliderOptions, srcNodeRef: string);
+    constructor(params: esri.HeatmapSliderOptions, srcNodeRef: Node | string);
     /** Fires when HeatmapSlider changes. */
     on(type: "change", listener: (event: { colorStops: any; target: HeatmapSlider }) => void): esri.Handle;
     /** Fires when HeatmapSlider handle is moved. */
@@ -4054,13 +4047,7 @@ declare module "esri/dijit/HistogramTimeSlider" {
      * @param params Input parameters.
      * @param srcNodeRef HTML element where the tool should be rendered.
      */
-    constructor(params: esri.HistogramTimeSliderOptions, srcNodeRef: Node);
-    /**
-     * Creates a new HistogramTimeSlider dijit using the given DOM node.
-     * @param params Input parameters.
-     * @param srcNodeRef HTML element where the tool should be rendered.
-     */
-    constructor(params: esri.HistogramTimeSliderOptions, srcNodeRef: string);
+    constructor(params: esri.HistogramTimeSliderOptions, srcNodeRef: Node | string);
     /** Set related objects as null and hide the widget. */
     destroy(): void;
     /** Finalizes the creation of the widget. */
@@ -4096,13 +4083,7 @@ declare module "esri/dijit/HomeButton" {
      * @param params Various parameters to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.HomeButtonOptions, srcNodeRef: Node);
-    /**
-     * Creates a new HomeButton dijit using the given DOM node.
-     * @param params Various parameters to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.HomeButtonOptions, srcNodeRef: string);
+    constructor(params: esri.HomeButtonOptions, srcNodeRef: Node | string);
     /** Destroys the widget. */
     destroy(): void;
     /** Hides the widget. */
@@ -4134,19 +4115,36 @@ declare module "esri/dijit/HorizontalSlider" {
      * @param params Set of parameters used to specify the HorizontalSlider widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: esri.HorizontalSliderOptions, srcNodeRef: Node);
-    /**
-     * Creates a new HorizontalSlider widget.
-     * @param params Set of parameters used to specify the HorizontalSlider widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: esri.HorizontalSliderOptions, srcNodeRef: string);
+    constructor(params: esri.HorizontalSliderOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
   export = HorizontalSlider;
 }
 
+declare module "esri/dijit/ImageServiceMeasure" {
+  import esri = require("esri");
+  import SimpleFillSymbol = require("esri/symbols/SimpleFillSymbol");
+  import SimpleLineSymbol = require("esri/symbols/SimpleLineSymbol");
+  import SimpleMarkerSymbol = require("esri/symbols/SimpleMarkerSymbol");
+
+  /** This widget allows you to perform measurements on image services. */
+  class ImageServiceMeasure {
+    /** Symbol to be used when drawing a polygon or extent. */
+    fillSymbol: SimpleFillSymbol;
+    /** Symbol to be used when drawing a line. */
+    lineSymbol: SimpleLineSymbol;
+    /** Symbol to be used when drawing a point. */
+    markerSymbol: SimpleMarkerSymbol;
+    /**
+     * Creates an instance of the ImageServiceMeasure widget.
+     * @param params An Object containing constructor options.
+     */
+    constructor(params: esri.ImageServiceMeasureOptions);
+  }
+  export = ImageServiceMeasure;
+}
+
 declare module "esri/dijit/InfoWindow" {
   import esri = require("esri");
   import InfoWindowBase = require("esri/InfoWindowBase");
@@ -4175,13 +4173,7 @@ declare module "esri/dijit/InfoWindow" {
      * @param params Optional parameters.
      * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Create a new Info Window.
-     * @param params Optional parameters.
-     * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /** Hides the InfoWindow. */
     hide(): void;
     /**
@@ -4288,6 +4280,49 @@ declare module "esri/dijit/InfoWindowLite" {
   export = InfoWindowLite;
 }
 
+declare module "esri/dijit/LayerList" {
+  import esri = require("esri");
+  import Map = require("esri/map");
+
+  /** (Currently in beta) The LayerList widget provides a list of layers that allows the toggling of layer visibility. */
+  class LayerList {
+    /** An array of operational layers. */
+    layers: any[];
+    /** Indicates whether the widget has been loaded. */
+    loaded: boolean;
+    /** Reference to the map. */
+    map: Map;
+    /** Indicates whether to remove underscores from the layer title */
+    removeUnderscores: boolean;
+    /** Indicates whether to show sublayers in the list of layers. */
+    sublayers: boolean;
+    /** CSS Class for uniquely styling the widget. */
+    theme: string;
+    /** Indicates whether to show the widget. */
+    visible: boolean;
+    /**
+     * Create a new LayerList widget using the given DOM node.
+     * @param options Set of options used to specify LayerList options.
+     * @param srcNode Reference or id of the HTML element where the widget should be rendered.
+     */
+    constructor(options: esri.LayerListOptions, srcNode: Node | string);
+    /** Destroy the LayerList widget. */
+    destroy(): void;
+    /** Reloads all layers and properties that may have changed. */
+    refresh(): void;
+    /** Finalizes the creation of the LayerList widget. */
+    startup(): void;
+    /** Fired when the LayerList widget has fully loaded. */
+    on(type: "load", listener: (event: { target: LayerList }) => void): esri.Handle;
+    /** Fired when refresh is called on the LabelList widget. */
+    on(type: "refresh", listener: (event: { target: LayerList }) => void): esri.Handle;
+    /** Fired when the layer is toggled on/off within the widget. */
+    on(type: "toggle", listener: (event: { layerIndex: number; subLayerIndex: number; visible: boolean; target: LayerList }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = LayerList;
+}
+
 declare module "esri/dijit/LayerSwipe" {
   import esri = require("esri");
   import Layer = require("esri/layers/layer");
@@ -4320,13 +4355,7 @@ declare module "esri/dijit/LayerSwipe" {
      * @param params Various parameters to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.LayerSwipeOptions, srcNodeRef: Node);
-    /**
-     * Creates a new LayerSwipe dijit using the given DOM node.
-     * @param params Various parameters to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.LayerSwipeOptions, srcNodeRef: string);
+    constructor(params: esri.LayerSwipeOptions, srcNodeRef: Node | string);
     /** Destroys the widget. */
     destroy(): void;
     /** Disables the widget. */
@@ -4356,13 +4385,7 @@ declare module "esri/dijit/Legend" {
      * @param params Parameters used to configure the dijit.
      * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
      */
-    constructor(params: esri.LegendOptions, srcNodeRef: Node);
-    /**
-     * Creates a new Legend dijit.
-     * @param params Parameters used to configure the dijit.
-     * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
-     */
-    constructor(params: esri.LegendOptions, srcNodeRef: string);
+    constructor(params: esri.LegendOptions, srcNodeRef: Node | string);
     /** Destroys the legend. */
     destroy(): void;
     /** Refresh the legend. */
@@ -4418,13 +4441,7 @@ declare module "esri/dijit/LocateButton" {
      * @param params Various parameters to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.LocateButtonOptions, srcNodeRef: Node);
-    /**
-     * Creates a new LocateButton dijit using the given DOM node.
-     * @param params Various parameters to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.LocateButtonOptions, srcNodeRef: string);
+    constructor(params: esri.LocateButtonOptions, srcNodeRef: Node | string);
     /** Clears the point graphic. */
     clear(): void;
     /** Destroys the widget. */
@@ -4460,13 +4477,7 @@ declare module "esri/dijit/Measurement" {
      * @param params See options list for parameters.
      * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
      */
-    constructor(params: esri.MeasurementOptions, srcNodeRef: Node);
-    /**
-     * Creates a new Measurement widget.
-     * @param params See options list for parameters.
-     * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
-     */
-    constructor(params: esri.MeasurementOptions, srcNodeRef: string);
+    constructor(params: esri.MeasurementOptions, srcNodeRef: Node | string);
     /** Remove the measurement graphics and results. */
     clearResult(): void;
     /** Destroy the measurement widget. */
@@ -4486,17 +4497,7 @@ declare module "esri/dijit/Measurement" {
      * Invoke the measurement functionality of the widget by passing in a previously created geometry.
      * @param geometry Geometry to be measured.
      */
-    measure(geometry: Point): void;
-    /**
-     * Invoke the measurement functionality of the widget by passing in a previously created geometry.
-     * @param geometry Geometry to be measured.
-     */
-    measure(geometry: Polyline): void;
-    /**
-     * Invoke the measurement functionality of the widget by passing in a previously created geometry.
-     * @param geometry Geometry to be measured.
-     */
-    measure(geometry: Polygon): void;
+    measure(geometry: Point | Polyline | Polygon): void;
     /**
      * Activate or deactivate a tool.
      * @param toolName The name of the tool to activate or deactivate.
@@ -4515,7 +4516,7 @@ declare module "esri/dijit/Measurement" {
     /** Fires when a measurement is made but the measurement is not complete (single-click). */
     on(type: "measure", listener: (event: { geometry: Geometry; toolName: string; unitName: string; values: number; target: Measurement }) => void): esri.Handle;
     /** Fired when the measurement is complete. */
-    on(type: "measure-end", listener: (event: { geometry: Geometry; toolName: string; unitName: string; values: any; target: Measurement }) => void): esri.Handle;
+    on(type: "measure-end", listener: (event: { geometry: Geometry; toolName: string; unitName: string; values: number[] | number; target: Measurement }) => void): esri.Handle;
     /** Fires when a measurement operation begins (single-click). */
     on(type: "measure-start", listener: (event: { toolName: string; unitName: string; target: Measurement }) => void): esri.Handle;
     /** Fires when the primary tool is changed. */
@@ -4527,6 +4528,94 @@ declare module "esri/dijit/Measurement" {
   export = Measurement;
 }
 
+declare module "esri/dijit/ObliqueViewer" {
+  import esri = require("esri");
+  import ArcGISImageServiceLayer = require("esri/layers/ArcGISImageServiceLayer");
+  import Map = require("esri/map");
+  import Geometry = require("esri/geometry/Geometry");
+  import SpatialReference = require("esri/SpatialReference");
+  import Extent = require("esri/geometry/Extent");
+
+  /** (Currently in beta) The oblique viewer widget, displays images in their native coordinate system using an Image Coordinate System (ICS). */
+  class ObliqueViewer {
+    /** Indicates the current azimuth angle of the viewer. */
+    azimuthAngle: number;
+    /** Image service field that denotes the sensor azimuth value for a record. */
+    azimuthField: string;
+    /** Indicates the tolerance value applied when selecting images for a given azimuth angle value. */
+    azimuthTolerance: number;
+    /** Image service field that denotes the sensor elevation value for a record. */
+    elevationField: string;
+    /** Elevation value between 0 and 90 that differentiates an image as oblique or nadir. */
+    elevationThreshold: number;
+    /** Subset of records, filtered based on current azimuth angle. */
+    filteredRecords: any[];
+    /** Image service layer to be used as source for oblique images. */
+    imageServiceLayer: ArcGISImageServiceLayer;
+    /** Indicates whether current view is nadir. */
+    isNadir: boolean;
+    /** Map object associated with the widget. */
+    map: Map;
+    /** When true, the widget doesn't refresh itself with new oblique records when the map's extent changes. */
+    noQueryOnExtentChange: boolean;
+    /** Raster info fields to be queried and displayed in the raster list. */
+    rasterInfoFields: any[];
+    /** When true, the list is populated on data refresh. */
+    rasterListRefresh: boolean;
+    /** Oblique image data that is currently being used by the viewer. */
+    records: any[];
+    /** Object containing additional information about the raster. */
+    selectedRaster: any;
+    /** Id of the raster currently being displayed. */
+    selectedRasterId: number;
+    /** When true, thumbnail images for records are displayed in the list. */
+    showThumbnail: boolean;
+    /**
+     * Creates an instance of the ObliqueViewer widget.
+     * @param params Constructor options.
+     */
+    constructor(params: esri.ObliqueViewerOptions);
+    /**
+     * Projects the input geometry to the specified spatial reference.
+     * @param geometry The geometry to project.
+     * @param outSpatialReference The spatial reference to project the geometry to.
+     */
+    projectGeometry(geometry: Geometry, outSpatialReference: SpatialReference): any;
+    /**
+     * Performs a query on the image service for oblique images covering the input geometry.
+     * @param geometry The input geometry to use for the search.
+     */
+    search(geometry: Geometry): any;
+    /**
+     * Sets the records and extent on the viewer.
+     * @param records An array of raster data objects.
+     * @param extent The extent to set the viewer to.
+     */
+    setData(records: any[], extent: Extent): void;
+    /**
+     * Projects the given extent to the map's spatial reference and sets the extent.
+     * @param extent The extent to project the map's spatial reference to.
+     */
+    setExtent(extent: Extent): any;
+    /**
+     * Sets the input image (based on the image ID) to the given extent.
+     * @param id The ID of the raster image.
+     * @param extent The extent to set the raster image to.
+     */
+    setImage(id: number, extent: Extent): void;
+    /** Sets the map extent to the currently selected image. */
+    zoomToSelectedImage(): void;
+    /** Fires when the azimuth is changed. */
+    on(type: "azimuth-change", listener: (event: { azimuth: number; target: ObliqueViewer }) => void): esri.Handle;
+    /** Fires when the selected raster is changed. */
+    on(type: "raster-select", listener: (event: { selectedRasterId: number; target: ObliqueViewer }) => void): esri.Handle;
+    /** Fires when the viewer records are refreshed. */
+    on(type: "records-refresh", listener: (event: { filteredRecords: any[]; records: any[]; target: ObliqueViewer }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = ObliqueViewer;
+}
+
 declare module "esri/dijit/OpacitySlider" {
   import esri = require("esri");
   import RendererSlider = require("esri/dijit/RendererSlider");
@@ -4566,13 +4655,7 @@ declare module "esri/dijit/OpacitySlider" {
      * @param params Set of parameters used to specify the OpacitySlider widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: esri.OpacitySliderOptions, srcNodeRef: Node);
-    /**
-     * Creates a new OpacitySlider widget within the provided DOM node srcNodeRef.
-     * @param params Set of parameters used to specify the OpacitySlider widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: esri.OpacitySliderOptions, srcNodeRef: string);
+    constructor(params: esri.OpacitySliderOptions, srcNodeRef: Node | string);
     /** Fires when OpacitySlider changes. */
     on(type: "change", listener: (event: { opacityInfo: any; target: OpacitySlider }) => void): esri.Handle;
     /** Fires when minValue or maxValue of OpacitySlider changes. */
@@ -4586,21 +4669,18 @@ declare module "esri/dijit/OpacitySlider" {
 
 declare module "esri/dijit/OverviewMap" {
   import esri = require("esri");
+  import Map = require("esri/map");
 
   /** The OverviewMap widget displays the current extent of the map within the context of a larger area. */
   class OverviewMap {
+    /** The Map instance displayed in the OverviewMap widget's container. */
+    overviewMap: Map;
     /**
      * Creates a new OverviewMap object.
      * @param params Parameters that define the functionality of the OverviewMap widget.
      * @param srcNodeRef HTML element where the widget should be rendered.
      */
-    constructor(params: esri.OverviewMapOptions, srcNodeRef: Node);
-    /**
-     * Creates a new OverviewMap object.
-     * @param params Parameters that define the functionality of the OverviewMap widget.
-     * @param srcNodeRef HTML element where the widget should be rendered.
-     */
-    constructor(params: esri.OverviewMapOptions, srcNodeRef: string);
+    constructor(params: esri.OverviewMapOptions, srcNodeRef: Node | string);
     /** Releases  the resources used by the dijit. */
     destroy(): void;
     /** Hide the overview map. */
@@ -4682,13 +4762,7 @@ declare module "esri/dijit/Popup" {
      * @param options Optional parameters.
      * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
      */
-    constructor(options: esri.PopupOptions, srcNodeRef: Node);
-    /**
-     * Create a new Popup object.
-     * @param options Optional parameters.
-     * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
-     */
-    constructor(options: esri.PopupOptions, srcNodeRef: string);
+    constructor(options: esri.PopupOptions, srcNodeRef: Node | string);
     /** Removes all features and destroys any pending deferreds. */
     clearFeatures(): void;
     /** Destroy the popup. */
@@ -4728,32 +4802,17 @@ declare module "esri/dijit/Popup" {
      * Set the content for the info window.
      * @param content The content for the info window.
      */
-    setContent(content: string): void;
-    /**
-     * Set the content for the info window.
-     * @param content The content for the info window.
-     */
-    setContent(content: Function): void;
+    setContent(content: string | Function): void;
     /**
      * Associate an array of features or an array of deferreds that return features with the info window.
      * @param features An array of features or deferreds.
      */
-    setFeatures(features: Graphic[]): void;
-    /**
-     * Associate an array of features or an array of deferreds that return features with the info window.
-     * @param features An array of features or deferreds.
-     */
-    setFeatures(features: any[]): void;
+    setFeatures(features: Graphic[] | any[]): void;
     /**
      * Sets the info window title.
      * @param title The text for the title.
      */
-    setTitle(title: string): void;
-    /**
-     * Sets the info window title.
-     * @param title The text for the title.
-     */
-    setTitle(title: Function): void;
+    setTitle(title: string | Function): void;
     /**
      * Display the info window at the specified location.
      * @param location An instance of esri.geometry.Point that represents the geographic location to display the popup.
@@ -4796,13 +4855,7 @@ declare module "esri/dijit/PopupMobile" {
      * @param options Optional parameters.
      * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
      */
-    constructor(options: esri.PopupMobileOptions, srcNodeRef: Node);
-    /**
-     * Create a new PopupMobile object.
-     * @param options Optional parameters.
-     * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
-     */
-    constructor(options: esri.PopupMobileOptions, srcNodeRef: string);
+    constructor(options: esri.PopupMobileOptions, srcNodeRef: Node | string);
     /** Removes all features and destroys any pending deferreds. */
     clearFeatures(): void;
     /** Destroy the popup. */
@@ -4824,32 +4877,17 @@ declare module "esri/dijit/PopupMobile" {
      * Set the content for the info window.
      * @param content The content for the info window.
      */
-    setContent(content: string): void;
-    /**
-     * Set the content for the info window.
-     * @param content The content for the info window.
-     */
-    setContent(content: Function): void;
+    setContent(content: string | Function): void;
     /**
      * Associate an array of features or an array of deferreds that return features with the info window.
      * @param features An array of features or deferreds.
      */
-    setFeatures(features: Graphic[]): any;
-    /**
-     * Associate an array of features or an array of deferreds that return features with the info window.
-     * @param features An array of features or deferreds.
-     */
-    setFeatures(features: any[]): any;
+    setFeatures(features: Graphic[] | any[]): void;
     /**
      * Sets the info window title.
      * @param title The text for the title.
      */
-    setTitle(title: string): void;
-    /**
-     * Sets the info window title.
-     * @param title The text for the title.
-     */
-    setTitle(title: Function): void;
+    setTitle(title: string | Function): void;
     /**
      * Display the info window at the specified location.
      * @param location An instance of esri.geometry.Point that represents the geographic location to display the popup.
@@ -4901,13 +4939,7 @@ declare module "esri/dijit/Print" {
      * @param params Parameters for the print widget.
      * @param srcNodeRef HTML element where the print widget button and drop down list will be rendered.
      */
-    constructor(params: esri.PrintOptions, srcNodeRef: Node);
-    /**
-     * Creates a new Print widget.
-     * @param params Parameters for the print widget.
-     * @param srcNodeRef HTML element where the print widget button and drop down list will be rendered.
-     */
-    constructor(params: esri.PrintOptions, srcNodeRef: string);
+    constructor(params: esri.PrintOptions, srcNodeRef: Node | string);
     /** Destroys the print widget. */
     destroy(): void;
     /** Hide the print widget. */
@@ -4950,7 +4982,7 @@ declare module "esri/dijit/RendererSlider" {
     /** Toggle for showing the black handle bars. */
     showHandles: boolean;
     /** Flexible toggle for showing labels e.g. */
-    showLabels: any;
+    showLabels: boolean | string[];
     /** Toggle for showing the horizontal line indicators from the center of the handle. */
     showTicks: boolean;
     /** Handle positions represented as numbers that fall between minimum and maximum. */
@@ -4960,13 +4992,7 @@ declare module "esri/dijit/RendererSlider" {
      * @param params Set of parameters used to specify the RendererSlider widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: esri.RendererSliderOptions, srcNodeRef: Node);
-    /**
-     * Creates a new RendererSlider widget.
-     * @param params Set of parameters used to specify the RendererSlider widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: esri.RendererSliderOptions, srcNodeRef: string);
+    constructor(params: esri.RendererSliderOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
     /** Fires when the user actively slides the handle. */
@@ -4988,13 +5014,7 @@ declare module "esri/dijit/Scalebar" {
      * @param params Parameters used to configure the widget.
      * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
      */
-    constructor(params: esri.ScalebarOptions, srcNodeRef?: Node);
-    /**
-     * Creates a new Scalebar dijit.
-     * @param params Parameters used to configure the widget.
-     * @param srcNodeRef Reference or id of the HTML element where the widget should be rendered.
-     */
-    constructor(params: esri.ScalebarOptions, srcNodeRef?: string);
+    constructor(params: esri.ScalebarOptions, srcNodeRef?: Node | string);
     /** Destroy the scalebar. */
     destroy(): void;
     /** Hide the scalebar dijit. */
@@ -5026,7 +5046,7 @@ declare module "esri/dijit/Search" {
     addLayersFromMap: boolean;
     /** Indicates whether to automatically navigate to the selected result. */
     autoNavigate: boolean;
-    /** Indicates whether to automatically select the first result. */
+    /** Indicates whether to automatically select and zoom to the first geocoded result. */
     autoSelect: boolean;
     /** Indicates whether to enable an option to collapse/expand the search into a button. */
     enableButtonMode: boolean;
@@ -5089,13 +5109,7 @@ declare module "esri/dijit/Search" {
      * @param options Set of options used to specify Search options.
      * @param srcNode Reference or id of the HTML element where the widget should be rendered.
      */
-    constructor(options: esri.SearchOptions, srcNode: Node);
-    /**
-     * Create a new Search widget using the given DOM node.
-     * @param options Set of options used to specify Search options.
-     * @param srcNode Reference or id of the HTML element where the widget should be rendered.
-     */
-    constructor(options: esri.SearchOptions, srcNode: string);
+    constructor(options: esri.SearchOptions, srcNode: Node | string);
     /** Unfocus the widget's text input. */
     blur(): void;
     /** Clears the current value, search results, suggest results, graphic, and/or graphics layer. */
@@ -5112,39 +5126,25 @@ declare module "esri/dijit/Search" {
      * Get the value of the property from the Search widget.
      * @param name String value indicating the property to get.
      */
-    get(name: string): any;
+    get(name: string): any | boolean | Layer | Graphic | InfoTemplate | number | TextSymbol | Map | any[] | string;
     /** Hides the Search widget. */
     hide(): void;
     /**
      * Depending on the sources specified, search() queries the feature layer(s) and/or performs address matching using any specified Locator(s) and returns any applicable results.
      * @param value This value can be a string, geometry, suggest candidate object, or an array of [latitude,longitude].
      */
-    search(value?: string): any;
-    /**
-     * Depending on the sources specified, search() queries the feature layer(s) and/or performs address matching using any specified Locator(s) and returns any applicable results.
-     * @param value This value can be a string, geometry, suggest candidate object, or an array of [latitude,longitude].
-     */
-    search(value?: Geometry): any;
-    /**
-     * Depending on the sources specified, search() queries the feature layer(s) and/or performs address matching using any specified Locator(s) and returns any applicable results.
-     * @param value This value can be a string, geometry, suggest candidate object, or an array of [latitude,longitude].
-     */
-    search(value?: any): any;
-    /**
-     * Depending on the sources specified, search() queries the feature layer(s) and/or performs address matching using any specified Locator(s) and returns any applicable results.
-     * @param value This value can be a string, geometry, suggest candidate object, or an array of [latitude,longitude].
-     */
-    search(value?: any[]): any;
+    search(value?: string | Geometry | any | number[]): any;
     /**
      * Selects a result.
      * @param value The result object to select.
      */
     select(value: any): void;
     /**
-     * Set the value of a non "read-only" property from the widget.
+     * Sets the value of a non "read-only" property from the widget.
      * @param name The string value to set.
+     * @param value The value to set the specified property to.
      */
-    set(name: string): any;
+    set(name: string, value: any | boolean | Layer | Graphic | InfoTemplate | number | TextSymbol | Map | any[] | string): void;
     /** Show the Search widget. */
     show(): void;
     /** Finalizes the creation of the Search widget. */
@@ -5162,12 +5162,12 @@ declare module "esri/dijit/Search" {
     on(type: "focus", listener: (event: { target: Search }) => void): esri.Handle;
     /** Fired when the search widget has fully loaded. */
     on(type: "load", listener: (event: { target: Search }) => void): esri.Handle;
-    /** Fired when the search method is called and returns its results. */
-    on(type: "search-results", listener: (event: { activeSourceIndex: number; error: Error; numResults: number; results: any; value: string; target: Search }) => void): esri.Handle;
+    /** Fires when the search method is called and returns its results. */
+    on(type: "search-results", listener: (event: { activeSourceIndex: number; errors: Error[]; numErrors: number; numResults: number; results: any[]; value: string; target: Search }) => void): esri.Handle;
     /** Fired when a search result is selected. */
     on(type: "select-result", listener: (event: { result: any; source: any; sourceIndex: number; target: Search }) => void): esri.Handle;
     /** Fired when the suggest method is called and returns its results. */
-    on(type: "suggest-results", listener: (event: { activeSourceIndex: number; error: Error; numResults: number; results: any; value: string; target: Search }) => void): esri.Handle;
+    on(type: "suggest-results", listener: (event: { activeSourceIndex: number; errors: Error[]; numErrors: number; numResults: number; results: any[]; value: string; target: Search }) => void): esri.Handle;
     on(type: string, listener: (event: any) => void): esri.Handle;
   }
   export = Search;
@@ -5215,13 +5215,7 @@ declare module "esri/dijit/SizeInfoSlider" {
      * @param params Set of parameters used to specify the SizeInfoSlider widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: esri.SizeInfoSliderOptions, srcNodeRef: Node);
-    /**
-     * Creates a new SizeInfoSlider widget.
-     * @param params Set of parameters used to specify the SizeInfoSlider widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: esri.SizeInfoSliderOptions, srcNodeRef: string);
+    constructor(params: esri.SizeInfoSliderOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
     /** Fires when the SizeInfoSlider properties change. */
@@ -5248,13 +5242,7 @@ declare module "esri/dijit/SymbolStyler" {
      * @param params Set of parameters used to specify the SymbolStyler widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: esri.SymbolStylerOptions, srcNodeRef: Node);
-    /**
-     * Creates a new SymbolStyler widget.
-     * @param params Set of parameters used to specify the SymbolStyler widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: esri.SymbolStylerOptions, srcNodeRef: string);
+    constructor(params: esri.SymbolStylerOptions, srcNodeRef: Node | string);
     /**
      * Sets the symbol to edit.
      * @param symbol Symbol to edit.
@@ -5292,13 +5280,7 @@ declare module "esri/dijit/TimeSlider" {
      * @param params Parameters for the time slider object.
      * @param srcNodeRef HTML element where the time slider should be rendered.
      */
-    constructor(params: esri.TimeSliderOptions, srcNodeRef: Node);
-    /**
-     * Creates a new TimeSlider object.
-     * @param params Parameters for the time slider object.
-     * @param srcNodeRef HTML element where the time slider should be rendered.
-     */
-    constructor(params: esri.TimeSliderOptions, srcNodeRef: string);
+    constructor(params: esri.TimeSliderOptions, srcNodeRef: Node | string);
     /**
      * The specified number of time stops are created for the input time extent.
      * @param timeExtent The time extent used to define the time slider's start and end time stops.
@@ -5395,13 +5377,7 @@ declare module "esri/dijit/VisibleScaleRangeSlider" {
      * @param params Set of parameters used to specify the VisibleScaleRangeSlider widget options.
      * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new VisibleScaleRangeSlider widget.
-     * @param params Set of parameters used to specify the VisibleScaleRangeSlider widget options.
-     * @param srcNodeRef Reference or ID of the HTMLElement where the widget should be rendered.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: esri.VisibleScaleRangeSliderOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
     /** Dispatched whenever minScale or maxScale changes. */
@@ -5441,10 +5417,14 @@ declare module "esri/dijit/analysis/AggregatePoints" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /** An array of attribute field names and statistic types that you would like to aggregate for all points within each polygon. */
@@ -5454,13 +5434,7 @@ declare module "esri/dijit/analysis/AggregatePoints" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.AggregatePointsOptions, srcNodeRef: Node);
-    /**
-     * Creates a new AggregatePoints dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.AggregatePointsOptions, srcNodeRef: string);
+    constructor(params: esri.AggregatePointsOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -5478,8 +5452,14 @@ declare module "esri/dijit/analysis/AnalysisBase" {
     folderId: string;
     /** Sets the selected folder of the select folder dropdown, based on the provided folderName, when showSelectFolder is true. */
     folderName: string;
+    /** The self response of the Portal. */
+    portalSelf: any;
     /** The URL to the ArcGIS.com site or in-house portal where the GP server is hosted, for example "http://www.arcgis.com". */
     portalUrl: string;
+    /** When true, adds an option to the UI that allows users to choose ready to use analysis layers from the Living Atlas Analysis Layers. */
+    showReadyToUseLayers: boolean;
+    /** Overrides the default widget title with a custom title. */
+    title: string;
     /**
      * Cancels an analysis job that is being processed.
      * @param jobInfo An object containing job information including job ID, status, message, etc returned by the job-status event.
@@ -5554,10 +5534,14 @@ declare module "esri/dijit/analysis/CalculateDensity" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -5565,13 +5549,7 @@ declare module "esri/dijit/analysis/CalculateDensity" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new CalculateDensity dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -5602,10 +5580,14 @@ declare module "esri/dijit/analysis/ConnectOriginsToDestinations" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -5613,13 +5595,7 @@ declare module "esri/dijit/analysis/ConnectOriginsToDestinations" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.ConnectOriginsToDestinationsOptions, srcNodeRef: Node);
-    /**
-     * Creates a new ConnectOriginsToDestinations dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.ConnectOriginsToDestinationsOptions, srcNodeRef: string);
+    constructor(params: esri.ConnectOriginsToDestinationsOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -5646,10 +5622,14 @@ declare module "esri/dijit/analysis/CreateBuffers" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /** The linear unit to be used with the distance value(s). */
@@ -5659,13 +5639,7 @@ declare module "esri/dijit/analysis/CreateBuffers" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.CreateBuffersOptions, srcNodeRef: Node);
-    /**
-     * Creates a new CreateBuffers dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.CreateBuffersOptions, srcNodeRef: string);
+    constructor(params: esri.CreateBuffersOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -5698,10 +5672,14 @@ declare module "esri/dijit/analysis/CreateDriveTimeAreas" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -5709,13 +5687,7 @@ declare module "esri/dijit/analysis/CreateDriveTimeAreas" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.CreateDriveTimeAreasOptions, srcNodeRef: Node);
-    /**
-     * Creates a new CreateDriveTimeAreas dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.CreateDriveTimeAreasOptions, srcNodeRef: string);
+    constructor(params: esri.CreateDriveTimeAreasOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -5748,10 +5720,14 @@ declare module "esri/dijit/analysis/CreateViewshed" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /** The height of structures or people on the ground used to establish visibility. */
@@ -5763,13 +5739,7 @@ declare module "esri/dijit/analysis/CreateViewshed" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.CreateViewshedOptions, srcNodeRef: Node);
-    /**
-     * Creates a new CreateViewshed dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.CreateViewshedOptions, srcNodeRef: string);
+    constructor(params: esri.CreateViewshedOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -5796,10 +5766,14 @@ declare module "esri/dijit/analysis/CreateWatersheds" {
     searchUnits: string;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -5807,13 +5781,7 @@ declare module "esri/dijit/analysis/CreateWatersheds" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.CreateWatershedsOptions, srcNodeRef: Node);
-    /**
-     * Creates a new CreateWatersheds dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.CreateWatershedsOptions, srcNodeRef: string);
+    constructor(params: esri.CreateWatershedsOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -5836,10 +5804,14 @@ declare module "esri/dijit/analysis/DeriveNewLocations" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -5847,13 +5819,7 @@ declare module "esri/dijit/analysis/DeriveNewLocations" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new DeriveNewLocations dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -5880,10 +5846,14 @@ declare module "esri/dijit/analysis/DissolveBoundaries" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /** An array of field names and statistical summary types that you wish to calculate from the polygons that are dissolved together. */
@@ -5893,13 +5863,7 @@ declare module "esri/dijit/analysis/DissolveBoundaries" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.DissolveBoundariesOptions, srcNodeRef: Node);
-    /**
-     * Creates a new DissolveBoundaries dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.DissolveBoundariesOptions, srcNodeRef: string);
+    constructor(params: esri.DissolveBoundariesOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -5928,10 +5892,14 @@ declare module "esri/dijit/analysis/EnrichLayer" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /** When true, you can specify a time for traffic condition under Define areas to enrich - Driving Time. */
@@ -5941,13 +5909,7 @@ declare module "esri/dijit/analysis/EnrichLayer" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.EnrichLayerOptions, srcNodeRef: Node);
-    /**
-     * Creates a new EnrichLayer dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.EnrichLayerOptions, srcNodeRef: string);
+    constructor(params: esri.EnrichLayerOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -5976,10 +5938,14 @@ declare module "esri/dijit/analysis/ExtractData" {
     outputLayerName: string;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -5987,13 +5953,7 @@ declare module "esri/dijit/analysis/ExtractData" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.ExtractDataOptions, srcNodeRef: Node);
-    /**
-     * Creates a new ExtractData dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.ExtractDataOptions, srcNodeRef: string);
+    constructor(params: esri.ExtractDataOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6016,10 +5976,14 @@ declare module "esri/dijit/analysis/FindExistingLocations" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -6027,13 +5991,7 @@ declare module "esri/dijit/analysis/FindExistingLocations" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new FindExistingLocations dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6068,10 +6026,14 @@ declare module "esri/dijit/analysis/FindHotSpots" {
     returnProcessInfo: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -6079,13 +6041,7 @@ declare module "esri/dijit/analysis/FindHotSpots" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.FindHotSpotsOptions, srcNodeRef: Node);
-    /**
-     * Creates a new FindHotSpots dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.FindHotSpotsOptions, srcNodeRef: string);
+    constructor(params: esri.FindHotSpotsOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6122,10 +6078,14 @@ declare module "esri/dijit/analysis/FindNearest" {
     searchCutoffUnits: string;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -6133,13 +6093,7 @@ declare module "esri/dijit/analysis/FindNearest" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.FindNearestOptions, srcNodeRef: Node);
-    /**
-     * Creates a new FindNearest dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.FindNearestOptions, srcNodeRef: string);
+    constructor(params: esri.FindNearestOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6165,10 +6119,14 @@ declare module "esri/dijit/analysis/FindSimilarLocations" {
     searchLayers: FeatureLayer[];
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -6176,13 +6134,7 @@ declare module "esri/dijit/analysis/FindSimilarLocations" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new FindSimilarLocations dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
     /** Fires when the select tool option is activated. */
@@ -6222,10 +6174,14 @@ declare module "esri/dijit/analysis/InterpolatePoints" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -6233,13 +6189,7 @@ declare module "esri/dijit/analysis/InterpolatePoints" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new InterpolatePoints dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6270,10 +6220,14 @@ declare module "esri/dijit/analysis/MergeLayers" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /**
@@ -6281,13 +6235,7 @@ declare module "esri/dijit/analysis/MergeLayers" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.MergeLayersOptions, srcNodeRef: Node);
-    /**
-     * Creates a new MergeLayers dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.MergeLayersOptions, srcNodeRef: string);
+    constructor(params: esri.MergeLayersOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6316,10 +6264,14 @@ declare module "esri/dijit/analysis/OverlayLayers" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /** When the distance between features is less than the tolerance, the features in the overlay layer will snap to the features in the input layer. */
@@ -6331,13 +6283,7 @@ declare module "esri/dijit/analysis/OverlayLayers" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.OverlayLayersOptions, srcNodeRef: Node);
-    /**
-     * Creates a new OverlayLayers dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.OverlayLayersOptions, srcNodeRef: string);
+    constructor(params: esri.OverlayLayersOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6370,10 +6316,14 @@ declare module "esri/dijit/analysis/PlanRoutes" {
     routeCount: number;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /** Provide the locations where the people or vehicles start their routes. */
@@ -6385,13 +6335,7 @@ declare module "esri/dijit/analysis/PlanRoutes" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new PlanRoutes dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6428,10 +6372,14 @@ declare module "esri/dijit/analysis/SummarizeNearby" {
     shapeUnits: string;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /** An array of possible statistics attribute field names and summary types that you wish to calculate for all nearby features. */
@@ -6451,13 +6399,7 @@ declare module "esri/dijit/analysis/SummarizeNearby" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.SummarizeNearbyOptions, srcNodeRef: Node);
-    /**
-     * Creates a new SummarizeNearby dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.SummarizeNearbyOptions, srcNodeRef: string);
+    constructor(params: esri.SummarizeNearbyOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6486,10 +6428,14 @@ declare module "esri/dijit/analysis/SummarizeWithin" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /** A list of field names and statistical summary type that you wish to calculate for all features in SummaryLayer that are within each polygon in sumWithinLayer. */
@@ -6505,13 +6451,7 @@ declare module "esri/dijit/analysis/SummarizeWithin" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: esri.SummarizeWithinOptions, srcNodeRef: Node);
-    /**
-     * Creates a new SummarizeWithin dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: esri.SummarizeWithinOptions, srcNodeRef: string);
+    constructor(params: esri.SummarizeWithinOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6538,10 +6478,14 @@ declare module "esri/dijit/analysis/TraceDownstream" {
     returnFeatureCollection: boolean;
     /** When true, the choose extent checkbox will be shown. */
     showChooseExtent: boolean;
+    /** Indicates whether to show the close icon on the widget's user interface. */
+    showCloseIcon: boolean;
     /** When true, the show credit option is visible. */
     showCredits: boolean;
     /** When true, the help links will be shown. */
     showHelp: boolean;
+    /** Indicates whether to display a drop down menu listing valid input analysis layers. */
+    showSelectAnalysisLayer: boolean;
     /** When true, the select folder dropdown will be shown. */
     showSelectFolder: boolean;
     /** The trace line will be split into multiple lines where each line is of the specified length. */
@@ -6553,13 +6497,7 @@ declare module "esri/dijit/analysis/TraceDownstream" {
      * @param params Various options to configure this dijit.
      * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new TraceDownstream dijit using the given DOM node.
-     * @param params Various options to configure this dijit.
-     * @param srcNodeRef Reference or id of a HTML element that this dijit is rendered into.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
   }
@@ -6596,13 +6534,7 @@ declare module "esri/dijit/editing/AttachmentEditor" {
      * @param params No parameter options.
      * @param srcNodeRef HTML element where the widget is rendered.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new AttachmentEditor object.
-     * @param params No parameter options.
-     * @param srcNodeRef HTML element where the widget is rendered.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /**
      * Display the attachment editor.
      * @param graphic Graphic, with attachments, to display in the attachment editor.
@@ -6655,6 +6587,7 @@ declare module "esri/dijit/editing/Delete" {
 
 declare module "esri/dijit/editing/Editor" {
   import esri = require("esri");
+  import Edit = require("esri/toolbars/edit");
 
   /** The Editor widget provides out-of-the-box editing capabilities using an editable layer in a Feature Service. */
   class Editor {
@@ -6678,18 +6611,14 @@ declare module "esri/dijit/editing/Editor" {
     static CREATE_TOOL_RECTANGLE: any;
     /** Triangle tool */
     static CREATE_TOOL_TRIANGLE: any;
+    /** The default Edit toolbar instance. */
+    editToolbar: Edit;
     /**
      * Creates a new Editor object.
      * @param params Parameters that define the functionality of the editor widget.
      * @param srcNodeRef HTML element where the widget should be rendered.
      */
-    constructor(params: esri.EditorOptions, srcNodeRef: Node);
-    /**
-     * Creates a new Editor object.
-     * @param params Parameters that define the functionality of the editor widget.
-     * @param srcNodeRef HTML element where the widget should be rendered.
-     */
-    constructor(params: esri.EditorOptions, srcNodeRef: string);
+    constructor(params: esri.EditorOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the widget. */
     startup(): void;
     /** Fires when the widget has fully loaded. */
@@ -6713,13 +6642,7 @@ declare module "esri/dijit/editing/TemplatePicker" {
      * @param params FeatureLayers or items are required all other parameters are optional.
      * @param srcNodeRef HTML element where the TemplatePicker will be rendered.
      */
-    constructor(params: esri.TemplatePickerOptions, srcNodeRef: Node);
-    /**
-     * Creates a new TemplatePicker object that displays a gallery of templates from the input feature layers or items.
-     * @param params FeatureLayers or items are required all other parameters are optional.
-     * @param srcNodeRef HTML element where the TemplatePicker will be rendered.
-     */
-    constructor(params: esri.TemplatePickerOptions, srcNodeRef: string);
+    constructor(params: esri.TemplatePickerOptions, srcNodeRef: Node | string);
     /**
      * Get or set the properties of the template picker.
      * @param name Name of the attribute of interest.
@@ -6791,13 +6714,7 @@ declare module "esri/dijit/geoenrichment/DataBrowser" {
      * @param options Optional parameters used to create the layer.
      * @param srcNodeRef Reference or id of an HTML element where the DataBrowser should be rendered.
      */
-    constructor(options: esri.DataBrowserOptions, srcNodeRef: Node);
-    /**
-     * Creates a new DataBrowser dijit using the given DOM node.
-     * @param options Optional parameters used to create the layer.
-     * @param srcNodeRef Reference or id of an HTML element where the DataBrowser should be rendered.
-     */
-    constructor(options: esri.DataBrowserOptions, srcNodeRef: string);
+    constructor(options: esri.DataBrowserOptions, srcNodeRef: Node | string);
     /** Finalizes the creation of the DataBrowser. */
     startup(): void;
     /** Fires when user clicks the Back button. */
@@ -6816,6 +6733,9 @@ declare module "esri/dijit/geoenrichment/DataBrowser" {
 declare module "esri/dijit/geoenrichment/InfoGraphic" {
   import esri = require("esri");
   import GeometryStudyArea = require("esri/tasks/geoenrichment/GeometryStudyArea");
+  import RingBuffer = require("esri/tasks/geoenrichment/RingBuffer");
+  import DriveBuffer = require("esri/tasks/geoenrichment/DriveBuffer");
+  import IntersectingGeographies = require("esri/tasks/geoenrichment/IntersectingGeographies");
   import FeatureSet = require("esri/tasks/FeatureSet");
 
   /** Displays an Infographic of one or more variables that describe the geographic context of a location. */
@@ -6833,7 +6753,7 @@ declare module "esri/dijit/geoenrichment/InfoGraphic" {
     /** The study area for this Infographic. */
     studyArea: GeometryStudyArea;
     /** The options to apply to the study area. */
-    studyAreaOptions: any;
+    studyAreaOptions: RingBuffer | DriveBuffer | IntersectingGeographies;
     /** An HTML template string used to define the Infographic subtitle. */
     subtitle: string;
     /** The title of the Infographic. */
@@ -6847,13 +6767,7 @@ declare module "esri/dijit/geoenrichment/InfoGraphic" {
      * @param params Various optional parameters that can be used to configure the dijit.
      * @param srcNodeRef Reference or id of an HTML element where the Infographic should be rendered.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new Infographic dijit using the given DOM node.
-     * @param params Various optional parameters that can be used to configure the dijit.
-     * @param srcNodeRef Reference or id of an HTML element where the Infographic should be rendered.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /**
      * Define the infographic data.
      * @param data Specify the FeatureSet containing the custom data to display in the Infographic.
@@ -6901,13 +6815,7 @@ declare module "esri/dijit/geoenrichment/InfographicsCarousel" {
      * @param params Various optional parameters that can be used to configure the dijit.
      * @param srcNodeRef Reference or id of an HTML element where the Directions widget should be rendered.
      */
-    constructor(params: any, srcNodeRef: Node);
-    /**
-     * Creates a new InfographicsCarousel dijit using the given DOM node.
-     * @param params Various optional parameters that can be used to configure the dijit.
-     * @param srcNodeRef Reference or id of an HTML element where the Directions widget should be rendered.
-     */
-    constructor(params: any, srcNodeRef: string);
+    constructor(params: any, srcNodeRef: Node | string);
     /** Finalizes the creation of this dijit. */
     startup(): void;
     /** Fires if an error occurs in retrieving data for the study area. */
@@ -6924,10 +6832,14 @@ declare module "esri/dijit/geoenrichment/InfographicsCarousel" {
 }
 
 declare module "esri/dijit/geoenrichment/InfographicsOptions" {
+  import RingBuffer = require("esri/tasks/geoenrichment/RingBuffer");
+  import DriveBuffer = require("esri/tasks/geoenrichment/DriveBuffer");
+  import IntersectingGeographies = require("esri/tasks/geoenrichment/IntersectingGeographies");
+
   /** InfographicsOptions is used to customize and configure the Infographic's included in a InfographicCarousel. */
   class InfographicsOptions {
     /** The options to apply to the study area. */
-    studyAreaOptions: any;
+    studyAreaOptions: RingBuffer | DriveBuffer | IntersectingGeographies;
     /** The name of the css theme used to format the InfographicsCarousel. */
     theme: string;
     /**
@@ -6977,19 +6889,7 @@ declare module "esri/dijit/util/busyIndicator" {
      * @param target The String (Node id, dijit/_WidgetBase id), HTMLElement reference (Node), or dijit/_WidgetBase.
      * @param params (Optional) The params options can be used when needing more fine-grained control.
      */
-    create(target: string, params?: any): any;
-    /**
-     * Creates a busy indicator on a target.
-     * @param target The String (Node id, dijit/_WidgetBase id), HTMLElement reference (Node), or dijit/_WidgetBase.
-     * @param params (Optional) The params options can be used when needing more fine-grained control.
-     */
-    create(target: HTMLElement, params?: any): any;
-    /**
-     * Creates a busy indicator on a target.
-     * @param target The String (Node id, dijit/_WidgetBase id), HTMLElement reference (Node), or dijit/_WidgetBase.
-     * @param params (Optional) The params options can be used when needing more fine-grained control.
-     */
-    create(target: any, params?: any): any;
+    create(target: string | HTMLElement | any, params?: any): any;
   };
   export = busyIndicator;
 }
@@ -7003,42 +6903,22 @@ declare module "esri/domUtils" {
      * Returns the DOM node from HTMLElement or dijit/_WidgetBase.
      * @param target The HTMLElement or dijit/_WidgetBase to retrieve.
      */
-    getNode(target: HTMLElement): Node;
-    /**
-     * Returns the DOM node from HTMLElement or dijit/_WidgetBase.
-     * @param target The HTMLElement or dijit/_WidgetBase to retrieve.
-     */
-    getNode(target: any): Node;
+    getNode(target: HTMLElement | any): Node;
     /**
      * Hides the HTMLElement or dijit/_WidgetBase.
      * @param target The HTMLElement or dijit/_WidgetBase.
      */
-    hide(target: HTMLElement): void;
-    /**
-     * Hides the HTMLElement or dijit/_WidgetBase.
-     * @param target The HTMLElement or dijit/_WidgetBase.
-     */
-    hide(target: any): void;
+    hide(target: HTMLElement | any): void;
     /**
      * Shows the HTMLElement or dijit/_WidgetBase.
      * @param target The HTMLElement or dijit/_WidgetBase.
      */
-    show(target: HTMLElement): void;
-    /**
-     * Shows the HTMLElement or dijit/_WidgetBase.
-     * @param target The HTMLElement or dijit/_WidgetBase.
-     */
-    show(target: any): void;
+    show(target: HTMLElement | any): void;
     /**
      * If the target (HTMLElement or dijit/_WidgetBase) is currently visible, the target is hidden.
      * @param target The HTMLElement or dijit/_WidgetBase.
      */
-    toggle(target: HTMLElement): void;
-    /**
-     * If the target (HTMLElement or dijit/_WidgetBase) is currently visible, the target is hidden.
-     * @param target The HTMLElement or dijit/_WidgetBase.
-     */
-    toggle(target: any): void;
+    toggle(target: HTMLElement | any): void;
   };
   export = domUtils;
 }
@@ -7046,13 +6926,13 @@ declare module "esri/domUtils" {
 declare module "esri/geometry/Circle" {
   import esri = require("esri");
   import Polygon = require("esri/geometry/Polygon");
-  import SpatialReference = require("esri/SpatialReference");
   import Point = require("esri/geometry/Point");
+  import SpatialReference = require("esri/SpatialReference");
 
   /** A circle (Polygon) created by a specified center point. */
   class Circle extends Polygon {
     /** Center point of the circle. */
-    center: any;
+    center: Point | number[];
     /** The radius of the circle based. */
     radius: number;
     /** Unit of the radius. */
@@ -7066,13 +6946,7 @@ declare module "esri/geometry/Circle" {
      * @param center Center point of the circle.
      * @param options See options descriptions for further information.
      */
-    constructor(center: Point, options?: esri.CircleOptions1);
-    /**
-     * Create a new Circle by specifying an input center location using either an esri.geometry.Point object or a latitude/longitude array and an object with the following optional properties: radius, radiusUnits, geodesic and numberOfPoints.
-     * @param center Center point of the circle.
-     * @param options See options descriptions for further information.
-     */
-    constructor(center: number[], options?: esri.CircleOptions1);
+    constructor(center: Point | number[], options?: esri.CircleOptions1);
     /**
      * Create a new Circle by specifying an object with a required center location, defined as a longitude/latitude array or an esri.geometry.Point, and the following additional optional parameters: radius, radiusUnits, geodesic, and numberOfPoints.
      * @param params If no center parameter is provided, it must be set within the options.
@@ -7133,22 +7007,22 @@ declare module "esri/geometry/Extent" {
     /** Distance between xmin and xmax. */
     getWidth(): number;
     /**
-     * Returns the interesection extent if the input geometry is an extent that intersects this extent.
+     * Returns the intersection extent if the input geometry is an extent that intersects this extent.
      * @param geometry The geometry used to test the intersection.
      */
-    intersects(geometry: Geometry): any;
+    intersects(geometry: Geometry): Extent | boolean;
     /** Returns an array with either one Extent that's been shifted to within +/- 180 or two Extents if the original extent intersects the dateline. */
     normalize(): Extent[];
     /**
      * Returns a new Extent with x and y offsets.
-     * @param dx The offset distance in map units for the y-coordinate.
-     * @param dy The offset distance in map units for the x-coordinate.
+     * @param dx The offset distance in map units for the x-coordinate.
+     * @param dy The offset distance in map units for the y-coordinate.
      */
     offset(dx: number, dy: number): Extent;
     /** Returns an extent with a spatial reference with a custom shifted central meridian if the extent intersects the dateline. */
     shiftCentralMeridian(): Extent;
     /**
-     * Expands this extent to include the extent of the argument.
+     * Expands this extent to include the extent of the argument.NOTE: Performing a Union returns a new extent as opposed to modifying the existing extent.
      * @param extent The minx, miny, maxx, and maxy bounding box.
      */
     union(extent: Extent): Extent;
@@ -7224,12 +7098,7 @@ declare module "esri/geometry/Multipoint" {
      * Adds a point to the Multipoint.
      * @param point The point to add.
      */
-    addPoint(point: Point): Multipoint;
-    /**
-     * Adds a point to the Multipoint.
-     * @param point The point to add.
-     */
-    addPoint(point: number[]): Multipoint;
+    addPoint(point: Point | number[]): Multipoint;
     /** Gets the extent of all the points. */
     getExtent(): Extent;
     /**
@@ -7362,22 +7231,12 @@ declare module "esri/geometry/Polygon" {
      * Create a new polygon by providing an array of geographic coordinate pairs.
      * @param coordinates An array of geographic coordinates that define the polygon.
      */
-    constructor(coordinates: number[][]);
-    /**
-     * Create a new polygon by providing an array of geographic coordinate pairs.
-     * @param coordinates An array of geographic coordinates that define the polygon.
-     */
-    constructor(coordinates: number[][][]);
+    constructor(coordinates: number[][] | number[][][]);
     /**
      * Adds a ring to the Polygon.
      * @param ring A polygon ring.
      */
-    addRing(ring: Point[]): Polygon;
-    /**
-     * Adds a ring to the Polygon.
-     * @param ring A polygon ring.
-     */
-    addRing(ring: number[][]): Polygon;
+    addRing(ring: Point[] | number[][]): Polygon;
     /**
      * Checks on the client if the specified point is inside the polygon.
      * @param point The location defined by an X- and Y- coordinate in map units.
@@ -7409,12 +7268,7 @@ declare module "esri/geometry/Polygon" {
      * Checks if a Polygon ring is clockwise.
      * @param ring A polygon ring.
      */
-    isClockwise(ring: Point[]): boolean;
-    /**
-     * Checks if a Polygon ring is clockwise.
-     * @param ring A polygon ring.
-     */
-    isClockwise(ring: number[][]): boolean;
+    isClockwise(ring: Point[] | number[][]): boolean;
     /**
      * When true, the polygon is self-intersecting which means that the ring of the polygon crosses itself.
      * @param polygon The polygon to test for self-intersection.
@@ -7466,22 +7320,12 @@ declare module "esri/geometry/Polyline" {
      * Create a new polyline by providing an array of geographic coordinates.
      * @param coordinates An array of geographic coordinates that define the polyline.
      */
-    constructor(coordinates: number[][]);
-    /**
-     * Create a new polyline by providing an array of geographic coordinates.
-     * @param coordinates An array of geographic coordinates that define the polyline.
-     */
-    constructor(coordinates: number[][][]);
+    constructor(coordinates: number[][] | number[][][]);
     /**
      * Adds a path to the Polyline.
      * @param path Path to add to the Polyline.
      */
-    addPath(path: Point[]): Polyline;
-    /**
-     * Adds a path to the Polyline.
-     * @param path Path to add to the Polyline.
-     */
-    addPath(path: number[][]): Polyline;
+    addPath(path: Point[] | number[][]): Polyline;
     /** Returns the extent of the Polyline. */
     getExtent(): Extent;
     /**
@@ -7601,45 +7445,22 @@ declare module "esri/geometry/geodesicUtils" {
 
 declare module "esri/geometry/geometryEngine" {
   import Geometry = require("esri/geometry/Geometry");
+  import Polygon = require("esri/geometry/Polygon");
   import Extent = require("esri/geometry/Extent");
   import Polyline = require("esri/geometry/Polyline");
   import SpatialReference = require("esri/SpatialReference");
   import Point = require("esri/geometry/Point");
 
-  /** (Beta at v3.13) A client-side geometry engine. */
+  /** (Currently in beta) A client-side geometry engine. */
   var geometryEngine: {
     /**
-     * Creates buffer polygons at a specified distance around the given geometries.
+     * Creates planar (or Euclidean) buffer polygons at a specified distance around the input geometries.
      * @param geometry The buffer input geometry.
      * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
+     * @param unit Unit for the distance(s).
      * @param unionResults Whether the output geometries should be unioned into a single polygon.
      */
-    buffer(geometry: Geometry, distance: number[], unit?: number, unionResults?: boolean): any;
-    /**
-     * Creates buffer polygons at a specified distance around the given geometries.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    buffer(geometry: Geometry[], distance: number, unit?: number, unionResults?: boolean): any;
-    /**
-     * Creates buffer polygons at a specified distance around the given geometries.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    buffer(geometry: Geometry, distance: number, unit?: number, unionResults?: boolean): any;
-    /**
-     * Creates buffer polygons at a specified distance around the given geometries.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    buffer(geometry: Geometry[], distance: number[], unit?: number, unionResults?: boolean): any;
+    buffer(geometry: Geometry | Geometry[], distance: number | number[], unit: string | number, unionResults?: boolean): Polygon | Polygon[];
     /**
      * Calculates the clipped geometry from a target geometry by an envelope.
      * @param geometry The geometry to be clipped.
@@ -7657,13 +7478,7 @@ declare module "esri/geometry/geometryEngine" {
      * @param geometry The input geometry.
      * @param merge Whether to merge output geometries.
      */
-    convexHull(geometry: Geometry, merge?: boolean): any;
-    /**
-     * Calculates the convex hull of the input geometry.
-     * @param geometry The input geometry.
-     * @param merge Whether to merge output geometries.
-     */
-    convexHull(geometry: Geometry[], merge?: boolean): any;
+    convexHull(geometry: Geometry | Geometry[], merge?: boolean): Geometry | Geometry[];
     /**
      * Indicates if one geometry crosses another geometry.
      * @param geometry1 The geometry to cross.
@@ -7671,7 +7486,7 @@ declare module "esri/geometry/geometryEngine" {
      */
     crosses(geometry1: Geometry, geometry2: Geometry): boolean;
     /**
-     * Split the input polyline or polygon where it crosses a cutting polyline.
+     * Split the input Polyline or Polygon where it crosses a cutting Polyline.
      * @param geometry The geometry to be cut.
      * @param cutter The polyline to cut the geometry.
      */
@@ -7682,36 +7497,30 @@ declare module "esri/geometry/geometryEngine" {
      * @param maxSegmentLength The maximum segment length allowed.
      * @param maxSegmentLengthUnit Unit for the maximum segment length.
      */
-    densify(geometry: Geometry, maxSegmentLength: number, maxSegmentLengthUnit?: number): Geometry;
+    densify(geometry: Geometry, maxSegmentLength: number, maxSegmentLengthUnit: string | number): Geometry;
     /**
      * Creates the difference of two geometries.
-     * @param geometry The input geometry.
-     * @param subtractor The geometry being subtracted.
+     * @param inputGeometry The input geometry to subtract from.
+     * @param subtractor The geometry being subtracted from inputGeometry.
      */
-    difference(geometry: Geometry, subtractor: Geometry): any;
+    difference(inputGeometry: Geometry | Geometry[], subtractor: Geometry): Geometry | Geometry[];
     /**
-     * Creates the difference of two geometries.
-     * @param geometry The input geometry.
-     * @param subtractor The geometry being subtracted.
-     */
-    difference(geometry: Geometry[], subtractor: Geometry): any;
-    /**
-     * Indicates if one geometry is disjoint from another geometry.
-     * @param geometry1 The base geometry that is tested for within relationship to the other geometry.
+     * Indicates if one geometry is disjoint (doesn't intersect in any way) with another geometry.
+     * @param geometry1 The base geometry that is tested for the "disjoint" relationship to the other geometry.
      * @param geometry2 The comparison geometry that is tested for the disjoint relationship to the other geometry.
      */
     disjoint(geometry1: Geometry, geometry2: Geometry): boolean;
     /**
-     * Calculates the 2D planar shortest distance between two geometries.
-     * @param geometry1
-     * @param geometry2
+     * Calculates the shortest planar distance between two geometries.
+     * @param geometry1 First input geometry.
+     * @param geometry2 Second input geometry.
      * @param distanceUnit Units of the return value.
      */
-    distance(geometry1: Geometry, geometry2: Geometry, distanceUnit?: number): number;
+    distance(geometry1: Geometry, geometry2: Geometry, distanceUnit: string | number): number;
     /**
      * Indicates if two geometries are equal.
-     * @param geometry1
-     * @param geometry2
+     * @param geometry1 First input geometry.
+     * @param geometry2 Second input geometry.
      */
     equals(geometry1: Geometry, geometry2: Geometry): boolean;
     /**
@@ -7738,63 +7547,33 @@ declare module "esri/geometry/geometryEngine" {
      * @param removeDegenerateParts When true, the degenerate parts of the geometry will be removed from the output (may be undesired for drawing).
      * @param maxDeviationUnit A unit for maximum deviation.
      */
-    generalize(geometry: Geometry, maxDeviation: number, removeDegenerateParts?: boolean, maxDeviationUnit?: number): Geometry;
+    generalize(geometry: Geometry, maxDeviation: number, removeDegenerateParts?: boolean, maxDeviationUnit?: string | number): Geometry;
     /**
-     * Calculates area of input geometry using geographic (geodesic) coordinates.
-     * @param geometry
+     * Calculates the area of the input geometry.
+     * @param geometry The input geometry.
      * @param unit Units of the return value.
      */
-    geodesicArea(geometry: Geometry, unit?: number): number;
+    geodesicArea(geometry: Geometry, unit: string | number): number;
     /**
-     * Creates buffer polygons at a specified distance around the given geometries using geographic (geodesic) coordinates.
+     * Creates geodesic buffer polygons at a specified distance around the input geometries.
      * @param geometry The buffer input geometry.
      * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
+     * @param unit Unit for the distance(s).
      * @param unionResults Whether the output geometries should be unioned into a single polygon.
      */
-    geodesicBuffer(geometry: Geometry, distance: number[], unit?: number, unionResults?: boolean): any;
+    geodesicBuffer(geometry: Geometry | Geometry[], distance: number | number[], unit: string | number, unionResults?: boolean): Polygon | Polygon[];
     /**
-     * Creates buffer polygons at a specified distance around the given geometries using geographic (geodesic) coordinates.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    geodesicBuffer(geometry: Geometry[], distance: number, unit?: number, unionResults?: boolean): any;
-    /**
-     * Creates buffer polygons at a specified distance around the given geometries using geographic (geodesic) coordinates.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    geodesicBuffer(geometry: Geometry, distance: number, unit?: number, unionResults?: boolean): any;
-    /**
-     * Creates buffer polygons at a specified distance around the given geometries using geographic (geodesic) coordinates.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    geodesicBuffer(geometry: Geometry[], distance: number[], unit?: number, unionResults?: boolean): any;
-    /**
-     * Calculates length of the input geometry using geographic (geodesic) coordinates.
-     * @param geometry
+     * Calculates the length of the input geometry.
+     * @param geometry The input geometry.
      * @param unit Units of the return value.
      */
-    geodesicLength(geometry: Geometry, unit?: number): number;
+    geodesicLength(geometry: Geometry, unit: string | number): number;
     /**
      * Creates a new geometry through intersection between two geometries.
      * @param geometry The input geometry.
      * @param intersector The geometry being intersected.
      */
-    intersect(geometry: Geometry, intersector: Geometry): any;
-    /**
-     * Creates a new geometry through intersection between two geometries.
-     * @param geometry The input geometry.
-     * @param intersector The geometry being intersected.
-     */
-    intersect(geometry: Geometry[], intersector: Geometry): any;
+    intersect(geometry: Geometry | Geometry[], intersector: Geometry): Geometry | Geometry[];
     /**
      * Indicates if one geometry intersects another geometry.
      * @param geometry1 The geometry that is tested for the intersects relationship to the other geometry.
@@ -7802,26 +7581,26 @@ declare module "esri/geometry/geometryEngine" {
      */
     intersects(geometry1: Geometry, geometry2: Geometry): boolean;
     /**
-     * Indicates if the given geometry is simple.
+     * Indicates if the given geometry is topologically simple.
      * @param geometry Geometry
      */
     isSimple(geometry: Geometry): boolean;
     /**
      * Finds the coordinate of the geometry which is closest to the specified point.
      * @param geometry The geometry to consider.
-     * @param inputPoint The point to find the nearest coordinate in the geometry for.
+     * @param inputPoint The point used to search the nearest coordinate in the geometry.
      */
     nearestCoordinate(geometry: Geometry, inputPoint: Point): any;
     /**
      * Finds vertex on the geometry nearest to the specified point.
      * @param geometry The geometry to consider.
-     * @param inputPoint The point to find the nearest vertex in the geometry for.
+     * @param inputPoint The point used to search the nearest vertex in the geometry.
      */
     nearestVertex(geometry: Geometry, inputPoint: Point): any;
     /**
      * Finds all vertices in the given distance from the specified point, sorted from the closest to the furthest and returns them as an array of objects.
      * @param geometry The geometry to consider.
-     * @param inputPoint The point to start from.
+     * @param inputPoint The point from which to measure.
      * @param searchRadius The search radius.
      * @param maxVertexCountToReturn The maximum number number of vertices to return.
      */
@@ -7829,23 +7608,13 @@ declare module "esri/geometry/geometryEngine" {
     /**
      * Creates offset version of the input geometry.
      * @param geometry The geometries to offset.
-     * @param distance The offset distance for the Geometries.
+     * @param offsetDistance The offset distance for the Geometries.
      * @param offsetUnit Unit for the offset.
      * @param joinType The join type.
      * @param bevelRatio Applicable to MITER, bevelRatio is multiplied by the offset distance and the result determines how far a mitered offset intersection can be located before it is beveled.
      * @param flattenError Applicable to ROUND, flattenError determines the maximum distance of the resulting segments compared to the true circular arc.
      */
-    offset(geometry: Geometry, distance: number, offsetUnit: number, joinType: number, bevelRatio?: number, flattenError?: number): any;
-    /**
-     * Creates offset version of the input geometry.
-     * @param geometry The geometries to offset.
-     * @param distance The offset distance for the Geometries.
-     * @param offsetUnit Unit for the offset.
-     * @param joinType The join type.
-     * @param bevelRatio Applicable to MITER, bevelRatio is multiplied by the offset distance and the result determines how far a mitered offset intersection can be located before it is beveled.
-     * @param flattenError Applicable to ROUND, flattenError determines the maximum distance of the resulting segments compared to the true circular arc.
-     */
-    offset(geometry: Geometry[], distance: number, offsetUnit: number, joinType: number, bevelRatio?: number, flattenError?: number): any;
+    offset(geometry: Geometry | Geometry[], offsetDistance: number, offsetUnit: string | number, joinType: string, bevelRatio?: number, flattenError?: number): Geometry | Geometry[];
     /**
      * Indicates if one geometry  overlaps another geometry.
      * @param geometry1 The base geometry that is tested for overlaps relationship to the other geometry.
@@ -7853,22 +7622,22 @@ declare module "esri/geometry/geometryEngine" {
      */
     overlaps(geometry1: Geometry, geometry2: Geometry): boolean;
     /**
-     * Calculates the area of the input geometry using projected (planar) coordinates.
-     * @param geometry
+     * Calculates the area of the input geometry.
+     * @param geometry The input geometry.
      * @param unit Units of the return value.
      */
-    planarArea(geometry: Geometry, unit?: number): number;
+    planarArea(geometry: Geometry, unit: string | number): number;
     /**
-     * Calculates the length of the input geometry using projected (planar) coordinates.
-     * @param geometry
+     * Calculates the length of the input geometry.
+     * @param geometry The input geometry.
      * @param unit Units of the return value.
      */
-    planarLength(geometry: Geometry, unit: number): number;
+    planarLength(geometry: Geometry, unit: string | number): number;
     /**
-     * Indicates if the given relation holds for the two geometries.
+     * Indicates if the given DE-9IM relation holds for the two geometries.
      * @param geometry1 The first geometry for the relation.
      * @param geometry2 The second geometry for the relation.
-     * @param relation The DE-9IM matrix relation encoded as a string.
+     * @param relation The Dimensionally Extended 9 Intersection Model (DE-9IM) matrix relation (encoded as a string) to test against the relationship of the two geometries.
      */
     relate(geometry1: Geometry, geometry2: Geometry, relation: string): boolean;
     /**
@@ -7880,7 +7649,7 @@ declare module "esri/geometry/geometryEngine" {
     rotate(geometry: Geometry, angle: number, rotationOrigin?: Point): Geometry;
     /**
      * Performs the simplify operation on the geometry which alters the given geometries to make their definitions topologically legal with respect to their geometry type.
-     * @param geometry Geometry
+     * @param geometry The geometry to be simplified.
      */
     simplify(geometry: Geometry): Geometry;
     /**
@@ -7888,13 +7657,7 @@ declare module "esri/geometry/geometryEngine" {
      * @param leftGeometry One of the Geometry instances in the XOR operation.
      * @param rightGeometry One of the Geometry instances in the XOR operation.
      */
-    symmetricDifference(leftGeometry: Geometry, rightGeometry: Geometry): any;
-    /**
-     * Creates the symmetric difference of two geometries.
-     * @param leftGeometry One of the Geometry instances in the XOR operation.
-     * @param rightGeometry One of the Geometry instances in the XOR operation.
-     */
-    symmetricDifference(leftGeometry: Geometry[], rightGeometry: Geometry): any;
+    symmetricDifference(leftGeometry: Geometry | Geometry[], rightGeometry: Geometry): Geometry | Geometry[];
     /**
      * Indicates if one geometry touches another geometry.
      * @param geometry1 The geometry which may be touching another geometry.
@@ -7923,40 +7686,16 @@ declare module "esri/geometry/geometryEngineAsync" {
   import SpatialReference = require("esri/SpatialReference");
   import Point = require("esri/geometry/Point");
 
-  /** (Beta at v3.13) A client-side asynchronous geometry engine. */
+  /** (Currently in beta) A client-side asynchronous geometry engine. */
   var geometryEngineAsync: {
     /**
-     * Creates buffer polygons at a specified distance around the given geometries.
+     * Creates planar (or Euclidean) buffer polygons at a specified distance around the input geometries.
      * @param geometry The buffer input geometry.
      * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
+     * @param unit Unit for the distance(s).
      * @param unionResults Whether the output geometries should be unioned into a single polygon.
      */
-    buffer(geometry: Geometry, distance: number[], unit?: number, unionResults?: boolean): any;
-    /**
-     * Creates buffer polygons at a specified distance around the given geometries.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    buffer(geometry: Geometry[], distance: number, unit?: number, unionResults?: boolean): any;
-    /**
-     * Creates buffer polygons at a specified distance around the given geometries.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    buffer(geometry: Geometry, distance: number, unit?: number, unionResults?: boolean): any;
-    /**
-     * Creates buffer polygons at a specified distance around the given geometries.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    buffer(geometry: Geometry[], distance: number[], unit?: number, unionResults?: boolean): any;
+    buffer(geometry: Geometry | Geometry[], distance: number | number[], unit: string | number, unionResults?: boolean): any;
     /**
      * Calculates the clipped geometry from a target geometry by an envelope.
      * @param geometry The geometry to be clipped.
@@ -7974,13 +7713,7 @@ declare module "esri/geometry/geometryEngineAsync" {
      * @param geometry The input geometry.
      * @param merge Whether to merge output geometries.
      */
-    convexHull(geometry: Geometry, merge?: boolean): any;
-    /**
-     * Calculates the convex hull of the input geometry.
-     * @param geometry The input geometry.
-     * @param merge Whether to merge output geometries.
-     */
-    convexHull(geometry: Geometry[], merge?: boolean): any;
+    convexHull(geometry: Geometry | Geometry[], merge?: boolean): any;
     /**
      * Indicates if one geometry crosses another geometry.
      * @param geometry1 The geometry to cross.
@@ -7997,43 +7730,37 @@ declare module "esri/geometry/geometryEngineAsync" {
      * Densify geometries by plotting points between existing vertices.
      * @param geometry The geometry to be densified.
      * @param maxSegmentLength The maximum segment length allowed.
-     * @param maxSegmentLengthUnit Unit for the maximum segment length.
+     * @param maxSegmentLengthUnit Defaults to the units of the input geometries.
      */
-    densify(geometry: Geometry, maxSegmentLength: number, maxSegmentLengthUnit?: number): any;
+    densify(geometry: Geometry, maxSegmentLength: number, maxSegmentLengthUnit: string | number): any;
     /**
      * Creates the difference of two geometries.
-     * @param geometry The input geometry.
+     * @param inputGeometry The input geometry to subtract from.
      * @param subtractor The geometry being subtracted.
      */
-    difference(geometry: Geometry, subtractor: Geometry): any;
+    difference(inputGeometry: Geometry | Geometry[], subtractor: Geometry): any;
     /**
-     * Creates the difference of two geometries.
-     * @param geometry The input geometry.
-     * @param subtractor The geometry being subtracted.
-     */
-    difference(geometry: Geometry[], subtractor: Geometry): any;
-    /**
-     * Indicates if one geometry is disjoint from another geometry.
-     * @param geometry1 The base geometry that is tested for within relationship to the other geometry.
+     * Indicates if one geometry is disjoint (doesn't intersect in any way) with another geometry.
+     * @param geometry1 The base geometry that is tested for the "disjoint" relationship to the other geometry.
      * @param geometry2 The comparison geometry that is tested for the disjoint relationship to the other geometry.
      */
     disjoint(geometry1: Geometry, geometry2: Geometry): any;
     /**
-     * Calculates the 2D planar shortest distance between two geometries.
-     * @param geometry1
-     * @param geometry2
+     * Calculates the shortest planar distance between two geometries.
+     * @param geometry1 First input geometry.
+     * @param geometry2 Second input geometry.
      * @param distanceUnit Units of the return value.
      */
-    distance(geometry1: Geometry, geometry2: Geometry, distanceUnit?: number): any;
+    distance(geometry1: Geometry, geometry2: Geometry, distanceUnit: string | number): any;
     /**
      * Indicates if two geometries are equal.
-     * @param geometry1
-     * @param geometry2
+     * @param geometry1 First input geometry.
+     * @param geometry2 Second input geometry.
      */
     equals(geometry1: Geometry, geometry2: Geometry): any;
     /**
      * Returns an object containing additional information about the input spatial reference.
-     * @param spatialReference The spatial Reference.
+     * @param spatialReference The input spatial reference.
      */
     extendedSpatialReferenceInfo(spatialReference: SpatialReference): any;
     /**
@@ -8053,65 +7780,35 @@ declare module "esri/geometry/geometryEngineAsync" {
      * @param geometry The geometry to be generalized.
      * @param maxDeviation The maximum allowed deviation from the generalized geometry to the original geometry.
      * @param removeDegenerateParts When true, the degenerate parts of the geometry will be removed from the output (may be undesired for drawing).
-     * @param maxDeviationUnit A unit for maximum deviation.
+     * @param maxDeviationUnit Defaults to the units of the input geometries.
      */
-    generalize(geometry: Geometry, maxDeviation: number, removeDegenerateParts?: boolean, maxDeviationUnit?: number): any;
+    generalize(geometry: Geometry, maxDeviation: number, removeDegenerateParts?: boolean, maxDeviationUnit?: string | number): any;
     /**
-     * Calculates area of input geometry using geographic (geodesic) coordinates.
-     * @param geometry
+     * Calculates the area of the input geometry.
+     * @param geometry The input geometry.
      * @param unit Units of the return value.
      */
-    geodesicArea(geometry: Geometry, unit?: number): any;
+    geodesicArea(geometry: Geometry, unit: string | number): any;
     /**
-     * Creates buffer polygons at a specified distance around the given geometries using geographic (geodesic) coordinates.
+     * Creates geodesic buffer polygons at a specified distance around the input geometries.
      * @param geometry The buffer input geometry.
      * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
+     * @param unit Unit for the distance(s).
      * @param unionResults Whether the output geometries should be unioned into a single polygon.
      */
-    geodesicBuffer(geometry: Geometry, distance: number[], unit?: number, unionResults?: boolean): any;
+    geodesicBuffer(geometry: Geometry | Geometry[], distance: number | number[], unit: string | number, unionResults?: boolean): any;
     /**
-     * Creates buffer polygons at a specified distance around the given geometries using geographic (geodesic) coordinates.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    geodesicBuffer(geometry: Geometry[], distance: number, unit?: number, unionResults?: boolean): any;
-    /**
-     * Creates buffer polygons at a specified distance around the given geometries using geographic (geodesic) coordinates.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    geodesicBuffer(geometry: Geometry, distance: number, unit?: number, unionResults?: boolean): any;
-    /**
-     * Creates buffer polygons at a specified distance around the given geometries using geographic (geodesic) coordinates.
-     * @param geometry The buffer input geometry.
-     * @param distance The specified distance(s) for buffering.
-     * @param unit Unit for the distances.
-     * @param unionResults Whether the output geometries should be unioned into a single polygon.
-     */
-    geodesicBuffer(geometry: Geometry[], distance: number[], unit?: number, unionResults?: boolean): any;
-    /**
-     * Calculates length of the input geometry using geographic (geodesic) coordinates.
-     * @param geometry
+     * Calculates the length of the input geometry.
+     * @param geometry The input geometry.
      * @param unit Units of the return value.
      */
-    geodesicLength(geometry: Geometry, unit?: number): any;
+    geodesicLength(geometry: Geometry, unit: string | number): any;
     /**
      * Creates a new geometry through intersection between two geometries.
      * @param geometry The input geometry.
      * @param intersector The geometry being intersected.
      */
-    intersect(geometry: Geometry, intersector: Geometry): any;
-    /**
-     * Creates a new geometry through intersection between two geometries.
-     * @param geometry The input geometry.
-     * @param intersector The geometry being intersected.
-     */
-    intersect(geometry: Geometry[], intersector: Geometry): any;
+    intersect(geometry: Geometry | Geometry[], intersector: Geometry): any;
     /**
      * Indicates if one geometry intersects another geometry.
      * @param geometry1 The geometry that is tested for the intersects relationship to the other geometry.
@@ -8119,26 +7816,26 @@ declare module "esri/geometry/geometryEngineAsync" {
      */
     intersects(geometry1: Geometry, geometry2: Geometry): any;
     /**
-     * Indicates if the given geometry is simple.
+     * Indicates if the given geometry is topologically simple.
      * @param geometry Geometry
      */
     isSimple(geometry: Geometry): any;
     /**
      * Finds the coordinate of the geometry which is closest to the specified point.
      * @param geometry The geometry to consider.
-     * @param inputPoint The point used to find the nearest coordinate in the geometry.
+     * @param inputPoint The point used to search the nearest coordinate in the geometry.
      */
     nearestCoordinate(geometry: Geometry, inputPoint: Point): any;
     /**
      * Finds vertex on the geometry nearest to the specified point.
      * @param geometry The geometry to consider.
-     * @param inputPoint The point to find the nearest vertex in the geometry for.
+     * @param inputPoint The point used to search the nearest vertex in the geometry.
      */
     nearestVertex(geometry: Geometry, inputPoint: Point): any;
     /**
      * Finds all vertices in the given distance from the specified point, sorted from the closest to the furthest and returns them as an array of objects once resolved.
      * @param geometry The geometry to consider.
-     * @param inputPoint The point to start from.
+     * @param inputPoint The point from which to measure.
      * @param searchRadius The search radius.
      * @param maxVertexCountToReturn The maximum number number of vertices to return.
      */
@@ -8146,23 +7843,13 @@ declare module "esri/geometry/geometryEngineAsync" {
     /**
      * Creates offset version of the input geometry.
      * @param geometry The geometries to offset.
-     * @param distance The offset distance for the Geometries.
+     * @param offsetDistance The offset distance for the Geometries.
      * @param offsetUnit Unit for the offset.
      * @param joinType The join type.
      * @param bevelRatio Applicable to MITER, bevelRatio is multiplied by the offset distance and the result determines how far a mitered offset intersection can be located before it is beveled.
      * @param flattenError Applicable to ROUND, flattenError determines the maximum distance of the resulting segments compared to the true circular arc.
      */
-    offset(geometry: Geometry, distance: number, offsetUnit: number, joinType: number, bevelRatio?: number, flattenError?: number): any;
-    /**
-     * Creates offset version of the input geometry.
-     * @param geometry The geometries to offset.
-     * @param distance The offset distance for the Geometries.
-     * @param offsetUnit Unit for the offset.
-     * @param joinType The join type.
-     * @param bevelRatio Applicable to MITER, bevelRatio is multiplied by the offset distance and the result determines how far a mitered offset intersection can be located before it is beveled.
-     * @param flattenError Applicable to ROUND, flattenError determines the maximum distance of the resulting segments compared to the true circular arc.
-     */
-    offset(geometry: Geometry[], distance: number, offsetUnit: number, joinType: number, bevelRatio?: number, flattenError?: number): any;
+    offset(geometry: Geometry | Geometry[], offsetDistance: number, offsetUnit: string | number, joinType: string, bevelRatio?: number, flattenError?: number): any;
     /**
      * Indicates if one geometry  overlaps another geometry.
      * @param geometry1 The base geometry that is tested for overlaps relationship to the other geometry.
@@ -8170,22 +7857,22 @@ declare module "esri/geometry/geometryEngineAsync" {
      */
     overlaps(geometry1: Geometry, geometry2: Geometry): any;
     /**
-     * Calculates the area of the input geometry using projected (planar) coordinates.
-     * @param geometry
+     * Calculates the area of the input geometry.
+     * @param geometry The input geometry.
      * @param unit Units of the return value.
      */
-    planarArea(geometry: Geometry, unit?: number): any;
+    planarArea(geometry: Geometry, unit: string | number): any;
     /**
-     * Calculates the length of the input geometry using projected (planar) coordinates.
-     * @param geometry
+     * Calculates the length of the input geometry.
+     * @param geometry The input geometry.
      * @param unit Units of the return value.
      */
-    planarLength(geometry: Geometry, unit: number): any;
+    planarLength(geometry: Geometry, unit: string | number): any;
     /**
-     * Indicates if the given relation holds for the two geometries.
+     * Indicates if the given DE-9IM relation holds for the two geometries.
      * @param geometry1 The first geometry for the relation.
      * @param geometry2 The second geometry for the relation.
-     * @param relation The DE-9IM matrix relation encoded as a string.
+     * @param relation The Dimensionally Extended 9 Intersection Model (DE-9IM) matrix relation (encoded as a string) to test against the relationship of the two geometries.
      */
     relate(geometry1: Geometry, geometry2: Geometry, relation: string): any;
     /**
@@ -8197,7 +7884,7 @@ declare module "esri/geometry/geometryEngineAsync" {
     rotate(geometry: Geometry, angle: number, rotationOrigin?: Point): any;
     /**
      * Performs the simplify operation on the geometry which alters the given geometries to make their definitions topologically legal with respect to their geometry type.
-     * @param geometry Geometry
+     * @param geometry The geometry to be simplified.
      */
     simplify(geometry: Geometry): any;
     /**
@@ -8205,13 +7892,7 @@ declare module "esri/geometry/geometryEngineAsync" {
      * @param leftGeometry One of the Geometry instances in the XOR operation.
      * @param rightGeometry One of the Geometry instances in the XOR operation.
      */
-    symmetricDifference(leftGeometry: Geometry, rightGeometry: Geometry): any;
-    /**
-     * Creates the symmetric difference of two geometries.
-     * @param leftGeometry One of the Geometry instances in the XOR operation.
-     * @param rightGeometry One of the Geometry instances in the XOR operation.
-     */
-    symmetricDifference(leftGeometry: Geometry[], rightGeometry: Geometry): any;
+    symmetricDifference(leftGeometry: Geometry | Geometry[], rightGeometry: Geometry): any;
     /**
      * Indicates if one geometry touches another geometry.
      * @param geometry1 The geometry which may be touching another geometry.
@@ -8315,17 +7996,7 @@ declare module "esri/geometry/scaleUtils" {
      * Returns the value of one map unit for the given spatial reference (in meters).
      * @param sr The spatial reference represented as a SpatialReference class, Number, or String.
      */
-    getUnitValueForSR(sr: SpatialReference): number;
-    /**
-     * Returns the value of one map unit for the given spatial reference (in meters).
-     * @param sr The spatial reference represented as a SpatialReference class, Number, or String.
-     */
-    getUnitValueForSR(sr: number): number;
-    /**
-     * Returns the value of one map unit for the given spatial reference (in meters).
-     * @param sr The spatial reference represented as a SpatialReference class, Number, or String.
-     */
-    getUnitValueForSR(sr: string): number;
+    getUnitValueForSR(sr: SpatialReference | number | string): number;
   };
   export = scaleUtils;
 }
@@ -8341,8 +8012,8 @@ declare module "esri/geometry/screenUtils" {
     /**
      * Converts the geometry argument to map coordinates based on the extent, width, and height of the Map.
      * @param extent The current extent of the map in map coordinates.
-     * @param width The current width of the map in map units.
-     * @param height The current width of the map in map units.
+     * @param width The current width of the map in screen units.
+     * @param height The current height of the map in screen units.
      * @param screenGeometry The geometry to convert from screen to map units.
      */
     toMapGeometry(extent: Extent, width: number, height: number, screenGeometry: Geometry): Geometry;
@@ -8350,7 +8021,7 @@ declare module "esri/geometry/screenUtils" {
      * Converts and returns the argument screen point in map coordinates.
      * @param extent The current extent of the map in map coordinates.
      * @param width The current width of the map in screen units.
-     * @param height The current width of the map in screen units.
+     * @param height The current height of the map in screen units.
      * @param screenPoint The screenPoint to convert from screen to map units.
      */
     toMapPoint(extent: Extent, width: number, height: number, screenPoint: ScreenPoint): Point;
@@ -8358,7 +8029,7 @@ declare module "esri/geometry/screenUtils" {
      * Converts the geometry argument to screen coordinates based on the extent, width, and height of the Map.
      * @param extent The current extent of the map in map coordinates.
      * @param width The current width of the map in screen units.
-     * @param height The current width of the map in screen units.
+     * @param height The current height of the map in screen units.
      * @param mapGeometry The geometry to convert from map to screen units.
      */
     toScreenGeometry(extent: Extent, width: number, height: number, mapGeometry: Geometry): Geometry;
@@ -8366,7 +8037,7 @@ declare module "esri/geometry/screenUtils" {
      * Converts and returns the argument map point in screen coordinates.
      * @param extent The current extent of the map in map coordinates.
      * @param width The current width of the map in screen units.
-     * @param height The current width of the map in screen units.
+     * @param height The current height of the map in screen units.
      * @param mapPoint The point to convert from map to screen units.
      */
     toScreenPoint(extent: Extent, width: number, height: number, mapPoint: Point): ScreenPoint;
@@ -8385,25 +8056,7 @@ declare module "esri/geometry/webMercatorUtils" {
      * @param source An input of type SpatialReference or an object with spatialReference property such as Geometry or Map.
      * @param target The target spatial reference, of type SpatialReference or an object with spatialReference property such as Map.
      */
-    canProject(source: SpatialReference, target: any): boolean;
-    /**
-     * Returns true if the 'source' can be projected to 'target' by the project() function, or if the 'source' and 'target' is the same spatialReference.
-     * @param source An input of type SpatialReference or an object with spatialReference property such as Geometry or Map.
-     * @param target The target spatial reference, of type SpatialReference or an object with spatialReference property such as Map.
-     */
-    canProject(source: any, target: SpatialReference): boolean;
-    /**
-     * Returns true if the 'source' can be projected to 'target' by the project() function, or if the 'source' and 'target' is the same spatialReference.
-     * @param source An input of type SpatialReference or an object with spatialReference property such as Geometry or Map.
-     * @param target The target spatial reference, of type SpatialReference or an object with spatialReference property such as Map.
-     */
-    canProject(source: SpatialReference, target: SpatialReference): boolean;
-    /**
-     * Returns true if the 'source' can be projected to 'target' by the project() function, or if the 'source' and 'target' is the same spatialReference.
-     * @param source An input of type SpatialReference or an object with spatialReference property such as Geometry or Map.
-     * @param target The target spatial reference, of type SpatialReference or an object with spatialReference property such as Map.
-     */
-    canProject(source: any, target: any): boolean;
+    canProject(source: SpatialReference | any, target: SpatialReference | any): boolean;
     /**
      * Converts geometry from geographic units to Web Mercator units.
      * @param geometry The geometry to convert.
@@ -8420,13 +8073,7 @@ declare module "esri/geometry/webMercatorUtils" {
      * @param geometry An input geometry.
      * @param target The target spatial reference, of type SpatialReference or an object with spatialReference property such as Map.
      */
-    project(geometry: Geometry, target: SpatialReference): any;
-    /**
-     * Project the geometry clientside (if possible).
-     * @param geometry An input geometry.
-     * @param target The target spatial reference, of type SpatialReference or an object with spatialReference property such as Map.
-     */
-    project(geometry: Geometry, target: any): any;
+    project(geometry: Geometry, target: SpatialReference | any): any;
     /**
      * Converts geometry from Web Mercator units to geographic units.
      * @param geometry The geometry to convert.
@@ -8474,7 +8121,7 @@ declare module "esri/graphic" {
      */
     constructor(json: Object);
     /**
-     * Adds a new attribute or changes the value of an existing attribute on the graphic's node.
+     * Adds a new attribute or changes the value of an existing attribute on the graphic's DOM node.
      * @param name The name of the attribute.
      * @param value The value of the attribute.
      */
@@ -8578,12 +8225,7 @@ declare module "esri/lang" {
      * Strips HTML tags from a String or Object.
      * @param value Object or String to be stripped of HTML tags.
      */
-    stripTags(value: any): any;
-    /**
-     * Strips HTML tags from a String or Object.
-     * @param value Object or String to be stripped of HTML tags.
-     */
-    stripTags(value: string): any;
+    stripTags(value: any | string): any | string;
     /**
      * A wrapper around dojo.string.substitute that can also handle wildcard substitution.
      * @param data The data object used in the substitution.
@@ -8628,6 +8270,8 @@ declare module "esri/layers/ArcGISDynamicMapServiceLayer" {
     dpi: number;
     /** Array of DynamicLayerInfos used to change the layer ordering or redefine the map. */
     dynamicLayerInfos: DynamicLayerInfo[];
+    /** The geodatabase version. */
+    gdbVersion: string;
     /** When true, the layer has attribution data. */
     hasAttributionData: boolean;
     /** The output image type. */
@@ -9133,12 +8777,7 @@ declare module "esri/layers/CodedValueDomain" {
      * Returns the name of the coded-value associated with the specified code.
      * @param code The code in which you wish to search for the name.
      */
-    getName(code: number): string;
-    /**
-     * Returns the name of the coded-value associated with the specified code.
-     * @param code The code in which you wish to search for the name.
-     */
-    getName(code: string): string;
+    getName(code: number | string): string;
   }
   export = CodedValueDomain;
 }
@@ -9148,7 +8787,7 @@ declare module "esri/layers/DataAdapterFeatureLayer" {
   import FeatureLayer = require("esri/layers/FeatureLayer");
   import LocationProviderBase = require("esri/tasks/locationproviders/LocationProviderBase");
 
-  /** (Beta at v3.12) Display features using data that contains location information such as X and Y coordinates, Street address, place names etc using a DataAdapter object to retrieve the features and a LocationProvider to generate their geometries. */
+  /** (Currently in beta) Display features using data that contains location information such as X and Y coordinates, Street address, place names etc using a DataAdapter object to retrieve the features and a LocationProvider to generate their geometries. */
   class DataAdapterFeatureLayer extends FeatureLayer {
     /** The DataAdapter object points to data sources that contain non-spatial tables. */
     dataAdapter: any;
@@ -9357,6 +8996,8 @@ declare module "esri/layers/FeatureLayer" {
     fields: Field[];
     /** The full extent of the layer. */
     fullExtent: Extent;
+    /** The geodatabase version. */
+    gdbVersion: string;
     /** Geometry type of the features in the layer. */
     geometryType: string;
     /** The globalIdField for the layer. */
@@ -9842,7 +9483,7 @@ declare module "esri/layers/GraphicsLayer" {
   /** A layer that contains one or more Graphic features. */
   class GraphicsLayer extends Layer {
     /** List of attribute fields added as custom data attributes to graphics node. */
-    dataAttributes: any;
+    dataAttributes: string | string[];
     /** The array of graphics that make up the layer. */
     graphics: Graphic[];
     /** The info template for the layer. */
@@ -10212,21 +9853,7 @@ declare module "esri/layers/LabelLayer" {
      * @param renderer The renderer used to render text labels.
      * @param textExpression An expression determining what text and field(s) will be displayed as in labels.
      */
-    addFeatureLayer(featureLayer: FeatureLayer, renderer?: SimpleRenderer, textExpression?: any): void;
-    /**
-     * Adds reference to the feature layer which is labeled.
-     * @param featureLayer The feature layer to be added to the label layer.
-     * @param renderer The renderer used to render text labels.
-     * @param textExpression An expression determining what text and field(s) will be displayed as in labels.
-     */
-    addFeatureLayer(featureLayer: FeatureLayer, renderer?: UniqueValueRenderer, textExpression?: any): void;
-    /**
-     * Adds reference to the feature layer which is labeled.
-     * @param featureLayer The feature layer to be added to the label layer.
-     * @param renderer The renderer used to render text labels.
-     * @param textExpression An expression determining what text and field(s) will be displayed as in labels.
-     */
-    addFeatureLayer(featureLayer: FeatureLayer, renderer?: ClassBreaksRenderer, textExpression?: any): void;
+    addFeatureLayer(featureLayer: FeatureLayer, renderer?: SimpleRenderer | UniqueValueRenderer | ClassBreaksRenderer, textExpression?: any): void;
     /**
      * Returns reference to the feature layer which features will be labeled.
      * @param index Index of the referenced feature layer.
@@ -10440,6 +10067,8 @@ declare module "esri/layers/MosaicRule" {
     static OPERATION_MEAN: any;
     /** Takes the minimum value of all overlapping pixels. */
     static OPERATION_MIN: any;
+    /** Takes the sum of all overlapping pixels. */
+    static OPERATION_SUM: any;
     /** Indicates whether the sort should be ascending or not. */
     ascending: boolean;
     /** An array of raster Ids. */
@@ -10493,7 +10122,7 @@ declare module "esri/layers/OpenStreetMapLayer" {
 declare module "esri/layers/PixelBlock" {
   import esri = require("esri");
 
-  /** (Beta at v3.13) The PixelBlock is used to hold pixels. */
+  /** The PixelBlock is used to hold pixels. */
   class PixelBlock {
     /** Number of rows. */
     height: number;
@@ -10596,6 +10225,8 @@ declare module "esri/layers/RasterFunction" {
     functionArguments: any;
     /** The raster function name. */
     functionName: string;
+    /** Defines the output image's pixel type. */
+    outputPixelType: string;
     /** Variable name for the raster function. */
     variableName: string;
     /** Creates a new RasterFunction object. */
@@ -10615,7 +10246,7 @@ declare module "esri/layers/RasterLayer" {
   import esri = require("esri");
   import Layer = require("esri/layers/layer");
 
-  /** (Beta at v3.13) The RasterLayer is used to display image services. */
+  /** The RasterLayer is used to display image services. */
   class RasterLayer extends Layer {
     /**
      * Creates a new RasterLayer object.
@@ -10625,6 +10256,18 @@ declare module "esri/layers/RasterLayer" {
     constructor(url: string, options?: esri.RasterLayerOptions);
     /** Returns the context of the Canvas. */
     getContext(): any;
+    /**
+     * Sets the image format.
+     * @param imageFormat The image format to set.
+     * @param doNotRefresh Use true to avoid refreshing the layer; false to refresh it.
+     */
+    setImageFormat(imageFormat: string, doNotRefresh?: boolean): void;
+    /**
+     * Determines if the layer will update its content based on the map's current time extent.
+     * @param use Use true to update the layer's content based on the map's current time extent.
+     * @param doNotRefresh Use true to avoid refreshing the layer; false to refresh the layer.
+     */
+    setUseMapTime(use: boolean, doNotRefresh?: boolean): void;
   }
   export = RasterLayer;
 }
@@ -10633,6 +10276,7 @@ declare module "esri/layers/StreamLayer" {
   import esri = require("esri");
   import FeatureLayer = require("esri/layers/FeatureLayer");
   import Extent = require("esri/geometry/Extent");
+  import Graphic = require("esri/graphic");
   import Layer = require("esri/layers/layer");
 
   /** The stream layer extends the feature layer to add the ability to connect to a stream of data using HTML5 WebSockets. */
@@ -10671,6 +10315,8 @@ declare module "esri/layers/StreamLayer" {
     getDefinitionExpression(): string;
     /** Gets the spatial filter set on the layer. */
     getGeometryDefinition(): Extent;
+    /** Gets the latest observation for each track in the layer. */
+    getLatestObservations(): Graphic;
     /**
      * Gets the unique values of the graphics (in the StreamLayer) based on the `fieldName` parameter.
      * @param fieldName Field to get the unique values from.
@@ -10859,6 +10505,64 @@ declare module "esri/layers/TimeReference" {
   export = TimeReference;
 }
 
+declare module "esri/layers/WFSLayer" {
+  import esri = require("esri");
+  import Field = require("esri/layers/Field");
+  import Extent = require("esri/geometry/Extent");
+  import Graphic = require("esri/graphic");
+  import InfoTemplate = require("esri/InfoTemplate");
+  import Renderer = require("esri/renderers/Renderer");
+
+  /** (Currently in beta)A layer for OGC Web Feature Services (WFS). */
+  class WFSLayer {
+    /** An array of fields in the layer. */
+    fields: Field[];
+    /** The full extent of the layer. */
+    fullExtent: Extent;
+    /** The geometry type of the features in the layer. */
+    geometryType: string;
+    /** An array of features in the layer. */
+    graphics: Graphic[];
+    /** ID assigned to the layer. */
+    id: string;
+    /** The InfoTemplate for the layer. */
+    infoTemplate: InfoTemplate;
+    /** The renderer to apply to the layer. */
+    renderer: Renderer;
+    /** The visibility of the layer. */
+    visible: boolean;
+    /**
+     * Creates a new WFSLayer object
+     * @param options See options table below for full descriptions of the properties needed for this object.
+     */
+    constructor(options: esri.WFSLayerOptions);
+    /** Creates the getFeature parameter based on the version, nsLayerName, nsGeometryFieldName, mode, wkid, inverseFilter, maxFeatures constructor parameters. */
+    buildRequest(): string;
+    /**
+     * Gets the WFS layer capabilities.
+     * @param callback An array of WFS layers in JSON format.
+     */
+    getCapabilities(callback?: Function): void;
+    /** Performs the getFeature request. */
+    getFeature(): void;
+    /** Returns a JSON Object containing all of the WFS parameters. */
+    getWFSParameters(): any;
+    /** Redraws all the graphics in the layer. */
+    redraw(): void;
+    /** Refreshes the features in the WFS layer. */
+    refresh(): void;
+    /** Sets the default line symbol to be used if no renderer is specified. */
+    setLineSymbol(): void;
+    /** Sets the default point symbol to be used if no renderer is specified. */
+    setPointSymbol(): void;
+    /** Sets the default polygon symbol to be used if no renderer is specified. */
+    setPolygonSymbol(): void;
+    /** Sets the WFS parameters using the provided JSON Object. */
+    setWFSParameters(): void;
+  }
+  export = WFSLayer;
+}
+
 declare module "esri/layers/WMSLayer" {
   import esri = require("esri");
   import DynamicMapServiceLayer = require("esri/layers/DynamicMapServiceLayer");
@@ -10868,6 +10572,8 @@ declare module "esri/layers/WMSLayer" {
 
   /** A layer for OGC Web Map Services (WMS). */
   class WMSLayer extends DynamicMapServiceLayer {
+    /** All bounding boxes defined for the layer. */
+    allExtents: Extent[];
     /** Copyright of the WMS service. */
     copyright: string;
     /** Description of the WMS service. */
@@ -10886,6 +10592,8 @@ declare module "esri/layers/WMSLayer" {
     maxWidth: number;
     /** Spatial reference of the WMS service. */
     spatialReference: SpatialReference;
+    /** An array of WKIDs of all spatial references defined for the layer. */
+    spatialReferences: number[];
     /** Title of the WMS service. */
     title: string;
     /** Version of the WMS service. */
@@ -10920,6 +10628,8 @@ declare module "esri/layers/WMSLayerInfo" {
 
   /** The WMSLayerInfo class defines and provides information about layers in a WMS service. */
   class WMSLayerInfo {
+    /** All bounding boxes defined for the layer. */
+    allExtents: Extent[];
     /** The layer description defines the value of the Abstract capabilities property. */
     description: string;
     /** The layer extent. */
@@ -10928,6 +10638,10 @@ declare module "esri/layers/WMSLayerInfo" {
     legendURL: string;
     /** The layer  name. */
     name: string;
+    /** An array of WKIDs of all spatial references defined for the layer. */
+    spatialReferences: number[];
+    /** WMSLayerInfos of the layer's sub layers. */
+    subLayers: WMSLayerInfo[];
     /** The layer title. */
     title: string;
     /**
@@ -11246,7 +10960,7 @@ declare module "esri/map" {
      * @param divId Container id for the referencing map.
      * @param options Optional parameters.
      */
-    constructor(divId: string, options?: esri.MapOptions);
+    constructor(divId: Node | string, options?: esri.MapOptions);
     /**
      * Adds an Esri Layer to the map.
      * @param layer Layer to be added to the map.
@@ -11474,7 +11188,7 @@ declare module "esri/map" {
     /** Fires when a map layer resumes drawing. */
     on(type: "layer-resume", listener: (event: { layer: Layer; target: Map }) => void): esri.Handle;
     /** Fires after all layers are added to the map using the map.addLayers method. */
-    on(type: "layers-add-result", listener: (event: { layers: Layer[]; target: Map }) => void): esri.Handle;
+    on(type: "layers-add-result", listener: (event: { layers: any[]; target: Map }) => void): esri.Handle;
     /** Fires after all the layers have been removed. */
     on(type: "layers-removed", listener: (event: { target: Map }) => void): esri.Handle;
     /** Fires when all the layers have been reordered. */
@@ -11530,7 +11244,495 @@ declare module "esri/map" {
   export = Map;
 }
 
+declare module "esri/opsdashboard/DataSourceProxy" {
+  import Field = require("esri/layers/Field");
+  import FeatureType = require("esri/layers/FeatureType");
+  import Query = require("esri/tasks/query");
+  import Graphic = require("esri/graphic");
+
+  /** DataSourceProxy is a proxy class that represents a operations dashboard data source. */
+  class DataSourceProxy {
+    /** Read-only: The name of the display field. */
+    displayFieldName: string;
+    /** Read-only: The collection of fields. */
+    fields: Field[];
+    /** The geometry type. */
+    geometryType: string;
+    /** Read-only: The id of the data source. */
+    id: string;
+    /** Read-only: Indicates if the last query failed and the data source is in a broken state. */
+    isBroken: boolean;
+    /** Read-only: The name of the data source. */
+    name: string;
+    /** Read-only: The name of the object id field. */
+    objectIdFieldName: string;
+    /** Read-only: Indicates if the data source supports selections. */
+    supportsSelection: boolean;
+    /** Read-only: The name of the type id field. */
+    typeIdFieldName: string;
+    /** Read-only: The collection of feature types. */
+    types: FeatureType[];
+    /** Clear the selection. */
+    clearSelection(): void;
+    /**
+     * Executes a query and get the result.
+     * @param query The query object to apply.
+     */
+    executeQuery(query: Query): any;
+    /** Retrieve the associated data source that supports selection. */
+    getAssociatedSelectionDataSourceProxy(): any;
+    /** Get the associated popupInfo for the data source if any available. */
+    getPopupInfo(): any;
+    /** Get the associated render object for the data source if any available. */
+    getRenderer(): any;
+    /**
+     * Get the feature type from a feature coming from the data source.
+     * @param feature A feature coming from the data source
+     */
+    getTypeFromFeature(feature: Graphic): number;
+    /**
+     * Returns the value corresponding to a field name from a feature coming from the data source.
+     * @param feature A feature coming from the data source
+     * @param fieldName The name of the field for which the value should be returned.
+     */
+    getValueFromFeature(feature: Graphic, fieldName: string): number | string;
+    /**
+     * Select features in the data source using a query.
+     * @param query The query object to apply
+     */
+    selectFeatures(query: Query): void;
+    /**
+     * Select features in the data source using a collection of object ids.
+     * @param objectIds The collection of object ids of the features to select.
+     */
+    selectFeaturesByObjectIds(objectIds: string[]): void;
+  }
+  export = DataSourceProxy;
+}
+
+declare module "esri/opsdashboard/ExtensionBase" {
+  import esri = require("esri");
+  import MapWidgetProxy = require("esri/opsdashboard/MapWidgetProxy");
+
+  /** ExtensionBase is a base class used by all the extension proxies. */
+  class ExtensionBase {
+    /** "circle" */
+    static CIRCLE: any;
+    /** "extent" */
+    static EXTENT: any;
+    /** "freehandpolygon" */
+    static FREEHAND_POLYGON: any;
+    /** "freehandpolyline" */
+    static FREEHAND_POLYLINE: any;
+    /** "line" */
+    static LINE: any;
+    /** "point" */
+    static POINT: any;
+    /** "polygon" */
+    static POLYGON: any;
+    /** "polyline" */
+    static POLYLINE: any;
+    /** Read-only: Indicates if the host application is the Windows Operations Dashboard. */
+    isNative: boolean;
+    /** Get the collection of data sources from the host application. */
+    getDataSourceProxies(): any;
+    /** Get the collection of data sources from the host application. */
+    getDataSourceProxies(): any;
+    /** Get the data source corresponding to the data source id from the host application. */
+    getDataSourceProxy(): any;
+    /** Get the collection of map widgets from the host application. */
+    getMapWidgetProxies(): any;
+    /**
+     * Get the map widget corresponding to the map widget id from the host application.
+     * @param mapWidgetId A map widget id
+     */
+    getMapWidgetProxy(mapWidgetId: string): any;
+    /**
+     * Called when an error occurred during the initialization process with the host application.
+     * @param err The error that occurred.
+     */
+    hostInitializationError(err: Error): void;
+    /** Called by the host application when the relationship has been established with the extension. */
+    hostReady(): void;
+    /**
+     * Called by the host application when a map widget has been added to the current view.
+     * @param mapWidgetProxy A map widget id.
+     */
+    mapWidgetAdded(mapWidgetProxy: MapWidgetProxy): void;
+    /**
+     * Called by the host application when a map widget has been removed from the current view.
+     * @param mapWidgetId A map widget id.
+     */
+    mapWidgetRemoved(mapWidgetId: string): void;
+    /** Event indicating that a new data source has been added into the host operation view. */
+    on(type: "data-source-added", listener: (event: { dataSourceProxy: any; target: ExtensionBase }) => void): esri.Handle;
+    /** Event indicating that a data source has been removed from the host operation view. */
+    on(type: "data-source-removed", listener: (event: { dataSourceId: string; target: ExtensionBase }) => void): esri.Handle;
+    /** Event indicating that the initialization process was successful. */
+    on(type: "host-ready", listener: (event: { target: ExtensionBase }) => void): esri.Handle;
+    /** Event indicating that the initialization process encountered an error. */
+    on(type: "initialization-error", listener: (event: { error: Error; target: ExtensionBase }) => void): esri.Handle;
+    /** Event indicating that a new map widget has been added into the host operation view. */
+    on(type: "map-widget-added", listener: (event: { mapWidgetProxy: MapWidgetProxy; target: ExtensionBase }) => void): esri.Handle;
+    /** Event indicating that a map widget has been removed from the host operation view. */
+    on(type: "map-widget-removed", listener: (event: { mapWidgetId: string; target: ExtensionBase }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = ExtensionBase;
+}
+
+declare module "esri/opsdashboard/ExtensionConfigurationBase" {
+  import ExtensionBase = require("esri/opsdashboard/ExtensionBase");
+
+  /** ExtensionConfigurationBase is a base class used by all the extension configuration proxies. */
+  class ExtensionConfigurationBase extends ExtensionBase {
+    /** Indicates that the configuration is ready to be persisted or not. */
+    readyToPersistConfig: boolean;
+  }
+  export = ExtensionConfigurationBase;
+}
+
+declare module "esri/opsdashboard/FeatureActionConfigurationProxy" {
+  import ExtensionConfigurationBase = require("esri/opsdashboard/ExtensionConfigurationBase");
+
+  /** FeatureActionConfigurationProxy is a class used to provide the configuration user experience for an operations dashboard extension feature action. */
+  class FeatureActionConfigurationProxy extends ExtensionConfigurationBase {
+  }
+  export = FeatureActionConfigurationProxy;
+}
+
+declare module "esri/opsdashboard/FeatureActionFeatures" {
+  import DataSourceProxy = require("esri/opsdashboard/DataSourceProxy");
+  import Graphic = require("esri/graphic");
+
+  /** FeatureActionFeatures is a specialized collection of features used by WidgetProxy to hold the collection of features for the associated feature actions. */
+  class FeatureActionFeatures {
+    /** The DataSourceProxy from which the collection of features belongs to. */
+    dataSourceProxy: DataSourceProxy;
+    /**
+     * Add a feature to the host collection.
+     * @param featureOrObjectId
+     */
+    addFeature(featureOrObjectId: Graphic | number): void;
+    /**
+     * Add a collection of features or collection of object id in the host collection.
+     * @param featuresOrObjectIds
+     */
+    addFeatures(featuresOrObjectIds: Graphic[] | number[]): void;
+    /** Remove all the features from the host collection. */
+    clear(): void;
+    /**
+     * Test if a feature exists in the host collection.
+     * @param featureOrObjectId Feature to test existance for.
+     */
+    contains(featureOrObjectId: Graphic | number): boolean;
+    /**
+     * Returns the index of a feature in the host collection.
+     * @param featureOrObjectId Feature to return index from.
+     */
+    indexOf(featureOrObjectId: Graphic | number): number;
+    /**
+     * Remove a collection of features from the host collection.
+     * @param featureOrObjectId Feature to remove.
+     */
+    removeFeature(featureOrObjectId: Graphic | number): void;
+    /**
+     * Remove a feature from the host collection.
+     * @param featuresOrObjectIds Features to remove.
+     */
+    removeFeatures(featuresOrObjectIds: Graphic[] | number[]): void;
+  }
+  export = FeatureActionFeatures;
+}
+
+declare module "esri/opsdashboard/GraphicsLayerProxy" {
+  import Renderer = require("esri/renderers/Renderer");
+  import Graphic = require("esri/graphic");
+
+  /** GraphicsLayerProxy is a proxy class that represents a graphics layer in a map widget in the host application. */
+  class GraphicsLayerProxy {
+    /** Read-only: The current host graphics layer maximum visible scale. */
+    maxScale: number;
+    /** Read-only: The current host graphics layer minimum visible scale. */
+    minScale: number;
+    /** Read-only: The current host graphics layer opacity ratio. */
+    opacity: number;
+    /** The current renderer used by the host graphics layer. */
+    renderer: Renderer;
+    /** Read-only: The current host graphics layer visibility. */
+    visible: boolean;
+    /**
+     * Update a graphic in the host graphics layer with a new version.
+     * @param graphic The graphic to update in the host graphics layer.
+     */
+    addOrUpdateGraphic(graphic: Graphic): void;
+    /**
+     * Update a graphic in the host graphics layer with a new version.
+     * @param graphic The graphic to update in the host graphics layer.
+     */
+    addOrUpdateGraphics(graphic: Graphic): void;
+    /** Removes all the graphics from the host graphics layer. */
+    clear(): void;
+    /**
+     * Removes from the host graphics layer a graphic.
+     * @param graphic The graphic to remove from the host graphics layer.
+     */
+    removeGraphic(graphic: Graphic): void;
+    /**
+     * Sets the host graphics layer maximum scale.
+     * @param maxScale
+     */
+    setMaxScale(maxScale: number): void;
+    /**
+     * Sets the host graphics layer minimum scale.
+     * @param minScale
+     */
+    setMinScale(minScale: number): void;
+    /**
+     * Sets the host graphics layer opacity ratio.
+     * @param opacity An opacity ratio between 0 and 1.
+     */
+    setOpacity(opacity: number): void;
+    /**
+     * Sets the host graphics layer renderer.
+     * @param renderer Since the Windows operations dashboard is built using ArcGIS Runtime SDK for WPF, only renderers supported by the WPF should be used, such as SimpleRenderer, UniqueValueRenderer and ClassBreaksRenderer.
+     */
+    setRenderer(renderer: Renderer): void;
+    /**
+     * Set the visibility of the host graphics layer.
+     * @param visibility The new visibility value.
+     */
+    setVisibility(visibility: boolean): void;
+  }
+  export = GraphicsLayerProxy;
+}
+
+declare module "esri/opsdashboard/MapToolConfigurationProxy" {
+  import ExtensionConfigurationBase = require("esri/opsdashboard/ExtensionConfigurationBase");
+
+  /** MapToolConfigurationProxy is a class used to provide the configuration user experience for an operations dashboard extension map tool. */
+  class MapToolConfigurationProxy extends ExtensionConfigurationBase {
+  }
+  export = MapToolConfigurationProxy;
+}
+
+declare module "esri/opsdashboard/MapToolProxy" {
+  import esri = require("esri");
+  import MapWidgetProxy = require("esri/opsdashboard/MapWidgetProxy");
+  import Geometry = require("esri/geometry/Geometry");
+
+  /** MapToolProxy is a class used to define an operations dashboard extension map tool. */
+  class MapToolProxy {
+    /** Read-only: The available size for the map tool user experience on the host map widget. */
+    availableDisplaySize: number;
+    /** Read-only: The map tool user experience size in pixels. */
+    displaySize: any;
+    /** Read-only: The map widget that is hosting the map tool user experience. */
+    mapWidgetProxy: MapWidgetProxy;
+    /** Read-only: The previous map tool user experience state that was passed the last time the map tool was deactivated. */
+    previousState: any;
+    /**
+     * Activates a drawing activity on the host map widget.
+     * @param options Drawing options.
+     */
+    activateMapDrawing(options: any): void;
+    /**
+     * Called by the host application when the available size for the map tool user experience has changed (user resizes the application or the map widget).
+     * @param availableSize The size available on the host map widget for the map tool user experience.
+     */
+    availableDisplaySizeChanged(availableSize: any): void;
+    /** Deactivates the drawing activity on the host map widget. */
+    deactivateMapDrawing(): void;
+    /**
+     * Deactivate the map tool user experience.
+     * @param state A JSON object that needs to be persisted in the host until the next activation of the map tool user experience.
+     */
+    deactivateMapTool(state: any): void;
+    /**
+     * Called by the host application when the user has completed the drawing activity on the map.
+     * @param geometry The geometry captured by the user during the drawing activity.
+     */
+    mapDrawComplete(geometry: Geometry): void;
+    /**
+     * Change the size of the user experience area in the host application for this map tool user experience.
+     * @param size The new size for the user experience.
+     */
+    setDisplaySize(size: any): any;
+    /** Event indicating that the available display size for the map tool user experience has changed. */
+    on(type: "available-display-size-changed", listener: (event: { size: any; target: MapToolProxy }) => void): esri.Handle;
+    /** Event indicating that a previously activate drawing activity has been completed by the user. */
+    on(type: "draw-complete", listener: (event: { geometry: Geometry; target: MapToolProxy }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = MapToolProxy;
+}
+
+declare module "esri/opsdashboard/MapWidgetProxy" {
+  import esri = require("esri");
+  import SpatialReference = require("esri/SpatialReference");
+  import GraphicsLayerProxy = require("esri/opsdashboard/GraphicsLayerProxy");
+  import Point = require("esri/geometry/Point");
+  import Extent = require("esri/geometry/Extent");
+
+  /** MapWidgetProxy is a proxy class that represents a operations dashboard map widget. */
+  class MapWidgetProxy {
+    /** Read-only: The map id. */
+    id: string;
+    /** Read-only: The name of the map. */
+    name: string;
+    /** Read-only: The spatial reference of the map. */
+    spatialReference: SpatialReference;
+    /**
+     * Creates a graphics layer in the host map.
+     * @param options The options for the new graphics layer
+     */
+    createGraphicsLayerProxy(options?: any): any;
+    /**
+     * Destroys in the host map a host graphics layer.
+     * @param graphicsLayerProxy The host graphics layer to destroy.
+     */
+    destroyGraphicsLayerProxy(graphicsLayerProxy: GraphicsLayerProxy): void;
+    /** Gets the current host map extent. */
+    getMapExtent(): any;
+    /** Called by the host application when the extent of the host map has changed. */
+    mapExtentChanged(): void;
+    /**
+     * Pans the map to a new location.
+     * @param mapPoint A new location with the same spatial reference as the host map.
+     */
+    panTo(mapPoint: Point): void;
+    /**
+     * Sets an extent on the host map extent.
+     * @param extent A new map extent.
+     */
+    setExtent(extent: Extent): void;
+    /** Subscribes to the host map events. */
+    subscribeToMapEvents(): void;
+    /** Unsubscribes from the host map events. */
+    unsubscribeFromMapEvents(): void;
+    /** Event indicating that the host map extent has changed. */
+    on(type: "map-extent-change", listener: (event: { extent: Extent; target: MapWidgetProxy }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = MapWidgetProxy;
+}
+
+declare module "esri/opsdashboard/WidgetConfigurationProxy" {
+  import esri = require("esri");
+  import ExtensionConfigurationBase = require("esri/opsdashboard/ExtensionConfigurationBase");
+  import DataSourceProxy = require("esri/opsdashboard/DataSourceProxy");
+  import MapWidgetProxy = require("esri/opsdashboard/MapWidgetProxy");
+
+  /** WidgetConfigurationProxy is a class used to provide the configuration user experience for an operations dashboard extension widget. */
+  class WidgetConfigurationProxy extends ExtensionConfigurationBase {
+    /** The object that will store the widget configuration. */
+    config: any;
+    /**
+     * Called by the host application when the user has changed the selected data source in the data source selector.
+     * @param dataSourceProxy The selected data source.
+     * @param dataSourceConfig The associated data source config.
+     */
+    dataSourceSelectionChanged(dataSourceProxy: DataSourceProxy, dataSourceConfig: any): void;
+    /**
+     * Get the data source config for a data source.
+     * @param dataSourceProxyOrDataSourceId A data source or a data source id.
+     */
+    getDataSourceConfig(dataSourceProxyOrDataSourceId: DataSourceProxy | string): any;
+    /**
+     * Called by the host application when the user has changed the slected map widget in the map widget selector.
+     * @param mapWidgetProxy The selected map widget.
+     */
+    mapWidgetSelectionChanged(mapWidgetProxy: MapWidgetProxy): void;
+    /** Event indicating the user has changed the selected data source for the configuration. */
+    on(type: "data-source-selection-changed", listener: (event: { dataSourceConfig: any; dataSourceProxy: DataSourceProxy; target: WidgetConfigurationProxy }) => void): esri.Handle;
+    /** Event indicating the user has changed the selected map widget for the configuration. */
+    on(type: "map-widget-selection-changed", listener: (event: { mapWidgetProxy: MapWidgetProxy; target: WidgetConfigurationProxy }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = WidgetConfigurationProxy;
+}
+
+declare module "esri/opsdashboard/WidgetProxy" {
+  import esri = require("esri");
+  import ExtensionBase = require("esri/opsdashboard/ExtensionBase");
+  import FeatureActionFeatures = require("esri/opsdashboard/FeatureActionFeatures");
+  import MapWidgetProxy = require("esri/opsdashboard/MapWidgetProxy");
+  import DataSourceProxy = require("esri/opsdashboard/DataSourceProxy");
+  import Graphic = require("esri/graphic");
+  import Geometry = require("esri/geometry/Geometry");
+
+  /** WidgetProxy is a class used to define an operations dashboard extension widget. */
+  class WidgetProxy extends ExtensionBase {
+    /** Read-only: If the widget was configured to consume data sources, the dataSourceConfig array will hold a collection of dataSourceConfig objects. */
+    dataSourceConfigs: any[];
+    /** Read-only: The host collection of features used by the widget feature actions. */
+    featureActionFeatures: FeatureActionFeatures;
+    /** Read-only: Indicates if the widget has a default feature action associated with. */
+    hasDefaultFeatureAction: boolean;
+    /** Read-only: Indicates if the widget has feature actions associated with it. */
+    hasFeatureActions: boolean;
+    /**
+     * Activate a drawing toolbar on a map widget.
+     * @param options
+     * @param mapWidgetProxy The target map widget.
+     */
+    activateDrawingToolbar(options?: any, mapWidgetProxy?: MapWidgetProxy): any;
+    /**
+     * Called by the host application when a data source state has expired.
+     * @param dataSourceProxy
+     * @param associated dataSourceConfig
+     */
+    dataSourceExpired(dataSourceProxy: DataSourceProxy, associated?: any): void;
+    /**
+     * Deactivate the drawing toolbar on the map widget.
+     * @param mapWidgetProxy The target map widget.
+     */
+    deactivateDrawingToolbar(mapWidgetProxy?: MapWidgetProxy): void;
+    /** Called by the host application when the user has canceled the drawing activity. */
+    drawingToolbarDeactivated(): void;
+    /**
+     * Execute the default feature action.
+     * @param featuresOrObjectIds
+     */
+    executeDefaultFeatureAction(featuresOrObjectIds: Graphic[] | number[]): void;
+    /**
+     * Get the data source config for a data source.
+     * @param dataSourceProxyOrDataSourceId A data source or a data source id.
+     */
+    getDataSourceConfig(dataSourceProxyOrDataSourceId: DataSourceProxy | string): any;
+    /**
+     * Called by the host application when the user has finished the drawing activity.
+     * @param geometry
+     */
+    toolbarDrawComplete(geometry: Geometry): void;
+    /** Event indicating that a data source validity has expired. */
+    on(type: "data-source-expired", listener: (event: { dataSourceConfig: any; dataSourceProxy: DataSourceProxy; target: WidgetProxy }) => void): esri.Handle;
+    /** Event indicating that the user has deactivated the previously activated drawing toolbar on the map widget. */
+    on(type: "drawing-toolbar-deactivated", listener: (event: { target: WidgetProxy }) => void): esri.Handle;
+    /** Event indicating the user has finished a drawing activity with the previously activated drawing toolbar. */
+    on(type: "toolbar-draw-complete", listener: (event: { geometry: Geometry; target: WidgetProxy }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = WidgetProxy;
+}
+
+declare module "esri/opsdashboard/featureActionProxy" {
+  import esri = require("esri");
+  import ExtensionBase = require("esri/opsdashboard/ExtensionBase");
+  import DataSourceProxy = require("esri/opsdashboard/DataSourceProxy");
+  import FeatureSet = require("esri/tasks/FeatureSet");
+
+  /** featureActionProxy is a singleton object that allows implementing an operations dashboard Feature Action extension. */
+  class featureActionProxy extends ExtensionBase {
+    /** Event raised when the feature action should execute for a set of features. */
+    on(type: "execute", listener: (event: { config: any; dataSourceProxy: DataSourceProxy; featureSet: FeatureSet; target: featureActionProxy }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = featureActionProxy;
+}
+
 declare module "esri/plugins/FeatureLayerStatistics" {
+  import esri = require("esri");
   import FeatureLayer = require("esri/layers/FeatureLayer");
 
   /** This module defines a class and a feature layer plugin that is used to calculate feature layer statistics. */
@@ -11539,7 +11741,7 @@ declare module "esri/plugins/FeatureLayerStatistics" {
      * Creates a new object that is used to calculate statistics about features in a feature layer.
      * @param params Parameters that define the FeatureLayerStatistics.
      */
-    constructor(params: any);
+    constructor(params: esri.FeatureLayerStatisticsOptions);
     /**
      * This function is called internally when the plugin is added to a feature layer.
      * @param layer The target FeatureLayer that have the plugin added.
@@ -11601,13 +11803,7 @@ declare module "esri/plugins/spatialIndex" {
      * @param target The map or feature layer to which the index is connected.
      * @param options See the object specifications table below for the structure of the index  options  object.
      */
-    add(target: Map, options?: any): void;
-    /**
-     * Adds an index property to the target instance.
-     * @param target The map or feature layer to which the index is connected.
-     * @param options See the object specifications table below for the structure of the index  options  object.
-     */
-    add(target: FeatureLayer, options?: any): void;
+    add(target: Map | FeatureLayer, options?: any): void;
     /** Removes the index plugin. */
     remove(): void;
   };
@@ -11686,28 +11882,7 @@ declare module "esri/process/SpatialIndex" {
      * @param layerId ID assigned to the layer.
      * @param getRects Whether to get the rectangle object with data in leaf, otherwise just get the stored data.
      */
-    intersects(test: Point, layerId?: string, getRects?: boolean): any;
-    /**
-     * Searches index for items which intersect the test object.
-     * @param test The point or area to intersect.
-     * @param layerId ID assigned to the layer.
-     * @param getRects Whether to get the rectangle object with data in leaf, otherwise just get the stored data.
-     */
-    intersects(test: Graphic, layerId?: string, getRects?: boolean): any;
-    /**
-     * Searches index for items which intersect the test object.
-     * @param test The point or area to intersect.
-     * @param layerId ID assigned to the layer.
-     * @param getRects Whether to get the rectangle object with data in leaf, otherwise just get the stored data.
-     */
-    intersects(test: Extent, layerId?: string, getRects?: boolean): any;
-    /**
-     * Searches index for items which intersect the test object.
-     * @param test The point or area to intersect.
-     * @param layerId ID assigned to the layer.
-     * @param getRects Whether to get the rectangle object with data in leaf, otherwise just get the stored data.
-     */
-    intersects(test: number[], layerId?: string, getRects?: boolean): any;
+    intersects(test: Point | Graphic | Extent | number[], layerId?: string, getRects?: boolean): any;
     /**
      * Searches for the nearest point(s) to the passed point within the specified criteria.
      * @param criteria See the object specifications table below for the structure of the  criteria  object.
@@ -11718,6 +11893,56 @@ declare module "esri/process/SpatialIndex" {
   export = SpatialIndex;
 }
 
+declare module "esri/renderers/BlendRenderer" {
+  import esri = require("esri");
+  import Symbol = require("esri/symbols/Symbol");
+
+  /** (Currently in beta) BlendRenderer allows you to easily identify a predominant attribute among two or more competing attributes in a feature. */
+  class BlendRenderer {
+    /** This determines how colors are blended together. */
+    blendMode: string;
+    /** An array of objects to blend containing the field name and color to use. */
+    fields: any[];
+    /** The field to normalize. */
+    normalizationField: string;
+    /** An array of objects which determines opacity. */
+    opacityStops: any[];
+    /** The BlendRenderer applies to the color of the symbol. */
+    symbol: Symbol;
+    /**
+     * Creates a new BlendRenderer object.
+     * @param params Required and optional parameters.
+     */
+    constructor(params?: esri.BlendRendererOptions);
+    /**
+     * Sets the mode that determines how colors are blended together.
+     * @param blendMode The blend mode used to determine how colors are blended together.
+     */
+    setBlendMode(blendMode: string): void;
+    /**
+     * Sets an array of objects to blend containing the field name and color to use.
+     * @param fields An array of objects to blend containing the field name and color to use.
+     */
+    setFields(fields: any[]): void;
+    /**
+     * Sets the field to normalize
+     * @param field The field to normalize.
+     */
+    setNormalizationField(field: string): void;
+    /**
+     * Sets an array of objects which determines opacity.
+     * @param opacityStops Sets an array of objects which determines opacity.
+     */
+    setOpacityStops(opacityStops: any[]): void;
+    /**
+     * Sets the symbol to blend.
+     * @param symbol The symbol to blend.
+     */
+    setSymbol(symbol: Symbol): void;
+  }
+  export = BlendRenderer;
+}
+
 declare module "esri/renderers/ClassBreaksRenderer" {
   import Renderer = require("esri/renderers/Renderer");
   import FillSymbol = require("esri/symbols/FillSymbol");
@@ -11751,13 +11976,7 @@ declare module "esri/renderers/ClassBreaksRenderer" {
      * @param defaultSymbol Default symbol for the renderer.
      * @param attributeField Specify either the attribute field the renderer uses to match values or starting at version 3.3, a function that returns a value to be compared against class breaks.
      */
-    constructor(defaultSymbol: Symbol, attributeField: string);
-    /**
-     * Creates a new ClassBreaksRenderer object.
-     * @param defaultSymbol Default symbol for the renderer.
-     * @param attributeField Specify either the attribute field the renderer uses to match values or starting at version 3.3, a function that returns a value to be compared against class breaks.
-     */
-    constructor(defaultSymbol: Symbol, attributeField: Function);
+    constructor(defaultSymbol: Symbol, attributeField: string | Function);
     /**
      * Creates a new ClassBreaksRenderer.
      * @param json JSON object representing the ClassBreaksRenderer.
@@ -11769,14 +11988,7 @@ declare module "esri/renderers/ClassBreaksRenderer" {
      * @param maxValue Maximum value in the break.
      * @param symbol Symbol used for the break.
      */
-    addBreak(minValueOrInfo: number, maxValue?: number, symbol?: Symbol): void;
-    /**
-     * Adds a class break.
-     * @param minValueOrInfo The value can be provided as individual arguments or as an info object.
-     * @param maxValue Maximum value in the break.
-     * @param symbol Symbol used for the break.
-     */
-    addBreak(minValueOrInfo: any, maxValue?: number, symbol?: Symbol): void;
+    addBreak(minValueOrInfo: number | any, maxValue?: number, symbol?: Symbol): void;
     /** Remove all existing class breaks for this renderer. */
     clearBreaks(): void;
     /**
@@ -11927,6 +12139,8 @@ declare module "esri/renderers/Renderer" {
     rotationInfo: any;
     /** Defines the size of the symbol where feature size is proportional to data value. */
     sizeInfo: any;
+    /** This property allows you to define how to render values in a layer. */
+    visualVariables: any[];
     /**
      * Gets the color for the Graphic.
      * @param graphic Graphic to get color from.
@@ -11952,6 +12166,13 @@ declare module "esri/renderers/Renderer" {
      * @param graphic Graphic to symbolize.
      */
     getSymbol(graphic: Graphic): Symbol;
+    /**
+     * Returns the visual variable of the specified type.
+     * @param type The type of visual variable desired.
+     */
+    getVisualVariablesForType(type: string): any;
+    /** Indicates if the renderer has defined visualVariables. */
+    hasVisualVariables(): boolean;
     /**
      * Sets the colorInfo property.
      * @param info An info object that defines the color.
@@ -11969,6 +12190,11 @@ declare module "esri/renderers/Renderer" {
     setRotationInfo(info: any): Renderer;
     /** Set size info of the renderer to modify the symbol size based on data value. */
     setSizeInfo(): Renderer;
+    /**
+     * Sets the renderer with the specified  visualVariables.
+     * @param visualParams The specified  visualVariables.
+     */
+    setVisualVariables(visualParams: any[]): void;
     /** Converts object to its ArcGIS Server JSON representation. */
     toJson(): any;
   }
@@ -12088,6 +12314,7 @@ declare module "esri/renderers/TemporalRenderer" {
 }
 
 declare module "esri/renderers/TimeClassBreaksAger" {
+  import esri = require("esri");
   import SymbolAger = require("esri/renderers/SymbolAger");
   import Symbol = require("esri/symbols/Symbol");
   import Graphic = require("esri/graphic");
@@ -12112,10 +12339,10 @@ declare module "esri/renderers/TimeClassBreaksAger" {
     static UNIT_YEARS: any;
     /**
      * Creates a new TimeClassBreaksAgerObject with the specified time breaks inforamtion.
-     * @param infos Each element in the array is an object that describes the class breaks information.
+     * @param params Each element in the array is an object that describes the class breaks information.
      * @param timeUnits The unit in which the minimum and maximum break values are measured.
      */
-    constructor(infos: any[], timeUnits?: string);
+    constructor(params: esri.TimeClassBreaksAgerOptions[], timeUnits?: string);
     /**
      * Calculates aging and returns the appropriate symbol.
      * @param symbol The symbol to age.
@@ -12182,16 +12409,7 @@ declare module "esri/renderers/UniqueValueRenderer" {
      * @param attributeField3 If needed, specify an additional attribute field the renderer uses to match values.
      * @param fieldDelimeter String inserted between the values of different fields.
      */
-    constructor(defaultSymbol: Symbol, attributeField: string, attributeField2?: string, attributeField3?: string, fieldDelimeter?: string);
-    /**
-     * Creates a new UniqueValueRenderer object.
-     * @param defaultSymbol Default symbol for the renderer.
-     * @param attributeField Specify either the attribute field the renderer uses to match values or starting at version 3.3, a function that returns a value to be compared against unique values.
-     * @param attributeField2 If needed, specify an additional attribute field the renderer uses to match values.
-     * @param attributeField3 If needed, specify an additional attribute field the renderer uses to match values.
-     * @param fieldDelimeter String inserted between the values of different fields.
-     */
-    constructor(defaultSymbol: Symbol, attributeField: Function, attributeField2?: string, attributeField3?: string, fieldDelimeter?: string);
+    constructor(defaultSymbol: Symbol, attributeField: string | Function, attributeField2?: string, attributeField3?: string, fieldDelimeter?: string);
     /**
      * Creates a new Unique Value Renderer.
      * @param json JSON object representing the UniqueValueRenderer.
@@ -12202,13 +12420,7 @@ declare module "esri/renderers/UniqueValueRenderer" {
      * @param valueOrInfo Value to match with.
      * @param symbol Symbol used for the value.
      */
-    addValue(valueOrInfo: string, symbol?: Symbol): void;
-    /**
-     * Adds a unique value and symbol.
-     * @param valueOrInfo Value to match with.
-     * @param symbol Symbol used for the value.
-     */
-    addValue(valueOrInfo: any, symbol?: Symbol): void;
+    addValue(valueOrInfo: string | any, symbol?: Symbol): void;
     /**
      * Returns rendering and legend information (as defined by the renderer) associated with the given graphic.
      * @param graphic The graphic whose rendering and legend information will be returned.
@@ -12301,6 +12513,11 @@ declare module "esri/renderers/smartMapping" {
      * @param params See the object specifications table below for the structure of the params object.
      */
     createHeatmapRenderer(params: any): any;
+    /**
+     * Creates an object that describes how opacity of features is calculated.
+     * @param params See the object specifications table below for the structure of the params object.
+     */
+    createOpacityInfo(params: any): any;
     /**
      * Creates a renderer for visualizing features by varying their size based on data.
      * @param params See the object specifications table below for the structure of the params object.
@@ -12477,16 +12694,7 @@ declare module "esri/symbols/Font" {
      * @param weight Font weight.
      * @param family Font family.
      */
-    constructor(size?: number, style?: string, variant?: string, weight?: string, family?: string);
-    /**
-     * Creates a new Font object.
-     * @param size Font size.
-     * @param style Font style.
-     * @param variant Font variant.
-     * @param weight Font weight.
-     * @param family Font family.
-     */
-    constructor(size?: string, style?: string, variant?: string, weight?: string, family?: string);
+    constructor(size?: number | string, style?: string, variant?: string, weight?: string, family?: string);
     /**
      * Creates a new Font object using a JSON object.
      * @param json JSON object representing the font.
@@ -12506,12 +12714,7 @@ declare module "esri/symbols/Font" {
      * Sets the font size.
      * @param size Font size.
      */
-    setSize(size: number): Font;
-    /**
-     * Sets the font size.
-     * @param size Font size.
-     */
-    setSize(size: string): Font;
+    setSize(size: number | string): Font;
     /**
      * Sets the font style.
      * @param style Font style.
@@ -12694,8 +12897,8 @@ declare module "esri/symbols/PictureMarkerSymbol" {
 
 declare module "esri/symbols/SimpleFillSymbol" {
   import FillSymbol = require("esri/symbols/FillSymbol");
-  import SimpleLineSymbol = require("esri/symbols/SimpleLineSymbol");
   import Color = require("esri/Color");
+  import SimpleLineSymbol = require("esri/symbols/SimpleLineSymbol");
 
   /** Fill symbols are used to draw polygon features on the graphics layer. */
   class SimpleFillSymbol extends FillSymbol {
@@ -12715,6 +12918,8 @@ declare module "esri/symbols/SimpleFillSymbol" {
     static STYLE_SOLID: any;
     /** The fill is vertical lines. */
     static STYLE_VERTICAL: any;
+    /** Symbol color - only applies when SimpleFillSymbol.style = 'STYLE_SOLID'. */
+    color: Color;
     /** The fill style. */
     style: string;
     /** Creates a new empty SimpleFillSymbol object. */
@@ -12731,6 +12936,11 @@ declare module "esri/symbols/SimpleFillSymbol" {
      * @param json JSON object representing the SimpleFillSymbol.
      */
     constructor(json: Object);
+    /**
+     * Sets the symbol color - only applies when style is STYLE_SOLID.
+     * @param color Symbol color.
+     */
+    setColor(color: Color): SimpleFillSymbol;
     /**
      * Sets the fill symbol style.
      * @param style Fill style.
@@ -13046,18 +13256,18 @@ declare module "esri/tasks/AlgorithmicColorRamp" {
 }
 
 declare module "esri/tasks/AreasAndLengthsParameters" {
-  import Geometry = require("esri/geometry/Geometry");
+  import Polygon = require("esri/geometry/Polygon");
 
   /** Input parameters for the areasAndLengths() method on the Geometry Service. */
   class AreasAndLengthsParameters {
     /** The area unit in which areas of polygons will be calculated. */
-    areaUnit: any;
+    areaUnit: number | string;
     /** Defines the type of calculation for the geometry. */
     calculationType: string;
     /** The length unit in which perimeters of polygons will be calculated. */
-    lengthUnit: any;
+    lengthUnit: number | string;
     /** Polygon geometries for which to compute areas and lengths */
-    polygons: Geometry[];
+    polygons: Polygon[];
     /** Creates a new AreasAndLengthsParameters object. */
     constructor();
   }
@@ -13083,7 +13293,7 @@ declare module "esri/tasks/BufferParameters" {
     /** If true, all geometries buffered at a given distance are unioned into a single (possibly multipart) polygon, and the unioned geometry is placed in the output array. */
     unionResults: boolean;
     /** The units for calculating each buffer distance. */
-    unit: string;
+    unit: number;
     /** Creates a new BufferParameters object. */
     constructor();
   }
@@ -13165,7 +13375,7 @@ declare module "esri/tasks/ClosestFacilityParameters" {
     /** The set of facilities loaded as network locations during analysis. */
     facilities: any;
     /** The network attribute field name used as the impedance attribute during analysis. */
-    impedenceAttribute: string;
+    impedanceAttribute: string;
     /** The set of incidents loaded as network locations during analysis. */
     incidents: any;
     /** The output geometry precision. */
@@ -13206,6 +13416,8 @@ declare module "esri/tasks/ClosestFacilityParameters" {
     timeOfDayUsage: string;
     /** Options for traveling to or from the facility. */
     travelDirection: string;
+    /** Travel modes define how a pedestrian, car, truck or other medium of transportation moves through the street network. */
+    travelMode: any;
     /** If true, the hierarchy attribute for the network will be used in analysis. */
     useHierarchy: boolean;
     /** Creates a new ClosestFacilityParameters object */
@@ -13256,6 +13468,8 @@ declare module "esri/tasks/ClosestFacilityTask" {
      * @param url URL to the ArcGIS Server REST resource that represents a network analysis service.
      */
     constructor(url: string);
+    /** Returns an object describing a Closest Facility service endpoint (URL of the endpoint is specified in the constructor). */
+    getServiceDescription(): any;
     /**
      * Solve the closest facility.
      * @param params The ClosestFacilityParameters object.
@@ -13350,7 +13564,7 @@ declare module "esri/tasks/DensifyParameters" {
     /** The array of geometries to be densified. */
     geometries: Geometry[];
     /** The length unit of maxSegmentLength, can be any esriUnits constant. */
-    lengthUnit: any;
+    lengthUnit: number | string;
     /** All segments longer than maxSegmentLength are replaced with sequences of lines no longer than maxSegmentLength. */
     maxSegmentLength: number;
     /** Converts object to its JSON representation. */
@@ -13392,10 +13606,10 @@ declare module "esri/tasks/DistanceParameters" {
   /** Input parameters for the distance  method on the GeometryService. */
   class DistanceParameters {
     /** Specifies the units for measuring distance between geometry1 and geometry2. */
-    distanceUnit: any;
+    distanceUnit: number | string;
     /** When true, the geodesic distance between geometry1 and geometry2 is measured. */
     geodesic: boolean;
-    /** The geometry from which the distance is to measured. */
+    /** The geometry from which the distance is to be measured. */
     geometry1: Geometry;
     /** The geometry to which the distance is measured. */
     geometry2: Geometry;
@@ -13547,7 +13761,7 @@ declare module "esri/tasks/GeneralizeParameters" {
   /** Sets the geometries, maximum deviation and units for the generalize operation. */
   class GeneralizeParameters {
     /** The maximum deviation unit. */
-    deviationUnit: any;
+    deviationUnit: number | string;
     /** The array of input geometries to generalize. */
     geometries: Geometry[];
     /** The maximum deviation for constructing a generalized geometry based on the input geometries. */
@@ -13625,6 +13839,7 @@ declare module "esri/tasks/GeometryService" {
   import ProjectParameters = require("esri/tasks/ProjectParameters");
   import RelationParameters = require("esri/tasks/RelationParameters");
   import TrimExtendParameters = require("esri/tasks/TrimExtendParameters");
+  import Point = require("esri/geometry/Point");
 
   /** Represents a geometry service resource exposed by the ArcGIS Server REST API. */
   class GeometryService {
@@ -13758,7 +13973,7 @@ declare module "esri/tasks/GeometryService" {
      * @param callback The function to call when the method has completed.
      * @param errback An error object is returned if an error occurs on the Server during task execution.
      */
-    labelPoints(polygons: Geometry[], callback?: Function, errback?: Function): any;
+    labelPoints(polygons: Polygon[], callback?: Function, errback?: Function): any;
     /**
      * Gets the lengths for a Geometry[] when the geometry type is Polyline.
      * @param lengthsParameter Specify the polylines and optionally the length unit and the geodesic length option.
@@ -13828,7 +14043,7 @@ declare module "esri/tasks/GeometryService" {
     /** Fires when the autoComplete operation is complete. */
     on(type: "auto-complete-complete", listener: (event: { geometries: Polygon[]; target: GeometryService }) => void): esri.Handle;
     /** Fires when the buffer operation is complete. */
-    on(type: "buffer-complete", listener: (event: { geometries: Geometry[]; target: GeometryService }) => void): esri.Handle;
+    on(type: "buffer-complete", listener: (event: { geometries: Polygon[]; target: GeometryService }) => void): esri.Handle;
     /** Fires when the convexHull operation is complete. */
     on(type: "convex-hull-complete", listener: (event: { geometry: Geometry; target: GeometryService }) => void): esri.Handle;
     /** Fires when the cut operation is complete. */
@@ -13846,7 +14061,7 @@ declare module "esri/tasks/GeometryService" {
     /** Fires when the intersect operation is complete. */
     on(type: "intersect-complete", listener: (event: { geometries: Geometry[]; target: GeometryService }) => void): esri.Handle;
     /** Fires when the labelPoints operation is complete. */
-    on(type: "label-points-complete ", listener: (event: { geometries: Geometry[]; target: GeometryService }) => void): esri.Handle;
+    on(type: "label-points-complete ", listener: (event: { geometries: Point[]; target: GeometryService }) => void): esri.Handle;
     /** Fires when the lengths operation is complete. */
     on(type: "lengths-complete", listener: (event: { result: any; target: GeometryService }) => void): esri.Handle;
     /** Fires when the offset operation is complete. */
@@ -14108,7 +14323,7 @@ declare module "esri/tasks/ImageServiceIdentifyParameters" {
     /** Specifies the mosaic rules defining the image sorting order. */
     mosaicRule: MosaicRule;
     /** The pixel or RGB color value representing no information. */
-    noData: any;
+    noData: string | number;
     /** Used along with the noData property. */
     noDataInterpretation: string;
     /** Specify the pixel level being identified on the x and y axis. */
@@ -14160,7 +14375,7 @@ declare module "esri/tasks/ImageServiceIdentifyTask" {
   import ImageServiceIdentifyParameters = require("esri/tasks/ImageServiceIdentifyParameters");
   import ImageServiceIdentifyResult = require("esri/tasks/ImageServiceIdentifyResult");
 
-  /** Performs an identify operation on an image service resource . */
+  /** Performs an identify operation on an image service resource. */
   class ImageServiceIdentifyTask {
     /**
      * Creates a new ImageServiceIdentifyTask object.
@@ -14181,6 +14396,60 @@ declare module "esri/tasks/ImageServiceIdentifyTask" {
   export = ImageServiceIdentifyTask;
 }
 
+declare module "esri/tasks/ImageServiceMeasureParameters" {
+  import Geometry = require("esri/geometry/Geometry");
+  import MosaicRule = require("esri/layers/MosaicRule");
+  import Point = require("esri/geometry/Point");
+
+  /** Defines parameters for the ImageServiceMeasureTask. */
+  class ImageServiceMeasureParameters {
+    /** The angular unit in which directions of line segments will be calculated. */
+    angularUnit: string;
+    /** The area unit in which areas of polygons will be calculated. */
+    areaUnit: string;
+    /** A geometry that defines the "from" location of the measurement. */
+    fromGeometry: Geometry;
+    /** The linear unit in which height, length, or perimeters will be calculated. */
+    linearUnit: string;
+    /** Specifies the mosaic rule when defining how individual images should be mosaicked. */
+    mosaicRule: MosaicRule;
+    /** The mensuration rule to apply to the measure operation. */
+    operation: string;
+    /** The pixel resolution being measured. */
+    pixelSize: Point;
+    /** A geometry that defines the "to" location of the measurement. */
+    toGeometry: Geometry;
+    /** Converts the ImageServiceMeasureParameters instance to a JSON object. */
+    toJson(): any;
+  }
+  export = ImageServiceMeasureParameters;
+}
+
+declare module "esri/tasks/ImageServiceMeasureTask" {
+  import esri = require("esri");
+  import ImageServiceMeasureParameters = require("esri/tasks/ImageServiceMeasureParameters");
+
+  /** Performs a measure operation on an Image Service. */
+  class ImageServiceMeasureTask {
+    /**
+     * Creates a new instance of ImageServiceMeasureTask
+     * @param url URL to the ArcGIS Server REST resource that represents an image service.
+     */
+    constructor(url: string);
+    /**
+     * Sends a request to an image service to perform the designated measure operation.
+     * @param params Parameters to pass to the server to execute the task.
+     * @param callback The function to call when the method has completed.
+     * @param errback An error object is returned if an error occurs on the Server during task execution.
+     */
+    execute(params: ImageServiceMeasureParameters, callback?: Function, errback?: Function): any;
+    /** Fires when measure completes. */
+    on(type: "complete", listener: (event: { target: ImageServiceMeasureTask }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = ImageServiceMeasureTask;
+}
+
 declare module "esri/tasks/JobInfo" {
   import GPMessage = require("esri/tasks/GPMessage");
 
@@ -14241,7 +14510,7 @@ declare module "esri/tasks/LengthsParameters" {
     /** If polylines are in geographic coordinate system, then geodesic needs to be set to true in order to calculate the ellipsoidal shortest path distance between each pair of the vertices in the polylines. */
     geodesic: boolean;
     /** The length unit in which perimeters of polygons will be calculated. */
-    lengthUnit: any;
+    lengthUnit: number | string;
     /** The array of polylines whose lengths are to be computed. */
     polylines: Geometry[];
     /** Creates a new LengthsParameter object. */
@@ -14408,7 +14677,7 @@ declare module "esri/tasks/PrintTemplate" {
     exportOptions: any;
     /** The print output format. */
     format: string;
-    /** The text that appears on the PrintWidget's print button. */
+    /** The text that appears on the Print widget's print button. */
     label: string;
     /** The layout used for the print output. */
     layout: string;
@@ -14420,6 +14689,8 @@ declare module "esri/tasks/PrintTemplate" {
     preserveScale: boolean;
     /** When false, attribution is not displayed on the printout. */
     showAttribution: boolean;
+    /** Indicates whether visible LabelLayers in the map are displayed or not. */
+    showLabels: boolean;
     /** Creates a new PrintTemplate object. */
     constructor();
   }
@@ -14666,6 +14937,8 @@ declare module "esri/tasks/RouteParameters" {
     startTimeIsUTC: boolean;
     /** The set of stops loaded as network locations during analysis. */
     stops: any;
+    /** Travel modes define how a pedestrian, car, truck or other medium of transportation moves through the street network. */
+    travelMode: any;
     /** If true, the hierarchy attribute for the network should be used in analysis. */
     useHierarchy: boolean;
     /** A useful feature of the RouteTask is the ability to constrain stop visits to certain times of day, or "time windows". */
@@ -14707,6 +14980,8 @@ declare module "esri/tasks/RouteTask" {
      * @param url URL to the ArcGIS Server REST resource that represents a network analysis service.
      */
     constructor(url: string);
+    /** Returns an object describing a Route service endpoint (URL of the endpoint is specified in the constructor). */
+    getServiceDescription(): any;
     /**
      * Solves the route against the route layer with the route parameters.
      * @param params Route parameters used as input to generate the route.
@@ -14784,6 +15059,8 @@ declare module "esri/tasks/ServiceAreaParameters" {
     timeOfDay: Date;
     /** Options for traveling to or from the facility. */
     travelDirection: string;
+    /** Travel modes define how a pedestrian, car, truck or other medium of transportation moves through the street network. */
+    travelMode: any;
     /** If true, the outermost polygon (at the maximum break value) will be trimmed. */
     trimOuterPolygon: boolean;
     /** If polygons are being trimmed, provides the distance to trim. */
@@ -14837,6 +15114,8 @@ declare module "esri/tasks/ServiceAreaTask" {
      * @param url URL to the ArcGIS Server REST resource that represents a network analysis service.
      */
     constructor(url: string);
+    /** Returns an object describing a Service Area service endpoint (URL of the endpoint is specified in the constructor). */
+    getServiceDescription(): any;
     /**
      * Solve the service area.
      * @param params The ServiceAreaParameters object.
@@ -14871,8 +15150,20 @@ declare module "esri/tasks/TrimExtendParameters" {
 
   /** Sets the polylines and other parameters for the trimExtend operation. */
   class TrimExtendParameters {
+    /** Default value. */
+    static DEFAULT_CURVE_EXTENSION: any;
+    /** When an extension is performed at an end, do not extrapolate the end segments attributes for the new point. */
+    static KEEP_END_ATTRIBUTES: any;
+    /** When an extension is performed at an end, do not extrapolate the end segment's attributes for the new point. */
+    static NO_END_ATTRIBUTES: any;
+    /** Do not extend the 'from' end of any path. */
+    static NO_EXTEND_AT_FROM: any;
+    /** Do not extend the 'to' end of any path. */
+    static NO_EXTEND_AT_TO: any;
+    /** When an extension is performed at an end, relocate the end point to the new position. */
+    static RELOCATE_ENDS: any;
     /** A flag used along with the trimExtend operation. */
-    extendHow: string;
+    extendHow: number;
     /** The array of polylines to trim or extend. */
     polylines: Polyline[];
     /** A polyline used as a guide for trimming or extending input polylines. */
@@ -14908,6 +15199,550 @@ declare module "esri/tasks/UniqueValueDefinition" {
   export = UniqueValueDefinition;
 }
 
+declare module "esri/tasks/datareviewer/BatchValidationJob" {
+  import BatchValidationJobInfo = require("esri/tasks/datareviewer/BatchValidationJobInfo");
+  import BatchValidationParameters = require("esri/tasks/datareviewer/BatchValidationParameters");
+
+  /** Encapsulates a Batch Validation Job. */
+  class BatchValidationJob {
+    /** Contains a list of batch run IDs, one for each batch validation execution associated with this batch validation job. */
+    batchRunIds : string[];
+    /** Gets job creation date. */
+    creationDate: Date;
+    /** Gets the Job Id. */
+    jobId: string;
+    /** Gets batch job execution details. */
+    jobInfo: BatchValidationJobInfo;
+    /** Gets batch job parameters. */
+    parameters: BatchValidationParameters;
+    /** Gets the job status. */
+    status: string;
+    /** Gets the job type. */
+    type: string;
+  }
+  export = BatchValidationJob;
+}
+
+declare module "esri/tasks/datareviewer/BatchValidationJobInfo" {
+  /** Encapsulates batch validation job execution details. */
+  class BatchValidationJobInfo {
+    /** Gets the batch run Id of the job execution. */
+    batchRunId: string;
+    /** Gets the finish time of the job execution. */
+    finishTimeUTC: Date;
+    /** Gets the job's geoprocessing Job Id. */
+    gpJobId: string;
+    /** Gets the URL of the geoprocessing service that executed the batch validation. */
+    gpUrl: string;
+    /** Gets batch validation messages. */
+    messages: string;
+    /** Gets the start time of the job execution. */
+    startTimeUTC: Date;
+    /** Gets the batch validation status. */
+    status: string;
+  }
+  export = BatchValidationJobInfo;
+}
+
+declare module "esri/tasks/datareviewer/BatchValidationParameters" {
+  import Polygon = require("esri/geometry/Polygon");
+
+  /** Encapsulates batch job parameters including session Id, production workspace and analysis area. */
+  class BatchValidationParameters {
+    /** A geometry that defines the validation extent. */
+    analysisArea: Polygon;
+    /** Read-only: Gets the uploaded batch job name. */
+    batchJobFileName: string;
+    /** Controls validation type on enterprise geodatabases. */
+    changedFeaturesOnly: boolean;
+    /** Read-only: Gets the name of the web user that created the batch job schedule. */
+    createdBy: string;
+    /** Gets or sets the batch validation execution schedule. */
+    cronExpression: string;
+    /** Gets or sets the ending date for a batch validation schedule. */
+    executionsEndDate: Date;
+    /** Gets or sets the ID of the uploaded batch job. */
+    fileItemId: string;
+    /** Gets or sets the maximum number of batch validation executions that can run. */
+    maxNumberOfExecutions: number;
+    /** Gets or sets the production workspace path. */
+    productionWorkspace: string;
+    /** Gets or sets the ArcGIS Data Reviewer session. */
+    sessionString: string;
+    /** Gets or sets the batch validation title. */
+    title: string;
+    /** Gets or sets the user name under which records are written to the reviewer workspace. */
+    userName: string;
+  }
+  export = BatchValidationParameters;
+}
+
+declare module "esri/tasks/datareviewer/BatchValidationTask" {
+  import esri = require("esri");
+  import SessionOptions = require("esri/tasks/datareviewer/SessionOptions");
+  import BatchValidationParameters = require("esri/tasks/datareviewer/BatchValidationParameters");
+  import ReviewerSession = require("esri/tasks/datareviewer/ReviewerSession");
+  import BatchValidationJob = require("esri/tasks/datareviewer/BatchValidationJob");
+  import BatchValidationJobInfo = require("esri/tasks/datareviewer/BatchValidationJobInfo");
+
+  /** Exposes functions for executing and scheduling Batch Validation in ArcGIS Data Reviewer for Server. */
+  class BatchValidationTask {
+    /**
+     * Creates a new BatchValidationTask object.
+     * @param url The DataReviewerServer Server Object Extension (SOE) URL.
+     */
+    constructor(url: string);
+    /**
+     * Cancels an executing job.
+     * @param jobId Job Id of the batch validation job to cancel.
+     */
+    cancelJobExecution(jobId: string): any;
+    /**
+     * Creates a new Reviewer session.
+     * @param sessionName Name of the session to be created.
+     * @param sessionOptions Session properties to be used to create the session.
+     */
+    createReviewerSession(sessionName: string, sessionOptions: SessionOptions): any;
+    /**
+     * Deletes an existing scheduled Batch Validation Job.
+     * @param jobId Job Id of the batch validation job to delete.
+     */
+    deleteJob(jobId: string): any;
+    /**
+     * Pauses an existing Batch Validation Job's schedule.
+     * @param jobId Job Id of the batch validation job to be disabled.
+     */
+    disableJob(jobId: string): any;
+    /**
+     * Edits the schedule, settings and title of an existing Batch Validation Job.
+     * @param jobId Job Id of the batch validation job to edit.
+     * @param parameters Parameters to change in an existing batch job.
+     */
+    editJob(jobId: string, parameters: BatchValidationParameters): any;
+    /**
+     * Restarts an existing Batch Validation Job's schedule.
+     * @param jobId Job Id of the batch validation job to enable.
+     */
+    enableJob(jobId: string): any;
+    /**
+     * Executes an adhoc job.
+     * @param parameters Parameters specifying the details of a job to execute.
+     */
+    executeJob(parameters: BatchValidationParameters): any;
+    /** Retrieves all adhoc jobs from the server and returns an array of BatchValidationJob with the information. */
+    getAdhocJobsList(): any;
+    /**
+     * Fetches Batch Validation Job details.
+     * @param jobId Job Id of the batch validation job.
+     */
+    getJobDetails(jobId: string): any;
+    /**
+     * Fetches the Job Execution details of a Batch Validation Job.
+     * @param jobId Job Id of the batch validation job.
+     */
+    getJobExecutionDetails(jobId: string): any;
+    /** Returns an object that contains Scheduled and AdhocJob IDs in two separate arrays. */
+    getJobIds(): any;
+    /** Retrieves a list of localized life cycle status strings from the Reviewer workspace. */
+    getLifecycleStatusStrings(): any;
+    /** Extracts the MapServer url from the full ArcGIS Data Reviewer for Server SOE url. */
+    getReviewerMapServerUrl(): string;
+    /** Returns an array of sessions in a Reviewer workspace. */
+    getReviewerSessions(): any;
+    /** Retrieves all scheduled jobs from the server and returns an array of BatchValidationJob with the information. */
+    getScheduledJobsList(): any;
+    /**
+     * Schedules a new Batch Validation.
+     * @param parameters Parameters for scheduling a batch job.
+     */
+    scheduleJob(parameters: BatchValidationParameters): any;
+    /** Fires when the cancelJobExecution method is complete. */
+    on(type: "cancel-job-execution", listener: (event: { canceled: boolean; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the createReviewerSessions method is complete. */
+    on(type: "create-reviewer-sessions", listener: (event: { reviewerSession: ReviewerSession; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the deleteJob method is complete. */
+    on(type: "delete-job", listener: (event: { deleted: boolean; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the disableJob method is complete. */
+    on(type: "disable-job", listener: (event: { disabled: boolean; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the editJob method is complete. */
+    on(type: "edit-job", listener: (event: { edited: boolean; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the enableJob method is complete. */
+    on(type: "enable-job", listener: (event: { enabled: boolean; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when an error occurs during a BatchValidationTask method execution. */
+    on(type: "error", listener: (event: { error: Error; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the executeJob method is complete. */
+    on(type: "execute-job", listener: (event: { jobId: string; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the getAdhocJobsList method is complete. */
+    on(type: "get-adhoc-jobs-list", listener: (event: { adhocJobs: any[]; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the getJobDetails method is complete. */
+    on(type: "get-job-details", listener: (event: { jobDetails: BatchValidationJob; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the getJobExecutionDetails method is complete. */
+    on(type: "get-job-execution-details", listener: (event: { jobInfo: BatchValidationJobInfo; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the getJobIds method is complete. */
+    on(type: "get-job-ids", listener: (event: { adhocJobs: any[]; scheduledJobs: any[]; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the getLifecycleStatusStrings method is complete. */
+    on(type: "get-lifecycle-status-strings", listener: (event: { lifecycleStatusStrings: any[]; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the getReviewerSessions method is complete. */
+    on(type: "get-reviewer-sessions", listener: (event: { reviewerSessions: any[]; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the getScheduledJobsList method is complete. */
+    on(type: "get-scheduled-jobs-list", listener: (event: { scheduledJobs: any[]; target: BatchValidationTask }) => void): esri.Handle;
+    /** Fires when the scheduleJob method is complete. */
+    on(type: "schedule-job", listener: (event: { jobId: string; target: BatchValidationTask }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = BatchValidationTask;
+}
+
+declare module "esri/tasks/datareviewer/DashboardResult" {
+  import ReviewerFilters = require("esri/tasks/datareviewer/ReviewerFilters");
+
+  /** Encapsulates data describing a Dashboard Result. */
+  class DashboardResult {
+    /** Array of reviewer result field value counts. */
+    counts: any[];
+    /** Name of the reviewer results field. */
+    fieldName: string;
+    /** Array of reviewer results field values. */
+    fieldValues: any[];
+    /** An instance of ReviewerFilters class. */
+    filters: ReviewerFilters;
+    /**
+     * Gets the result count for a field value.
+     * @param fieldValue Unique field value from the fieldValues array.
+     */
+    getCount(fieldValue: string | number): number;
+  }
+  export = DashboardResult;
+}
+
+declare module "esri/tasks/datareviewer/DashboardTask" {
+  import esri = require("esri");
+  import SessionOptions = require("esri/tasks/datareviewer/SessionOptions");
+  import ReviewerFilters = require("esri/tasks/datareviewer/ReviewerFilters");
+  import ReviewerSession = require("esri/tasks/datareviewer/ReviewerSession");
+  import DashboardResult = require("esri/tasks/datareviewer/DashboardResult");
+
+  /** Provides functionality to retrieve dashboard results from an ArcGIS Data Reviewer for Server Dashboard REST resource. */
+  class DashboardTask {
+    /**
+     * Creates a new DashboardTask object.
+     * @param url The DataReviewerServer Server Object Extension (SOE) URL.
+     */
+    constructor(url: string);
+    /**
+     * Creates a new Reviewer session.
+     * @param sessionName Name of the session to be created.
+     * @param sessionOptions Session properties to be used to create the session.
+     */
+    createReviewerSession(sessionName: string, sessionOptions: SessionOptions): any;
+    /** Requests Dashboard results field names. */
+    getDashboardFieldNames(): any;
+    /**
+     * Requests dashboard results by fieldName.
+     * @param fieldName Field name for dashboard results.
+     * @param filters Instance of ReviewerFilters containing one or more filters used to narrow down dashboard results.
+     */
+    getDashboardResults(fieldName: string, filters?: ReviewerFilters): any;
+    /** Retrieves a list of localized life cycle status strings from the Reviewer workspace. */
+    getLifecycleStatusStrings(): any;
+    /** Extracts the MapServer url from the full ArcGIS Data Reviewer for Server SOE url. */
+    getReviewerMapServerUrl(): string;
+    /** Returns an array of sessions in a Reviewer workspace. */
+    getReviewerSessions(): any;
+    /** Fires when the createReviewerSessions method is complete. */
+    on(type: "create-reviewer-sessions", listener: (event: { reviewerSession: ReviewerSession; target: DashboardTask }) => void): esri.Handle;
+    /** Fires when an error occurs during a DashboardTask method execution. */
+    on(type: "error", listener: (event: { error: Error; target: DashboardTask }) => void): esri.Handle;
+    /** Fires when the getDashboardFieldNames method is complete. */
+    on(type: "get-dashboard-field-names", listener: (event: { fieldNames: any[]; target: DashboardTask }) => void): esri.Handle;
+    /** Fires when the getDashboardResults method is complete. */
+    on(type: "get-dashboard-results", listener: (event: { dashboardResult: DashboardResult; target: DashboardTask }) => void): esri.Handle;
+    /** Fires when the getLifecycleStatusStrings method is complete. */
+    on(type: "get-lifecycle-status-strings", listener: (event: { lifecycleStatusStrings: any[]; target: DashboardTask }) => void): esri.Handle;
+    /** Fires when the getReviewerSessions method is complete. */
+    on(type: "get-reviewer-sessions", listener: (event: { reviewerSessions: any[]; target: DashboardTask }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = DashboardTask;
+}
+
+declare module "esri/tasks/datareviewer/GetResultsQueryParameters" {
+  /** Encapsulates data used for retrieving results from the reviewer workspace. */
+  class GetResultsQueryParameters {
+    /** The page number, zero based index, of the results to return. */
+    pageNumber: number;
+    /** The number of items to list on a page. */
+    pageSize: number;
+    /** Array of field names. */
+    returnFields: any[];
+    /** Indicates a field name by which to sort. */
+    sortBy: string;
+    /** Controls sort order. */
+    sortDescending: boolean;
+    /** Returns a JSON representation of an instance of GetResultsQueryParameters. */
+    toJSON(): any;
+  }
+  export = GetResultsQueryParameters;
+}
+
+declare module "esri/tasks/datareviewer/ReviewerAttributes" {
+  /** Encapsulates data used by the writeFeatureAsResult and writeResult methods of the ReviewerResults class. */
+  class ReviewerAttributes {
+    /** Represents the state of a reviewer result. */
+    lifecycleStatus: number;
+    /** Extra information describing a result or feature. */
+    notes: string;
+    /** Represents an ArcGIS Data Reviewer resource name. */
+    resourceName: string;
+    /** A status value (any string) to write to the ReviewStatus field for the result or feature written to the reviewer workspace. */
+    reviewStatus: string;
+    /** The user name under which results or features are written to the reviewer workspace. */
+    reviewTechnician: string;
+    /** Represents an ArcGIS Data Reviewer session ID, the numeric identifier of the session. */
+    sessionId: number;
+    /** Represents an ArcGIS Data Reviewer severity value. */
+    severity: number;
+    /** Subtype from the original feature that was checked and caused an error. */
+    subtype: string;
+    /** Returns a JSON representation of an instance of ReviewerAttributes. */
+    toJSON(): any;
+  }
+  export = ReviewerAttributes;
+}
+
+declare module "esri/tasks/datareviewer/ReviewerFilters" {
+  import Polygon = require("esri/geometry/Polygon");
+
+  /** ReviewerFilters limit or precisely define which results to generate by applying conditions to a query for dashboard results. */
+  class ReviewerFilters {
+    /**
+     * Queries an attribute by a value.
+     * @param fieldName The field used to perform the filter.
+     * @param fieldValues A value or an Array of values in fieldName to filter.
+     */
+    addAttributeFilter(fieldName: string, fieldValues: string | number | any[]): void;
+    /**
+     * Queries an attribute by a range of values.
+     * @param fieldName The field used to perform the filter.
+     * @param min Minimum value range.
+     * @param max Maximum value range.
+     */
+    addRangeFilter(fieldName: string, min: string | number, max: string | number): void;
+    /**
+     * Queries by a polygon.
+     * @param geometry The geometry used to perform the filter.
+     */
+    addSpatialFilter(geometry: Polygon): void;
+    /** Returns the count of ReviewerFilters added. */
+    getCount(): number;
+    /** Returns a JSON representation of a filter object. */
+    toJSON(): any;
+  }
+  export = ReviewerFilters;
+}
+
+declare module "esri/tasks/datareviewer/ReviewerLifecycle" {
+  /** The ReviewerLifecycle class specifies constant values for all lifecycle status and lifecycle phase strings within the Reviewer quality control workflow. */
+  class ReviewerLifecycle {
+    /** Acceptable lifecycleStatus code = 4 belongs to Verification Phase. */
+    ACCEPTABLE: number;
+    /** Code for Correction Phase. */
+    CORRECTION: number;
+    /** Exception lifecycleStatus code = 9 belongs to Verification Phase. */
+    EXCEPTION: number;
+    /** Failed lifecycleStatus code = 12 belongs to Verification Phase. */
+    FAILED: number;
+    /** Object containing lifecycle phase codes and their associated descriptions. */
+    LIFECYCLEPHASE_DESCRIPTIONS: any;
+    /** Object containing lifecycle status codes and their associated descriptions. */
+    LIFECYCLESTATUS_DESCRIPTIONS: any;
+    /** Mark As Exception lifecycleStatus code = 3 belongs to Correction Phase. */
+    MARK_AS_EXCEPTION: number;
+    /** New lifecycleStatus code = 10 belongs to Review Phase. */
+    NEW: number;
+    /** Passed lifecycleStatus code = 11 belongs to Verification Phase. */
+    PASSED: number;
+    /** Resolved lifecycleStatus code = 2 belongs to Correction Phase. */
+    RESOLVED: number;
+    /** Code for Review Phase. */
+    REVIEW: number;
+    /** Reviewed lifecycleStatus code = 1 belongs to Review Phase. */
+    REVIEWED: number;
+    /** Unacceptable lifecycleStatus code = 6 belongs to Review Phase. */
+    UNACCEPTABLE: number;
+    /** Unknown lifecycleStatus code = 0 belongs to Review Phase. */
+    UNKNOWN: number;
+    /** Unresolved Acceptable lifecycleStatus code = 8 belongs to Verification Phase. */
+    UNRESOLVED_ACCEPTABLE: number;
+    /** Unresolved Exception lifecycleStatus code = 5 belongs to Verification Phase. */
+    UNRESOLVED_EXCEPTION: number;
+    /** Unresolved Unacceptable lifecycleStatus code = 7 belongs to Review Phase. */
+    UNRESOLVED_UNACCEPTABLE: number;
+    /** Code for Verififcation Phase. */
+    VERIFICATION: number;
+    /**
+     * This function returns the the associated lifecycle phase of the input lifecycle status.
+     * @param lifecycleStatus The lifecycle status code.
+     */
+    getCurrentLifecyclePhase(lifecycleStatus: number): string;
+    /**
+     * This function accepts an array of lifecycle statuses and returns an object containing the next appropriate lifecycle status and phase that the record will advance to.
+     * @param lifecycleStatus An Array of lifecycle statuses.
+     */
+    getLifecycleInfo(lifecycleStatus: any[]): any;
+    /**
+     * This function returns lifecycle phase string associated with the input lifecycle phase code.
+     * @param lifecyclePhase The lifecycle phase code.
+     */
+    toLifecyclePhaseString(lifecyclePhase: number): string;
+    /**
+     * This function returns lifecycle status string associated with the input lifecycle status code.
+     * @param lifecycleStatus The lifecycle status code.
+     */
+    toLifecycleStatusString(lifecycleStatus: number): string;
+  }
+  export = ReviewerLifecycle;
+}
+
+declare module "esri/tasks/datareviewer/ReviewerResultsTask" {
+  import esri = require("esri");
+  import SessionOptions = require("esri/tasks/datareviewer/SessionOptions");
+  import ReviewerFilters = require("esri/tasks/datareviewer/ReviewerFilters");
+  import GetResultsQueryParameters = require("esri/tasks/datareviewer/GetResultsQueryParameters");
+  import ReviewerAttributes = require("esri/tasks/datareviewer/ReviewerAttributes");
+  import Graphic = require("esri/graphic");
+  import Geometry = require("esri/geometry/Geometry");
+  import ReviewerSession = require("esri/tasks/datareviewer/ReviewerSession");
+  import FeatureSet = require("esri/tasks/FeatureSet");
+
+  /** ReviewerResults allows access to the reviewer workspace. */
+  class ReviewerResultsTask {
+    /**
+     * Creates a new ReviewerResultsTask object.
+     * @param url The DataReviewerServer Server Object Extension (SOE) URL.
+     */
+    constructor(url: string);
+    /**
+     * Creates a new Reviewer session.
+     * @param sessionName Name of the session to be created.
+     * @param sessionOptions Session properties to be used to create the session.
+     */
+    createReviewerSession(sessionName: string, sessionOptions: SessionOptions): any;
+    /**
+     * Fetches batch run information from REVBATCHRUNTABLE and REVCHECKRUNTABLE.
+     * @param batchRunIds Array of batchRunIds used to get batch run details.
+     */
+    getBatchRunDetails(batchRunIds: any[]): any;
+    /**
+     * Utility operation that returns a where clause given a set of input filters.
+     * @param filters An instance of ReviewerFilters used to create a layer definition.
+     */
+    getLayerDefinition(filters: ReviewerFilters): any;
+    /** Retrieves a list of localized life cycle status strings from the Reviewer workspace. */
+    getLifecycleStatusStrings(): any;
+    /**
+     * Queries records from REVTABLEMAIN, REVBATCHRUNTABLE and REVCHECKRUNTABLE.
+     * @param getResultsQueryParameters Defines the size and scope of the FeatureSet returned to the callback function.
+     * @param filters Instance of ReviewerFilters used to query reviewer results.
+     */
+    getResults(getResultsQueryParameters: GetResultsQueryParameters, filters?: ReviewerFilters): any;
+    /** Extracts the MapServer url from the full ArcGIS Data Reviewer for Server SOE url. */
+    getReviewerMapServerUrl(): any;
+    /** Returns an array of sessions in a Reviewer workspace. */
+    getReviewerSessions(): any;
+    /**
+     * Updates lifecycle status of the Reviewer results.
+     * @param sessionId Session that contains results to update.
+     * @param lifecycleStatus Lifecycle status to which the Reviewer results will get updated.
+     * @param technicianName Name of the technician performing the update.
+     * @param filters Instance of ReviewerFilters used to query Reviewer results.
+     */
+    updateLifecycleStatus(sessionId: number, lifecycleStatus: number, technicianName: string, filters: ReviewerFilters): any;
+    /**
+     * Writes a feature to the reviewer workspace.
+     * @param reviewerAttributes Class used to encapsulate all fields to be written to the reviewer workspace.
+     * @param feature Graphic to write to the reviewer workspace.
+     */
+    writeFeatureAsResult(reviewerAttributes: ReviewerAttributes, feature: Graphic): any;
+    /**
+     * Writes a geometry and associated reviewer attributes to the reviewer workspace.
+     * @param reviewerAttributes Class used to encapsulate all fields to be written to the reviewer workspace.
+     * @param geometry A Geometry (point, polyline or polygon) to write to the reviewer workspace.
+     */
+    writeResult(reviewerAttributes: ReviewerAttributes, geometry: Geometry): any;
+    /** Fires when the createReviewerSession method is complete. */
+    on(type: "create-reviewer-sessions", listener: (event: { reviewerSession: ReviewerSession; target: ReviewerResultsTask }) => void): esri.Handle;
+    /** Fires when an error occurs during a ReviewerResultsTask method execution. */
+    on(type: "error", listener: (event: { error: Error; target: ReviewerResultsTask }) => void): esri.Handle;
+    /** Fires when the getBatchRunDetails method is complete. */
+    on(type: "get-batch-run-details", listener: (event: { featureSet: FeatureSet; target: ReviewerResultsTask }) => void): esri.Handle;
+    /** Fires when the getLayerDefinition method is complete. */
+    on(type: "get-layer-definition", listener: (event: { whereClause: string; target: ReviewerResultsTask }) => void): esri.Handle;
+    /** Fires when the getLifecycleStatusStrings method is complete. */
+    on(type: "get-lifecycle-status-strings", listener: (event: { lifecycleStatusStrings: any[]; target: ReviewerResultsTask }) => void): esri.Handle;
+    /** Fires when the getResults method is complete. */
+    on(type: "get-results", listener: (event: { featureSet: FeatureSet; target: ReviewerResultsTask }) => void): esri.Handle;
+    /** Fires when the getReviewerSessions method is complete. */
+    on(type: "get-reviewer-sessions", listener: (event: { reviewerSessions: any[]; target: ReviewerResultsTask }) => void): esri.Handle;
+    /** Fires when the updateLifecycleStatus method is complete. */
+    on(type: "update-lifecycle-status", listener: (event: { featureEditResults: any[]; target: ReviewerResultsTask }) => void): esri.Handle;
+    /** Fires when the writeFeatureAsResult method is complete. */
+    on(type: "write-feature-as-result", listener: (event: { success: boolean; target: ReviewerResultsTask }) => void): esri.Handle;
+    /** Fires when the writeResult method is complete. */
+    on(type: "write-result", listener: (event: { success: boolean; target: ReviewerResultsTask }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = ReviewerResultsTask;
+}
+
+declare module "esri/tasks/datareviewer/ReviewerSession" {
+  /** Represents an ArcGIS Data Reviewer session in which validation and manual quality control results are written to the reviewer workspace. */
+  class ReviewerSession {
+    /** Numeric identifier of the session. */
+    sessionId: number;
+    /** Session name. */
+    sessionName: string;
+    /** Name under which records are written to the reviewer workspace. */
+    userName: string;
+    /** Enterprise geodatabase version in which records are validated. */
+    versionName: string;
+    /**
+     * Creates a new ReviewerSession object.
+     * @param sessionId Numeric identifier of the session.
+     * @param sessionName Name of the session.
+     * @param userName User name under which records are written to the reviewer workspace.
+     * @param versionName The enterprise geodatabase version in which records are validated.
+     */
+    constructor(sessionId: string, sessionName: string, userName: string, versionName: string);
+    /** The Session ID and name in format Session 10 : Parcels. */
+    toString(): string;
+  }
+  export = ReviewerSession;
+}
+
+declare module "esri/tasks/datareviewer/SessionOptions" {
+  /** Represents an ArcGIS Data Reviewer session properties in which validation and manual quality control results are written to the reviewer workspace. */
+  class SessionOptions {
+    /** Indicates how to handle duplicate results when writing the results to the Reviewer workspace. */
+    duplicateFilter: string;
+    /** Indicates if validation result geometries are stored in the Reviewer workspace. */
+    storeGeometry: boolean;
+    /** The user account to associate with a session. */
+    userName: string;
+    /** Indicates an enterprise geodatabase version to associate with the session. */
+    versionName: string;
+    /**
+     * Creates a new SessionOptions object.
+     * @param userName The username under which records are written to the reviewer workspace.
+     * @param versionName The enterprise geodatabase version under which records are written to the reviewer workspace.
+     * @param duplicateFilter Handle duplicate results when writing the results to the Reviewer workspace.
+     * @param storeGeometry Controls if validation result geometries are stored in the Reviewer workspace.
+     */
+    constructor(userName: string, versionName: string, duplicateFilter: string, storeGeometry: boolean);
+  }
+  export = SessionOptions;
+}
+
 declare module "esri/tasks/geoenrichment/AddressStudyArea" {
   import StudyArea = require("esri/tasks/geoenrichment/StudyArea");
 
@@ -15019,7 +15854,7 @@ declare module "esri/tasks/geoenrichment/GeographyLevel" {
 declare module "esri/tasks/geoenrichment/GeographyQuery" {
   import GeographyQueryBase = require("esri/tasks/geoenrichment/GeographyQueryBase");
 
-  /** (Beta at v3.12) Represents StandardGeographyQuery parameters to search for geographies by ID or Name. */
+  /** (Currently in beta) Represents StandardGeographyQuery parameters to search for geographies by ID or Name. */
   class GeographyQuery extends GeographyQueryBase {
     /** Array of geography IDs. */
     geographyIDs: string[];
@@ -15036,7 +15871,7 @@ declare module "esri/tasks/geoenrichment/GeographyQuery" {
 declare module "esri/tasks/geoenrichment/GeographyQueryBase" {
   import SpatialReference = require("esri/SpatialReference");
 
-  /** (Beta at v3.12) Base class for all GeographyQuery objects. */
+  /** (Currently in beta) Base class for all GeographyQuery objects. */
   class GeographyQueryBase {
     /** Two-digit country code. */
     countryID: string;
@@ -15113,7 +15948,7 @@ declare module "esri/tasks/geoenrichment/StandardGeographyQueryTask" {
   import GeographyQueryBase = require("esri/tasks/geoenrichment/GeographyQueryBase");
   import FeatureSet = require("esri/tasks/FeatureSet");
 
-  /** (Beta at v3.12) Geoenrichment helper task that returns standard geography IDs and features for the supported geographic levels in Canada, the United States and a number of European countries. */
+  /** (Currently in beta) Geoenrichment helper task that returns standard geography IDs and features for the supported geographic levels in Canada, the United States and a number of European countries. */
   class StandardGeographyQueryTask {
     /**
      * Creates a new instance of the StandardGeographyQueryTask class.
@@ -15151,6 +15986,9 @@ declare module "esri/tasks/geoenrichment/StandardGeographyStudyArea" {
 
 declare module "esri/tasks/geoenrichment/StudyArea" {
   import GeographyLevel = require("esri/tasks/geoenrichment/GeographyLevel");
+  import RingBuffer = require("esri/tasks/geoenrichment/RingBuffer");
+  import DriveBuffer = require("esri/tasks/geoenrichment/DriveBuffer");
+  import IntersectingGeographies = require("esri/tasks/geoenrichment/IntersectingGeographies");
 
   /** The study area that is used for enrichment or for display in an Infographic widget. */
   class StudyArea {
@@ -15159,7 +15997,7 @@ declare module "esri/tasks/geoenrichment/StudyArea" {
     /** The identifiers for layers used to find comparison geographies. */
     comparisonGeographyLevels: GeographyLevel[];
     /** The options to apply to the study area. */
-    options: any;
+    options: RingBuffer | DriveBuffer | IntersectingGeographies;
     /** If true, geometry will be returned. */
     returnGeometry: boolean;
     /** Converts object to its JSON representation. */
@@ -15171,7 +16009,7 @@ declare module "esri/tasks/geoenrichment/StudyArea" {
 declare module "esri/tasks/geoenrichment/SubGeographyQuery" {
   import GeographyQueryBase = require("esri/tasks/geoenrichment/GeographyQueryBase");
 
-  /** (Beta at v3.12) Represents StandardGeographyQuery parameters to search subgeographic areas that are within a parent geography. */
+  /** (Currently in beta) Represents StandardGeographyQuery parameters to search subgeographic areas that are within a parent geography. */
   class SubGeographyQuery extends GeographyQueryBase {
     /** Parent layer geography IDs. */
     filterGeographyIDs: string;
@@ -15196,7 +16034,7 @@ declare module "esri/tasks/locationproviders/CoordinatesLocationProvider" {
   import esri = require("esri");
   import LocationProviderClientBase = require("esri/tasks/locationproviders/LocationProviderClientBase");
 
-  /** (Beta at v3.12) The CoordinatesLocationProvider class uses the fields that contain Latitude and Longitude values to generate or locate geometries. */
+  /** (Currently in beta) The CoordinatesLocationProvider class uses the fields that contain Latitude and Longitude values to generate or locate geometries. */
   class CoordinatesLocationProvider extends LocationProviderClientBase {
     /** The attribute field in the graphic object that has the longitude (X) values. */
     xField: string;
@@ -15215,7 +16053,7 @@ declare module "esri/tasks/locationproviders/GeometryLocationProvider" {
   import esri = require("esri");
   import LocationProviderClientBase = require("esri/tasks/locationproviders/LocationProviderClientBase");
 
-  /** (Beta at v3.12) The GeometryLocationProvider class uses the field in the data that has geometry as a JSON to generate the corresponding geometry. */
+  /** (Currently in beta) The GeometryLocationProvider class uses the field in the data that has geometry as a JSON to generate the corresponding geometry. */
   class GeometryLocationProvider extends LocationProviderClientBase {
     /** The attribute field in the graphic object that contains the JSON string representing the geometry. */
     geometryField: string;
@@ -15232,7 +16070,7 @@ declare module "esri/tasks/locationproviders/LocationProviderBase" {
   import esri = require("esri");
   import Graphic = require("esri/graphic");
 
-  /** (Beta at v3.12) The base class for all LocationProviders. */
+  /** (Currently in beta) The base class for all LocationProviders. */
   class LocationProviderBase {
     /** The geometry type of the returned features. */
     geometryType: string;
@@ -15261,7 +16099,7 @@ declare module "esri/tasks/locationproviders/LocationProviderClientBase" {
   import LocationProviderBase = require("esri/tasks/locationproviders/LocationProviderBase");
   import SpatialReference = require("esri/SpatialReference");
 
-  /** (Beta at v3.12) The base class for CoordinatesLocationProvider and GeometryLocationProvider. */
+  /** (Currently in beta) The base class for CoordinatesLocationProvider and GeometryLocationProvider. */
   class LocationProviderClientBase extends LocationProviderBase {
     /** The Spatial Reference of the input geometries. */
     inSpatialReference: SpatialReference;
@@ -15272,7 +16110,7 @@ declare module "esri/tasks/locationproviders/LocationProviderClientBase" {
 declare module "esri/tasks/locationproviders/LocationProviderRemoteBase" {
   import LocationProviderBase = require("esri/tasks/locationproviders/LocationProviderBase");
 
-  /** (Beta at v3.12) The base class for Location Providers that use a remote service to locate geometries. */
+  /** (Currently in beta) The base class for Location Providers that use a remote service to locate geometries. */
   class LocationProviderRemoteBase extends LocationProviderBase {
   }
   export = LocationProviderRemoteBase;
@@ -15283,7 +16121,7 @@ declare module "esri/tasks/locationproviders/LocatorLocationProvider" {
   import LocationProviderRemoteBase = require("esri/tasks/locationproviders/LocationProviderRemoteBase");
   import Locator = require("esri/tasks/locator");
 
-  /** (Beta at v3.12) The LocatorLocationProvider class uses a geocode service through the Locator object to generate or locate geometries using fields in the graphics that contain Street address information */
+  /** (Currently in beta) The LocatorLocationProvider class uses a geocode service through the Locator object to generate or locate geometries using fields in the graphics that contain Street address information */
   class LocatorLocationProvider extends LocationProviderRemoteBase {
     /** Object that matches the Locator address fields to corresponding attribute names in the Graphic object. */
     addressFields: any;
@@ -15303,7 +16141,7 @@ declare module "esri/tasks/locationproviders/QueryTaskLocationProvider" {
   import LocationProviderRemoteBase = require("esri/tasks/locationproviders/LocationProviderRemoteBase");
   import QueryTask = require("esri/tasks/QueryTask");
 
-  /** (Beta at v3.12) The QueryTaskLocationProvider performs a query against a ArcGIS Feature service or Map service layer based on common fields that are present in both the data and the ArcGIS layer. */
+  /** (Currently in beta) The QueryTaskLocationProvider performs a query against a ArcGIS Feature service or Map service layer based on common fields that are present in both the data and the ArcGIS layer. */
   class QueryTaskLocationProvider extends LocationProviderRemoteBase {
     /** A query parameter object that will be used to query the ArcGIS layer. */
     queryParameters: any;
@@ -15327,7 +16165,7 @@ declare module "esri/tasks/locationproviders/StandardGeographyQueryLocationProvi
   import LocationProviderRemoteBase = require("esri/tasks/locationproviders/LocationProviderRemoteBase");
   import StandardGeographyQueryTask = require("esri/tasks/geoenrichment/StandardGeographyQueryTask");
 
-  /** (Beta at v3.12) The StandardGeographyQueryLocationProvider class uses the Geoenrichment service to generate geometries by querying the standard geography layers. */
+  /** (Currently in beta) The StandardGeographyQueryLocationProvider class uses the Geoenrichment service to generate geometries by querying the standard geography layers. */
   class StandardGeographyQueryLocationProvider extends LocationProviderRemoteBase {
     /** A template to be used to build the query for Standard Geography query. */
     geographyQueryTemplate: string;
@@ -15491,6 +16329,90 @@ declare module "esri/tasks/query" {
   export = Query;
 }
 
+declare module "esri/toolbars/ImageServiceMeasureTool" {
+  import esri = require("esri");
+  import SimpleFillSymbol = require("esri/symbols/SimpleFillSymbol");
+  import SimpleLineSymbol = require("esri/symbols/SimpleLineSymbol");
+  import SimpleMarkerSymbol = require("esri/symbols/SimpleMarkerSymbol");
+  import Geometry = require("esri/geometry/Geometry");
+
+  /** A toolbar that provides support for measuring image services. */
+  class ImageServiceMeasureTool {
+    /** The angular unit in which directions of line segments will be calculated. */
+    angularUnit: string;
+    /** The area unit in which areas of polygons will be calculated. */
+    areaUnit: string;
+    /** Symbol to be used when drawing a polygon or extent. */
+    fillSymbol: SimpleFillSymbol;
+    /** The linear unit in which height, length, or perimeters will be calculated. */
+    linearUnit: string;
+    /** Symbol to be used when drawing a line. */
+    lineSymbol: SimpleLineSymbol;
+    /** Symbol to be used when drawing a point. */
+    markerSymbol: SimpleMarkerSymbol;
+    /**
+     * Creates a new instance of ImageServiceMeasureTool.
+     * @param params Constructor options.
+     */
+    constructor(params: esri.ImageServiceMeasureToolOptions);
+    /**
+     * Activates the toolbar for performing the measure operation.
+     * @param operation The mensuration rule to apply to the measure operation.
+     */
+    activate(operation: string): void;
+    /** Deactivates the toolbar. */
+    deactivate(): void;
+    /** Returns a list of measure operations supported by the image service. */
+    getSupportedMeasureOperations(): string[];
+    /** Returns a list of supported linear, angular and area units. */
+    getSupportedUnits(): string[];
+    /** Disables the tooltip message for performing a draw. */
+    hideDrawTooltip(): void;
+    /**
+     * Sets the angularUnit.
+     * @param unit The angular unit to set.
+     */
+    setAngularUnit(unit: string): void;
+    /**
+     * Sets the areaUnit.
+     * @param unit  Possible Values: esriSquareInches | esriSqudareFeet | esriSquareYards | esriAcres | esriSquareMiles | esriSquareMillimeters | esriSquareCentimeters | esriSquareDecimeters | esriSquareMeters | esriAres | esriHectares | esriSquareKilometers
+     */
+    setAreaUnit(unit: string): void;
+    /**
+     * Sets the fillSymbol.
+     * @param fillSymbol The fill symbol to set.
+     */
+    setFillSymbol(fillSymbol: SimpleFillSymbol): void;
+    /**
+     * Sets the linearUnit.
+     * @param unit The linear unit to set.
+     */
+    setLinearUnit(unit: string): void;
+    /**
+     * Sets the lineSymbol.
+     * @param lineSymbol The line symbol to set.
+     */
+    setLineSymbol(lineSymbol: SimpleLineSymbol): void;
+    /**
+     * Sets the markerSymbol.
+     * @param markerSymbol The marker symbol to set.
+     */
+    setMarkerSymbol(markerSymbol: SimpleMarkerSymbol): void;
+    /** Enables the tooltip message for performing a draw. */
+    showDrawTooltip(): void;
+    /** Fires when the drawing is complete. */
+    on(type: "draw-end", listener: (event: { geometry: Geometry; target: ImageServiceMeasureTool }) => void): esri.Handle;
+    /** Fires when the user starts drawing. */
+    on(type: "draw-start", listener: (event: { target: ImageServiceMeasureTool }) => void): esri.Handle;
+    /** Fires when the measure operation has been performed. */
+    on(type: "measure-end", listener: (event: { measureResult: any; target: ImageServiceMeasureTool }) => void): esri.Handle;
+    /** Fires when the unit has been changed. */
+    on(type: "unit-change", listener: (event: { measureResult: any; target: ImageServiceMeasureTool }) => void): esri.Handle;
+    on(type: string, listener: (event: any) => void): esri.Handle;
+  }
+  export = ImageServiceMeasureTool;
+}
+
 declare module "esri/toolbars/draw" {
   import esri = require("esri");
   import SimpleFillSymbol = require("esri/symbols/SimpleFillSymbol");
@@ -15823,7 +16745,7 @@ declare module "esri/units" {
     static POINTS: any;
     /** Units are square centimeters. */
     static SQUARE_CENTIMETERS: any;
-    /** Units are square deciemeters. */
+    /** Units are square decimeters. */
     static SQUARE_DECIMETERS: any;
     /** Units are square feet. */
     static SQUARE_FEET: any;
@@ -16013,34 +16935,18 @@ declare module "esri/workers/WorkerClient" {
      * Import any script or function into the worker.
      * @param paths An AMD require path to a script file to import.
      */
-    importScripts(paths: string): any;
-    /**
-     * Import any script or function into the worker.
-     * @param paths An AMD require path to a script file to import.
-     */
-    importScripts(paths: string[]): any;
+    importScripts(paths: string | string[]): any;
     /**
      * Posts a message to the worker.
      * @param msg The data to post to the worker.
      * @param transfers An optional array of transferable objects.
      */
-    postMessage(msg: any, transfers?: any[]): any;
-    /**
-     * Posts a message to the worker.
-     * @param msg The data to post to the worker.
-     * @param transfers An optional array of transferable objects.
-     */
-    postMessage(msg: any[], transfers?: any[]): any;
+    postMessage(msg: any | any[], transfers?: any[]): any;
     /**
      * Sets the worker that is used in the Worker Client.
      * @param paths An AMD require path to a script file to import.
      */
-    setWorker(paths: string): void;
-    /**
-     * Sets the worker that is used in the Worker Client.
-     * @param paths An AMD require path to a script file to import.
-     */
-    setWorker(paths: string[]): void;
+    setWorker(paths: string | string[]): void;
     /** Terminates the worker and cancels all unresolved messages. */
     terminate(): void;
   }
diff --git a/atom-keymap/.editorconfig b/atom-keymap/.editorconfig
new file mode 100644
index 0000000000..570211f898
--- /dev/null
+++ b/atom-keymap/.editorconfig
@@ -0,0 +1,3 @@
+[*.ts]
+indent_style = tab
+indent_size = 4
diff --git a/atom-keymap/atom-keymap-tests.ts b/atom-keymap/atom-keymap-tests.ts
new file mode 100644
index 0000000000..520327da9e
--- /dev/null
+++ b/atom-keymap/atom-keymap-tests.ts
@@ -0,0 +1,24 @@
+/// <reference path="./atom-keymap.d.ts" />
+
+import atomKeymap = require('atom-keymap');
+var KeymapManager = atomKeymap.KeymapManager;
+type ICompleteMatchEvent = AtomKeymap.ICompleteMatchEvent;
+// The import and type aliasing above can be done more concisely in TypeScript 1.5+:
+//import { KeymapManager, ICompleteMatchEvent } from "atom-keymap";
+
+var manager = new KeymapManager();
+manager.add('some/unique/path', {
+    '.workspace': {
+        'ctrl-x': 'package:do-something',
+        'ctrl-y': 'package:do-something-else'
+    },
+    '.mini.editor': {
+        'enter': 'core:confirm'
+    }
+});
+
+manager.onDidMatchBinding((event: ICompleteMatchEvent): void => {
+    console.log(event.binding.command);
+})
+
+manager.destroy();
diff --git a/atom-keymap/atom-keymap.d.ts b/atom-keymap/atom-keymap.d.ts
new file mode 100644
index 0000000000..355ea38afe
--- /dev/null
+++ b/atom-keymap/atom-keymap.d.ts
@@ -0,0 +1,135 @@
+// Type definitions for atom-keymap v5.1.5
+// Project: https://github.com/atom/atom-keymap/
+// Definitions by: Vadim Macagon <https://github.com/enlight/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../event-kit/event-kit.d.ts" />
+
+declare module AtomKeymap {
+	type Disposable = AtomEventKit.Disposable;
+
+	/** Instance side of KeyBinding class. */
+	interface KeyBinding {
+		enabled: boolean;
+		source: string;
+		command: string;
+		keystrokes: string;
+		keystrokeCount: number;
+		selector: string;
+		specificity: number;
+
+		matches(keystroke: string): boolean;
+		compare(keyBinding: KeyBinding): number;
+	}
+
+	interface ICompleteMatchEvent {
+		/** Keystrokes that matched the binding. */
+		keystrokes: string;
+		/** Binding that was matched to the keystrokes. */
+		binding: KeyBinding;
+		/** DOM element that was the target of the most recent `KeyboardEvent`. */
+		keyboardEventTarget: Element;
+	}
+
+	interface IPartialMatchEvent {
+		/** Keystrokes that matched the binding. */
+		keystrokes: string;
+		/** Bindings that were partially matched to the keystrokes. */
+		partiallyMatchedBindings: KeyBinding[];
+		/** DOM element that was the target of the most recent `KeyboardEvent`. */
+		keyboardEventTarget: Element;
+	}
+
+	interface IFailedMatchEvent {
+		/** Keystrokes that failed to match a binding. */
+		keystrokes: string;
+		/** DOM element that was the target of the most recent `KeyboardEvent`. */
+		keyboardEventTarget: Element;
+	}
+
+	interface IKeymapLoadEvent {
+		/** Path to a keymap file. */
+		path: string;
+	}
+
+  /** Static side of KeymapManager class. */
+  interface KeymapManagerStatic {
+    prototype: KeymapManager;
+    new (options?: { defaultTarget?: Element }): KeymapManager;
+  }
+
+	/** Instance side of KeymapManager class. */
+	interface KeymapManager {
+		constructor: KeymapManagerStatic;
+		/** Unwatches all watched paths. */
+		destroy(): void;
+
+		// Event Subscription
+
+		/** Sets callback to invoke when one or more keystrokes completely match a key binding. */
+		onDidMatchBinding(callback: (event: ICompleteMatchEvent) => void): Disposable;
+		/** Sets callback to invoke when one or more keystrokes partially match a binding. */
+		onDidPartiallyMatchBindings(callback: (event: IPartialMatchEvent) => void): Disposable;
+		/** Sets callback to invoke when one or more keystrokes fail to match any bindings. */
+		onDidFailToMatchBinding(callback: (event: IFailedMatchEvent) => void): Disposable;
+		/** Sets callback to invoke when a keymap file is reloaded. */
+		onDidReloadKeymap(callback: (event: IKeymapLoadEvent) => void): Disposable;
+		/** Sets callback to invoke when a keymap file is unloaded. */
+		onDidUnloadKeymap(callback: (event: IKeymapLoadEvent) => void): Disposable;
+		/** Sets callback to invoke when a keymap file could not to be loaded. */
+		onDidFailToReadFile(callback: (error: Error) => void): Disposable;
+
+		// Adding and Removing Bindings
+
+		/** Adds sets of key bindings grouped by CSS selector. */
+		add(source: string, keyBindingsBySelector: any): Disposable;
+
+		// Accessing Bindings
+
+		getKeyBindings(): KeyBinding[];
+		findKeyBindings(params?: {
+			keystrokes: string; // e.g. 'ctrl-x ctrl-s'
+			command: string; // e.g. 'editor:backspace'
+			target?: Element;
+		}): KeyBinding[];
+
+		// Managing Keymap Files
+
+		/**
+		 * Loads the key bindings from the given path.
+		 *
+		 * @param bindingsPath A path to a file or a directory. If the path is a directory all files
+		 *                     inside it will be loaded.
+		 */
+		loadKeymap(bindingsPath: string, options?: { watch: boolean }): void;
+		/**
+		 * Starts watching the given file/directory for changes, reloading any keymaps at that location
+		 * when changes are detected.
+		 *
+		 * @param filePath A path to a file or a directory.
+		 */
+		watchKeymap(filePath: string): void;
+
+		// Managing Keyboard Events
+
+		/**
+		 * Dispatches a custom event associated with the matching key binding for the given
+		 * `KeyboardEvent` if one can be found.
+		 */
+		handleKeyboardEvent(event: KeyboardEvent): void;
+		/** Translates a keydown event to a keystroke string. */
+		keystrokeForKeyboardEvent(event: KeyboardEvent): string;
+		/**
+		 * @return The number of milliseconds allowed before pending states caused by partial matches of
+		 *         multi-keystroke bindings are terminated.
+		 */
+		getPartialMatchTimeout(): number;
+	}
+
+	/** Allows commands to be associated with keystrokes in a context-sensitive way.*/
+	var KeymapManager: KeymapManagerStatic;
+}
+
+declare module 'atom-keymap' {
+	export = AtomKeymap;
+}
diff --git a/auth0/auth0.d.ts b/auth0/auth0.d.ts
index 5d3149ead4..cefc35b99a 100644
--- a/auth0/auth0.d.ts
+++ b/auth0/auth0.d.ts
@@ -15,7 +15,7 @@ interface Location {
 
 /** This is the interface for the main Auth0 client. */
 interface Auth0Static {
-    
+
     new(options: Auth0ClientOptions): Auth0Static;
     changePassword(options: any, callback?: Function): void;
     decodeJwt(jwt: string): any;
@@ -40,7 +40,7 @@ interface Auth0ClientOptions {
     callbackOnLoactionHash?: boolean;
     domain: string;
     forceJSONP?: boolean;
-} 
+}
 
 /** Represents a normalized UserProfile. */
 interface Auth0UserProfile {
@@ -128,6 +128,6 @@ interface Auth0DelegationToken {
 
 declare var Auth0: Auth0Static;
 
-declare module "Auth0" {
+declare module "auth0" {
     export = Auth0
 }
diff --git a/backbone/backbone.d.ts b/backbone/backbone.d.ts
index 9d54361d5e..275dba237b 100644
--- a/backbone/backbone.d.ts
+++ b/backbone/backbone.d.ts
@@ -181,8 +181,8 @@ declare module Backbone {
         comparator(element: TModel): number;
         comparator(compare: TModel, to?: TModel): number;
 
-        add(model: TModel, options?: AddOptions): Collection<TModel>;
-        add(models: TModel[], options?: AddOptions): Collection<TModel>;
+        add(model: {}|TModel, options?: AddOptions): TModel;
+        add(models: ({}|TModel)[], options?: AddOptions): TModel[];
         at(index: number): TModel;
         /**
          * Get a model from a collection, specified by an id, a cid, or by passing in a model.
diff --git a/blob-stream/blob-stream-tests.ts b/blob-stream/blob-stream-tests.ts
new file mode 100644
index 0000000000..fab0932068
--- /dev/null
+++ b/blob-stream/blob-stream-tests.ts
@@ -0,0 +1,7 @@
+/// <reference path="./blob-stream.d.ts" />
+/// <reference path="../node/node.d.ts" />
+
+var bl = require('blob-stream');
+
+var blob = bl.toBlob();
+var brl = bl.toBlobURL("app/JSON");
diff --git a/blob-stream/blob-stream.d.ts b/blob-stream/blob-stream.d.ts
new file mode 100644
index 0000000000..b55cd13c6f
--- /dev/null
+++ b/blob-stream/blob-stream.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for blob-stream v0.1.3
+// Project: https://github.com/devongovett/blob-stream
+// Definitions by: Eric Hillah <https://github.com/erichillah>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare function BlobStream(): BlobStream.IBlobStream;
+
+declare module BlobStream {
+
+    interface IBlobStream extends NodeJS.WritableStream{
+        toBlob(type?: string): Blob;
+        toBlobURL(type?: string): string;
+    }
+}
+
+declare module "blob-stream" {
+    export = BlobStream;
+}
diff --git a/bootstrap.v3.datetimepicker/boostrap.v3.datetimepicker-tests.ts b/bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
similarity index 100%
rename from bootstrap.v3.datetimepicker/boostrap.v3.datetimepicker-tests.ts
rename to bootstrap.v3.datetimepicker/bootstrap.v3.datetimepicker-tests.ts
diff --git a/browserify/browserify.d.ts b/browserify/browserify.d.ts
index 2289d2165a..c301df51eb 100644
--- a/browserify/browserify.d.ts
+++ b/browserify/browserify.d.ts
@@ -6,7 +6,7 @@
 /// <reference path="../node/node.d.ts" />
 
 interface BrowserifyObject extends NodeJS.EventEmitter {
-  add(file:string): BrowserifyObject;
+  add(file:string, opts?:any): BrowserifyObject;
   require(file:string, opts?:{
     expose: string;
   }): BrowserifyObject;
@@ -18,10 +18,10 @@ interface BrowserifyObject extends NodeJS.EventEmitter {
     insertGlobalVars?: any;
   }, cb?:(err:any, src:any) => void): NodeJS.ReadableStream;
 
-  external(file:string): BrowserifyObject;
-  ignore(file:string): BrowserifyObject;
-  transform(tr:string): BrowserifyObject;
-  transform(tr:Function): BrowserifyObject;
+  external(file:string, opts?:any): BrowserifyObject;
+  ignore(file:string, opts?:any): BrowserifyObject;
+  transform(tr:string, opts?:any): BrowserifyObject;
+  transform(tr:Function, opts?:any): BrowserifyObject;
   plugin(plugin:string, opts?:any): BrowserifyObject;
   plugin(plugin:Function, opts?:any): BrowserifyObject;
 }
diff --git a/codemirror/codemirror-tests.ts b/codemirror/codemirror-tests.ts
index d81838ba95..d0da7f5228 100644
--- a/codemirror/codemirror-tests.ts
+++ b/codemirror/codemirror-tests.ts
@@ -16,3 +16,33 @@ var myCodeMirror4: CodeMirror.Editor = CodeMirror.fromTextArea(myTextArea);
 
 var doc: CodeMirror.Doc = new CodeMirror.Doc('text');
 var doc2: CodeMirror.Doc = CodeMirror(document.body).getDoc();
+
+var lintStateOptions: CodeMirror.LintStateOptions = {
+    async: true,
+    hasGutters: true
+};
+
+var lintOptions: CodeMirror.LintOptions = {
+    async: true,
+    hasGutters: true,
+    getAnnotations: (content: string,
+                     updateLintingCallback: CodeMirror.UpdateLintingCallback,
+                     options: CodeMirror.LintStateOptions,
+                     codeMirror: CodeMirror.Editor) => {}
+};
+
+var updateLintingCallback: CodeMirror.UpdateLintingCallback = (codeMirror: CodeMirror.Editor,
+                                                               annotations: CodeMirror.Annotation[]) => {};
+
+var annotation: CodeMirror.Annotation = {
+    from: {
+        ch: 0,
+        line: 0
+    },
+    to: {
+        ch: 1,
+        line: 0
+    },
+    message: "test",
+    severity: "warning"
+};
diff --git a/codemirror/codemirror.d.ts b/codemirror/codemirror.d.ts
index 65692cf1c1..4b0a7ca6d4 100644
--- a/codemirror/codemirror.d.ts
+++ b/codemirror/codemirror.d.ts
@@ -761,7 +761,10 @@ declare module CodeMirror {
         This affects the amount of updates needed when scrolling, and the amount of work that such an update does.
         You should usually leave it at its default, 10. Can be set to Infinity to make sure the whole document is always rendered,
         and thus the browser's text search works on it. This will have bad effects on performance of big documents. */
-        viewportMargin?: number;
+        viewportMargin?: number;
+
+        /** Optional lint configuration to be used in conjunction with CodeMirror's linter addon. */
+        lint?: LintOptions;
     }
 
     interface TextMarkerOptions {
@@ -1004,6 +1007,48 @@ declare module CodeMirror {
      * Both modes get to parse all of the text, but when both assign a non-null style to a piece of code, the overlay wins, unless
      * the combine argument was true and not overridden, or state.overlay.combineTokens was true, in which case the styles are combined.
      */
-    function overlayMode<T, S>(base: Mode<T>, overlay: Mode<S>, combine?: boolean): Mode<any>
-
+    function overlayMode<T, S>(base: Mode<T>, overlay: Mode<S>, combine?: boolean): Mode<any>
+
+    /**
+     * async specifies that the lint process runs asynchronously. hasGutters specifies that lint errors should be displayed in the CodeMirror
+     * gutter, note that you must use this in conjunction with [ "CodeMirror-lint-markers" ] as an element in the gutters argument on
+     * initialization of the CodeMirror instance.
+     */
+    interface LintStateOptions {
+        async: boolean;
+        hasGutters: boolean;
+    }
+
+    /**
+     * Adds the getAnnotations callback to LintStateOptions which may be overridden by the user if they choose use their own
+     * linter.
+     */
+    interface LintOptions extends LintStateOptions {
+        getAnnotations: AnnotationsCallback;
+    }
+
+    /**
+     * A function that calls the updateLintingCallback with any errors found during the linting process.
+     */
+    interface AnnotationsCallback {
+        (content: string, updateLintingCallback: UpdateLintingCallback, options: LintStateOptions, codeMirror: Editor): void;
+    }
+
+    /**
+     * A function that, given an array of annotations, updates the CodeMirror linting GUI with those annotations
+     */
+    interface UpdateLintingCallback {
+        (codeMirror: Editor, annotations: Annotation[]): void;
+    }
+
+    /**
+     * An annotation contains a description of a lint error, detailing the location of the error within the code, the severity of the error,
+     * and an explaination as to why the error was thrown.
+     */
+    interface Annotation {
+        from: Position;
+        message?: string;
+        severity?: string;
+        to?: Position;
+    }
 }
diff --git a/contextjs/contextjs-tests.ts b/contextjs/contextjs-tests.ts
new file mode 100644
index 0000000000..7d54e80e68
--- /dev/null
+++ b/contextjs/contextjs-tests.ts
@@ -0,0 +1,16 @@
+import context = require("contextjs");
+
+context.init();
+
+context.settings({compress: true});
+
+context.attach('#test', [
+  {header: 'header 1'},
+  {divider: true},
+  {text:'foobar', submenu: [
+    {text:'sub1'},
+    {text:'sub2'}
+  ]}
+]);
+
+context.destroy('#test');
diff --git a/contextjs/contextjs.d.ts b/contextjs/contextjs.d.ts
new file mode 100644
index 0000000000..7d1ebb21ed
--- /dev/null
+++ b/contextjs/contextjs.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for contextjs 2.1.1
+// Project: https://github.com/jakiestfu/Context.js
+// Definitions by: Kern Handa <https://github.com/kernhanda>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "contextjs" {
+    interface MenuObject {
+        action?: (e: Event) => void;
+        divider?: boolean;
+        header?: string;
+        href?: string;
+        subMenu?: MenuObject[];
+        target?: string;
+        text?: string;
+    }
+
+    interface InitSettings {
+        above?: string | boolean;
+        compress?: boolean;
+        fadeSpeed?: number;
+        filter?: (e: Element) => void;
+        preventDoubleContext?: boolean;
+    }
+
+    module context {
+      function init(settings?: InitSettings): void;
+      function destroy(selector: any): void;
+      function attach(selector: any, menuObjects: MenuObject[]): void;
+      function settings(settings: InitSettings): void;
+    }
+
+    export = context;
+}
diff --git a/cson/cson-test.cson b/cson/cson-test.cson
new file mode 100644
index 0000000000..a69eb2ef58
--- /dev/null
+++ b/cson/cson-test.cson
@@ -0,0 +1 @@
+hello: 'world'
diff --git a/cson/cson-test.json b/cson/cson-test.json
new file mode 100644
index 0000000000..56c8e28033
--- /dev/null
+++ b/cson/cson-test.json
@@ -0,0 +1 @@
+{"hello": "world"}
diff --git a/cson/cson-tests.ts b/cson/cson-tests.ts
new file mode 100644
index 0000000000..62e7f064df
--- /dev/null
+++ b/cson/cson-tests.ts
@@ -0,0 +1,36 @@
+/// <reference path="cson.d.ts" />
+
+import cson = require('cson');
+
+var data: string = cson.stringify({hello: 'world'});
+console.log('cson.stringify => %s', data);
+
+data = cson.createString({hello: 'world'});
+console.log('cson.createString => %s', data);
+
+data = cson.createJSONString({hello: 'world'});
+console.log('cson.createJSONString => %s', data);
+
+data = cson.createCSONString({hello: 'world'});
+console.log('cson.createCSONString => %s', data);
+
+var obj: Object = cson.parse(data);
+console.log('cson.parse => %s', JSON.stringify(obj));
+
+obj = cson.parseCSONString(data);
+console.log('cson.parseCSONString => %s', JSON.stringify(obj));
+
+obj = cson.parseJSONString('{"hello": "world"}');
+console.log('cson.parseJSONString => %s', JSON.stringify(obj));
+
+obj = cson.parseString("hello: 'world'");
+console.log('cson.parseString => %s', JSON.stringify(obj));
+
+obj = cson.load('cson-test.cson');
+console.log('cson.load => %s', JSON.stringify(obj));
+
+obj = cson.parseCSONFile('cson-test.cson');
+console.log('cson.parseCSONFile => %s', JSON.stringify(obj));
+
+obj = cson.parseJSONFile('cson-test.json');
+console.log('cson.parseJSONFile => %s', JSON.stringify(obj));
diff --git a/cson/cson.d.ts b/cson/cson.d.ts
new file mode 100644
index 0000000000..ca7d2faed5
--- /dev/null
+++ b/cson/cson.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for CSON
+// Project: https://github.com/bevry/cson
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "cson" {
+	// Create Strings
+	export function stringify(data: Object, opts?: Object, indent?: any): string;
+	export function createCSONString(data: Object, opts?: Object, next?: any): string;
+	export function createJSONString(data: Object, opts?: Object, next?: any): string;
+	export function createString(data: Object, opts?: Object, next?: any): string;
+
+	// Parse Strings
+	export function parse(data: string, opts?: Object, next?: any): Object;
+	export function parseCSONString(data: string, opts?: Object, next?: any): Object;
+	export function parseJSONString(data: string, opts?: Object, next?: any): Object;
+	export function parseCSString(data: string, opts?: Object, next?: any): Object;
+	export function parseJSString(data: string, opts?: Object, next?: any): Object;
+	export function parseString(data: string, opts?: Object, next?:any): Object;
+
+	// Parse Files
+	export function load(filePath: string, opts?: Object, next?: any): Object;
+	export function parseCSONFile(filePath: string, opts?: Object, next?: any): Object;
+	export function parseJSONFile(filePath: string, opts?: Object, next?: any): Object;
+	export function parseCSFile(filePath: string, opts?: Object, next?: any): Object;
+	export function parseJSFile(filePath: string, opts?: Object, next?: any): Object;
+
+	// Require Files
+	export function requireCSFile(filePath: string, opts?: Object, next?: any): Object;
+	export function requireJSFile(filePath: string, opts?: Object, next?: any): Object;
+	export function requireFile(filePath: string, opts?: Object, next?: any): Object;
+}
diff --git a/d3/d3-tests.ts b/d3/d3-tests.ts
index a0c2d03120..d087c78768 100644
--- a/d3/d3-tests.ts
+++ b/d3/d3-tests.ts
@@ -2677,4 +2677,17 @@ function testD3Events () {
                 console.log('shift + ' + d3.event.which);
             }
         });
+}
+
+function testD3MutlieTimeFormat() {
+    var format = d3.time.format.multi([
+        [".%L", function(d) { return d.getMilliseconds(); }],
+        [":%S", function(d) { return d.getSeconds(); }],
+        ["%I:%M", function(d) { return d.getMinutes(); }],
+        ["%I %p", function(d) { return d.getHours(); }],
+        ["%a %d", function(d) { return d.getDay() && d.getDate() != 1; }],
+        ["%b %d", function(d) { return d.getDate() != 1; }],
+        ["%B", function(d) { return d.getMonth(); }],
+        ["%Y", function() { return true; }]
+    ]);
 }
\ No newline at end of file
diff --git a/d3/d3.d.ts b/d3/d3.d.ts
index 14e2e26e5b..37719a5f49 100644
--- a/d3/d3.d.ts
+++ b/d3/d3.d.ts
@@ -386,7 +386,7 @@ declare module d3 {
             /**
              * Returns the first non-null element in the selection, or null otherwise.
              */
-            node(): EventTarget;
+            node(): Node;
 
             /**
              * Returns the total number of elements in the selection.
@@ -1780,7 +1780,7 @@ declare module d3 {
         export function format(specifier: string): Format;
 
         export module format {
-            export function multi(formats: Array<[string, (d: Date) => boolean]>): Format;
+            export function multi(formats: Array<[string, (d: Date) => boolean|number]>): Format;
             export function utc(specifier: string): Format;
             export var iso: Format;
         }
@@ -2720,6 +2720,7 @@ declare module d3 {
         timeFormat: {
             (specifier: string): time.Format;
             utc(specifier: string): time.Format;
+            multi(formats: Array<[string, (d: Date) => boolean|number]>): time.Format;
         }
     }
 
diff --git a/deep-diff/deep-diff.d.ts b/deep-diff/deep-diff.d.ts
index 93e99f7895..4242731f27 100644
--- a/deep-diff/deep-diff.d.ts
+++ b/deep-diff/deep-diff.d.ts
@@ -34,7 +34,7 @@ declare module deepDiff {
     }
 }
 
-declare var diff: deepDiff.IDeepDiff;
+declare var DeepDiff: deepDiff.IDeepDiff;
 
 declare module "deep-diff" {
     var diff: deepDiff.IDeepDiff;
diff --git a/easy-api-request/easy-api-request-tests.ts b/easy-api-request/easy-api-request-tests.ts
new file mode 100644
index 0000000000..38a4b68ddb
--- /dev/null
+++ b/easy-api-request/easy-api-request-tests.ts
@@ -0,0 +1,44 @@
+/**
+ * Created by karl on 14/07/15.
+ */
+
+/// <reference path="../express/express.d.ts" />
+/// <reference path="./easy-api-request.d.ts" />
+
+import express = require('express');
+import APIRequest = require('easy-api-request');
+
+APIRequest.create({
+    name: 'testAPI',
+    config: {
+        url: 'http://example.com'
+    }
+});
+
+var app = express();
+
+app.get('/', function (req:any, res:express.Response) {
+    var rMaker = <APIRequest.RequestMaker>req.testAPI;
+    var r = rMaker();
+    r.get('/', function (err, resp) {
+        if(err) {
+            console.error(err);
+        }
+        res.json(err || resp);
+    });
+});
+
+app.get('/', function (req:any, res:express.Response) {
+    var rMaker = <APIRequest.RequestMaker>req.testAPI;
+    var r = rMaker();
+    r.get('/')
+        .then(function (resp) {
+            res.json(resp);
+        })
+        .catch(function (err){
+            if(err) {
+                console.error(err);
+            }
+            res.json(err);
+        });
+});
diff --git a/easy-api-request/easy-api-request.d.ts b/easy-api-request/easy-api-request.d.ts
new file mode 100644
index 0000000000..61bc79142f
--- /dev/null
+++ b/easy-api-request/easy-api-request.d.ts
@@ -0,0 +1,115 @@
+// Type definitions for easy-api-request
+// Project: https://github.com/DeadAlready/easy-api-request
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../q/Q.d.ts" />
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../request/request.d.ts" />
+/// <reference path="../bunyan/bunyan.d.ts" />
+/// <reference path="../express/express.d.ts" />
+
+declare module "easy-api-request" {
+    import stream = require('stream');
+    import http = require('http');
+    import request = require('request');
+    import bunyan = require('bunyan');
+    import express = require('express');
+
+    export function create(opts: {
+        name: any;
+        config: {
+            url: string;
+            internal?: boolean;
+            headers?: string[];
+            cookies?: string[];
+            replyCookies?: string[];
+            jSend?: boolean;
+            opts?: Object;
+        };
+    }): void;
+
+    import Q = require('q');
+    interface Result {
+        response: http.IncomingMessage;
+        body: any;
+        err?: any;
+        data?: any;
+    }
+    class BaseRequest {
+        protected base: request.Request;
+        protected req: express.Request;
+        protected log: bunyan.Logger;
+        protected replyCookies: string[];
+        protected jSend: boolean;
+        constructor(opts: any);
+        _parseOptions(args: IArguments, type: string): {
+            opts: any;
+            cb: any;
+        };
+        _do(args: IArguments, type?: string): any;
+        _request(opts?: any, cb?:any): any;
+
+        get(url?: any, opts?: any, cb?: any): any;
+        post(url?: any, opts?: any, cb?: any): any;
+        patch(url?: any, opts?: any, cb?: any): any;
+        del(url?: any, opts?: any, cb?: any): any;
+    }
+
+    class StreamRequest extends BaseRequest {
+        _request(opts: Object): stream.Stream;
+
+        get(url: string, params: Object): stream.Stream;
+        get(opts: Object): stream.Stream;
+        get(url: string): stream.Stream;
+
+        post(url: string, params: Object): stream.Stream;
+        post(opts: Object): stream.Stream;
+        post(url: string): stream.Stream;
+
+        patch(url: string, params: Object): stream.Stream;
+        patch(opts: Object): stream.Stream;
+        patch(url: string): stream.Stream;
+
+        del(url: string, params: Object): stream.Stream;
+        del(opts: Object): stream.Stream;
+        del(url: string): stream.Stream;
+    }
+
+    class CBPromiseRequest extends BaseRequest {
+        _request(opts: Object): stream.Stream;
+
+        get(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
+        get(url: string, cb:(err?:any, resp?: Result) => void): void;
+        get(opts: Object, cb:(err?:any, resp?: Result) => void): void;
+        get(url: string, params: Object): Q.Promise<Result>;
+        get(opts: Object): Q.Promise<Result>;
+        get(url: string): Q.Promise<Result>;
+
+        post(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
+        post(url: string, cb:(err?:any, resp?: Result) => void): void;
+        post(opts: Object, cb:(err?:any, resp?: Result) => void): void;
+        post(url: string, params: Object): Q.Promise<Result>;
+        post(opts: Object): Q.Promise<Result>;
+        post(url: string): Q.Promise<Result>;
+
+        patch(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
+        patch(url: string, cb:(err?:any, resp?: Result) => void): void;
+        patch(opts: Object, cb:(err?:any, resp?: Result) => void): void;
+        patch(url: string, params: Object): Q.Promise<Result>;
+        patch(opts: Object): Q.Promise<Result>;
+        patch(url: string): Q.Promise<Result>;
+
+        del(url: string, params: Object, cb:(err?:any, resp?: Result) => void): void;
+        del(url: string, cb:(err?:any, resp?: Result) => void): void;
+        del(opts: Object, cb:(err?:any, resp?: Result) => void): void;
+        del(url: string, params: Object): Q.Promise<Result>;
+        del(opts: Object): Q.Promise<Result>;
+        del(url: string): Q.Promise<Result>;
+    }
+
+    export interface RequestMaker {
+        (): CBPromiseRequest;
+        (stream: boolean): StreamRequest | CBPromiseRequest;
+    }
+}
diff --git a/easy-jsend/easy-jsend-tests.ts b/easy-jsend/easy-jsend-tests.ts
new file mode 100644
index 0000000000..9d7814254d
--- /dev/null
+++ b/easy-jsend/easy-jsend-tests.ts
@@ -0,0 +1,49 @@
+/// <reference path="./easy-jsend.d.ts" />
+/// <reference path="../mongoose/mongoose.d.ts" />
+
+import mongoose = require('mongoose');
+import express = require('express');
+import jSend = require('easy-jsend');
+
+var schema = new mongoose.Schema({
+    name: {type: String}
+});
+
+var Model = mongoose.model('model', schema);
+
+jSend.init({partial: true});
+
+var app = express();
+
+app.get('/success', function (req, res, next) {
+    res.success('Success');
+});
+
+app.get('/fail', function (req, res, next) {
+    res.fail('fail');
+});
+
+app.get('/error', function (req, res, next) {
+    res.error('error');
+});
+
+app.get('/partial', function (req, res, next) {
+    res.partial({
+        offset: 10,
+        limit: 50,
+        count: 100,
+        data: []
+    });
+});
+
+app.get('/partial', function (req, res, next) {
+    res.makePartial({
+        model: Model,
+        search: {},
+        opts: {
+            limit: 30,
+            skip: 10
+        },
+        result: []
+    });
+});
\ No newline at end of file
diff --git a/easy-jsend/easy-jsend.d.ts b/easy-jsend/easy-jsend.d.ts
new file mode 100644
index 0000000000..b45fbdac73
--- /dev/null
+++ b/easy-jsend/easy-jsend.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for easy-jsend
+// Project: https://github.com/DeadAlready/easy-jsend
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../express/express.d.ts" />
+
+declare module Express {
+
+    interface MakePartialInput {
+        model:any;
+        opts: {
+            limit: number;
+            skip: number;
+        };
+        search: Object;
+        result: any;
+    }
+
+    interface PartialInput {
+        limit?: number;
+        offset: number;
+        count: number;
+        data: any;
+    }
+
+    export interface Response {
+        success (data?: any, status?: number): void;
+        fail (data: any, status?: number): void;
+        error (err: any, status?: number): void;
+        partial? (data: PartialInput, status?: number): void;
+        makePartial? (data: MakePartialInput): void;
+    }
+}
+
+declare module "easy-jsend" {
+    export function init(conf?:{partial:boolean}): void;
+}
diff --git a/easy-x-headers/easy-x-headers-tests.ts b/easy-x-headers/easy-x-headers-tests.ts
new file mode 100644
index 0000000000..9a306ea6ae
--- /dev/null
+++ b/easy-x-headers/easy-x-headers-tests.ts
@@ -0,0 +1,16 @@
+/**
+ * Created by karl on 14/07/15.
+ */
+
+/// <reference path="../express/express.d.ts" />
+/// <reference path="./easy-x-headers.d.ts" />
+
+import express = require('express');
+import xHeaders = require('easy-x-headers');
+
+var app = express();
+app.use(xHeaders.getMiddleware());
+
+app.get('/', function (req, res) {
+    res.json(req.info);
+});
diff --git a/easy-x-headers/easy-x-headers.d.ts b/easy-x-headers/easy-x-headers.d.ts
new file mode 100644
index 0000000000..4158654ed2
--- /dev/null
+++ b/easy-x-headers/easy-x-headers.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for easy-x-headers
+// Project: https://github.com/DeadAlready/easy-x-headers
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../express/express.d.ts" />
+
+declare module Express {
+    export interface Request {
+        info: any;
+    }
+}
+
+declare module "easy-x-headers" {
+    import express = require('express');
+
+    export function getMiddleware(defaults?: Object): express.RequestHandler;
+}
diff --git a/easy-xapi-supertest/easy-xapi-supertest-tests.ts b/easy-xapi-supertest/easy-xapi-supertest-tests.ts
new file mode 100644
index 0000000000..5b43ce0614
--- /dev/null
+++ b/easy-xapi-supertest/easy-xapi-supertest-tests.ts
@@ -0,0 +1,27 @@
+/**
+ * Created by karl on 14/07/15.
+ */
+
+/// <reference path="../express/express.d.ts" />
+/// <reference path="./easy-xapi-supertest.d.ts" />
+
+import express = require('express');
+import eSupertest = require('easy-xapi-supertest');
+
+var app = express();
+
+var getAgent = eSupertest.getAgentFactory(app);
+
+var agent = getAgent({
+    user: 'Jack',
+    role: 'user'
+});
+
+var getAgent2 = eSupertest.getAgentFactory(app, function (user:string, role?:string) {
+    return {
+        user: user,
+        role: role || 'user'
+    }
+});
+
+var agent = getAgent2('Jack');
diff --git a/easy-xapi-supertest/easy-xapi-supertest.d.ts b/easy-xapi-supertest/easy-xapi-supertest.d.ts
new file mode 100644
index 0000000000..4ea936976c
--- /dev/null
+++ b/easy-xapi-supertest/easy-xapi-supertest.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for easy-x-headers
+// Project: https://github.com/DeadAlready/easy-x-headers
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../express/express.d.ts" />
+
+declare module "easy-xapi-supertest" {
+    import express = require('express');
+
+    export interface BodyAgent {
+        send(data: Object): any;
+        attach(arg1: any, arg2?: any): any;
+    }
+
+    export interface Agent {
+        get(url:string): any;
+        delete(url:string): any;
+        post(url:string): BodyAgent;
+        patch(url:string): BodyAgent;
+        put(url:string): BodyAgent;
+    }
+
+    interface getAgent {
+        (...args:any[]): Agent
+    }
+
+    export function getAgentFactory(app: express.Application, transform?: Function): getAgent;
+}
diff --git a/easy-xapi/easy-xapi-tests.ts b/easy-xapi/easy-xapi-tests.ts
new file mode 100644
index 0000000000..70c5351d4c
--- /dev/null
+++ b/easy-xapi/easy-xapi-tests.ts
@@ -0,0 +1,32 @@
+/**
+ * Created by karl on 14/07/15.
+ */
+
+/// <reference path="../express/express.d.ts" />
+/// <reference path="./easy-xapi.d.ts" />
+
+import express = require('express');
+import eXapi = require('easy-xapi');
+
+eXapi.init({
+    jSend: {
+        partial: true
+    }
+});
+
+var xApi = eXapi.create({
+    root: __dirname,
+    log: {
+        name: 'Log',
+        level: 'info'
+    },
+    port: 3000,
+    name: 'test',
+    mount: function (app) {
+        app.get('/', function (req, res) {
+            res.send('ok');
+        });
+    }
+});
+
+xApi.listen();
diff --git a/easy-xapi/easy-xapi.d.ts b/easy-xapi/easy-xapi.d.ts
new file mode 100644
index 0000000000..25d95b432b
--- /dev/null
+++ b/easy-xapi/easy-xapi.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for easy-xapi
+// Project: https://github.com/DeadAlready/easy-xapi
+// Definitions by: Karl Düüna <https://github.com/DeadAlready/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../express/express.d.ts" />
+/// <reference path="../easy-jsend/easy-jsend.d.ts" />
+/// <reference path="../bunyan/bunyan.d.ts" />
+
+declare module Express {
+    export interface Request {
+        log: any;
+    }
+}
+
+declare module "easy-xapi" {
+    import express = require('express');
+    import http = require('http');
+    import bunyan = require('bunyan');
+
+    interface InitConfig {
+        jSend?: {partial: boolean};
+    }
+
+    interface Config {
+        root: string;
+        port: number;
+        name: string;
+        xHeaderDefaults?: Object;
+        log: {
+            name: string;
+            level: string
+        }
+        mount: (app: express.Application) => void
+    }
+
+    interface Result {
+        express: any;
+        app: express.Application;
+        server: http.Server;
+        log: bunyan.Logger;
+        listen: () => void;
+    }
+
+    export function init(conf: InitConfig): void;
+    export function create(conf: Config): Result;
+}
diff --git a/event-kit/.editorconfig b/event-kit/.editorconfig
new file mode 100644
index 0000000000..570211f898
--- /dev/null
+++ b/event-kit/.editorconfig
@@ -0,0 +1,3 @@
+[*.ts]
+indent_style = tab
+indent_size = 4
diff --git a/event-kit/event-kit-tests.ts b/event-kit/event-kit-tests.ts
new file mode 100644
index 0000000000..2c759506a2
--- /dev/null
+++ b/event-kit/event-kit-tests.ts
@@ -0,0 +1,65 @@
+/// <reference path="./event-kit.d.ts" />
+
+// The following line only works in TypeScript 1.5
+//import { Disposable, CompositeDisposable, Emitter } from "event-kit";
+// DefinitelyTyped is still using TypeScript 1.4 to run tests
+// so until they upgrade we have to do the following instead
+import eventKit = require('event-kit');
+type Disposable = AtomEventKit.Disposable;
+var Disposable = eventKit.Disposable;
+type CompositeDisposable = AtomEventKit.CompositeDisposable;
+var CompositeDisposable = eventKit.CompositeDisposable;
+type Emitter = AtomEventKit.Emitter;
+var Emitter = eventKit.Emitter;
+
+// Emitter
+
+class User {
+	private emitter: Emitter;
+	name: string;
+
+	constructor() {
+		this.emitter = new Emitter();
+	}
+
+	onDidChangeName(callback: (name: string) => void): Disposable {
+		return this.emitter.on('did-change-name', callback);
+	}
+
+	setName(name: string): void {
+		if (this.name != name) {
+			this.name = name;
+			this.emitter.emit('did-change-name', name);
+		}
+	}
+
+	destroy(): void {
+		this.emitter.dispose();
+	}
+}
+
+// Disposable
+
+var disposable = new Disposable(() => {
+	// cleanup
+});
+disposable.dispose();
+
+var user = new User();
+var subscription = user.onDidChangeName((name: string) => {
+	console.log('User name change to: ' + name);
+});
+subscription.dispose();
+
+// CompositeDisposable
+
+var subscriptions = new CompositeDisposable();
+subscriptions.add(
+	user.onDidChangeName((name: string) => {
+		console.log('subscriber #1');
+	}),
+	user.onDidChangeName((name: string) => {
+		console.log('subscriber #2');
+	})
+);
+subscriptions.dispose();
diff --git a/event-kit/event-kit.d.ts b/event-kit/event-kit.d.ts
new file mode 100644
index 0000000000..6363edf1cd
--- /dev/null
+++ b/event-kit/event-kit.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for event-kit v1.2.0
+// Project: https://github.com/atom/event-kit
+// Definitions by: Vadim Macagon <https://github.com/enlight/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module AtomEventKit {
+	interface IDisposable {
+		dispose(): void;
+	}
+
+	/** Static side of the Disposable class. */
+	interface DisposableStatic {
+		prototype: Disposable;
+		new (disposalAction: Function): Disposable;
+	}
+
+	/** Instance side of the Disposable class. */
+	interface Disposable extends IDisposable {
+		disposed: boolean;
+
+		constructor: DisposableStatic;
+	}
+
+	/** A class that represent a handle to a resource that can be disposed. */
+	var Disposable: DisposableStatic;
+
+	/** Static side of the CompositeDisposable class. */
+	interface CompositeDisposableStatic {
+		prototype: CompositeDisposable;
+		new (...disposables: IDisposable[]): CompositeDisposable;
+	}
+
+	/** Instance side of the CompositeDisposable class. */
+	interface CompositeDisposable extends IDisposable {
+		disposed: boolean;
+
+		constructor: CompositeDisposableStatic;
+		add(...disposables: IDisposable[]): void;
+		remove(disposable: IDisposable): void;
+		clear(): void;
+	}
+
+	/**
+	 * A class that aggregates multiple [[Disposable]] instances together into a single disposable,
+	 * so that they can all be disposed as a group.
+	 */
+	var CompositeDisposable: CompositeDisposableStatic;
+
+	/** Static side of the Emitter class. */
+	interface EmitterStatic {
+		prototype: Emitter;
+		new (): Emitter;
+	}
+
+	/** Instance side of the Emitter class. */
+	interface Emitter {
+		isDisposed: boolean;
+
+		constructor: EmitterStatic;
+		dispose(): void;
+		/**
+		* Registers a handler to be invoked whenever the given event is emitted.
+		* @return An object that will unregister the handler when disposed.
+		*/
+		on(eventName: string, handler: (value: any) => void, unshift?: boolean): Disposable;
+		/**
+		* Registers a handler to be invoked *before* all previously registered handlers for
+		* the given event.
+		* @return An object that will unregister the handler when disposed.
+		*/
+		preempt(eventName: string, handler: (value: any) => void): Disposable;
+		/** Invokes any registered handlers for the given event. */
+		emit(eventName: string, value: any): void;
+	}
+
+	/** A utility class for implementing event-based APIs. */
+	var Emitter: EmitterStatic;
+}
+
+declare module "event-kit" {
+	export = AtomEventKit;
+}
diff --git a/firebase/firebase.d.ts b/firebase/firebase.d.ts
index f3c53b3ce8..6302336e12 100644
--- a/firebase/firebase.d.ts
+++ b/firebase/firebase.d.ts
@@ -306,6 +306,10 @@ interface FirebaseStatic {
 }
 declare var Firebase: FirebaseStatic;
 
+declare module 'firebase' {
+	export = Firebase;
+}
+
 // Reference: https://www.firebase.com/docs/web/api/firebase/getauth.html
 interface FirebaseAuthData {
 	uid: string;
diff --git a/first-mate/.editorconfig b/first-mate/.editorconfig
new file mode 100644
index 0000000000..570211f898
--- /dev/null
+++ b/first-mate/.editorconfig
@@ -0,0 +1,3 @@
+[*.ts]
+indent_style = tab
+indent_size = 4
diff --git a/first-mate/first-mate-tests.ts b/first-mate/first-mate-tests.ts
new file mode 100644
index 0000000000..1a181de4a9
--- /dev/null
+++ b/first-mate/first-mate-tests.ts
@@ -0,0 +1,15 @@
+/// <reference path="./first-mate.d.ts" />
+
+import firstMate = require('first-mate');
+var GrammarRegistry = firstMate.GrammarRegistry;
+var Grammar = firstMate.GrammarRegistry;
+type IToken = AtomFirstMate.IToken;
+// The import and type aliasing above can be done more concisely in TypeScript 1.5+:
+//import { GrammarRegistry, Grammar, IToken } from "first-mate";
+
+var registry = new GrammarRegistry({ maxTokensPerLine: 100 });
+var grammar = registry.loadGrammarSync('javascript.json');
+var result = grammar.tokenizeLine('var text = "hello world";');
+result.tokens.forEach((token) => {
+	console.log("Token text: '" + token.value + "' with scopes: " + token.scopes);
+});
diff --git a/first-mate/first-mate.d.ts b/first-mate/first-mate.d.ts
new file mode 100644
index 0000000000..d780116c2d
--- /dev/null
+++ b/first-mate/first-mate.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for first-mate v4.1.7
+// Project: https://github.com/atom/first-mate/
+// Definitions by: Vadim Macagon <https://github.com/enlight/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../event-kit/event-kit.d.ts" />
+
+declare module AtomFirstMate {
+	type Disposable = AtomEventKit.Disposable;
+
+	interface IToken {
+		value: string;
+		scopes: string[];
+	}
+
+	/** Result returned by `Grammar.tokenizeLine`. */
+	interface TokenizeLineResult {
+		/** Text that was tokenized. */
+		line: string;
+		tags: any[];
+		/**
+		 * This is a dynamic property that will only be available if `Grammar.tokenizeLine` was called
+		 * with `compatibilityMode` set to `true` (the default).
+		 */
+		tokens?: IToken[];
+		/**
+		 * The tokenized state at the end of the line. This should be passed back into `tokenizeLine`
+		 * when tokenizing the next line in the file/buffer.
+		 */
+		ruleStack: Rule[]
+	}
+
+	/** Instance side of Rule class. */
+	interface Rule {
+	}
+
+	/** Static side of Grammar class. */
+	interface GrammarStatic {
+		prototype: Grammar;
+		new (registry: GrammarRegistry, options?: any): Grammar;
+	}
+
+	/** Instance side of Grammar class. */
+	interface Grammar {
+		constructor: GrammarStatic;
+		onDidUpdate(callback: Function): Disposable;
+		/**
+		 * Tokenizes all lines in a string.
+		 *
+		 * @param text A string containing one or more lines.
+		 * @return An array of token arrays, one token array per line.
+		 */
+		tokenizeLines(text: string): Array<Array<IToken>>;
+		/**
+		 * Tokenizes a line of text.
+		 *
+		 * @param line Text to be tokenized.
+		 * @param firstLine Indicates whether `line` is the first line in the file/buffer,
+		 *                  defaults to `false`.
+		 * @param compatibilityMode `true` by default.
+		 * @return An object containing tokens for the given line.
+		 */
+		tokenizeLine(
+			line: string, ruleStack?: Rule[], firstLine?: boolean, compatibilityMode?: boolean
+		): TokenizeLineResult;
+	}
+
+	/** Grammar that tokenizes lines of text. */
+	var Grammar: GrammarStatic;
+
+	/** Static side of GrammarRegistry class. */
+	interface GrammarRegistryStatic {
+		prototype: GrammarRegistry;
+		new (options?: { maxTokensPerLine: number }): GrammarRegistry;
+	}
+
+	/** Instance side of GrammarRegistry class. */
+	interface GrammarRegistry {
+		constructor: GrammarRegistryStatic;
+
+		// Event Subscription
+
+		onDidAddGrammar(callback: (grammar: Grammar) => void): Disposable;
+		onDidUpdateGrammar(callback: (grammar: Grammar) => void): Disposable;
+
+		// Managing Grammars
+
+		getGrammars(): Grammar[];
+		grammarForScopeName(scopeName: string): Grammar;
+		addGrammar(grammar: Grammar): Disposable;
+		removeGrammarForScopeName(scopeName: string): Grammar;
+		readGrammarSync(grammarPath: string): Grammar;
+		readGrammar(grammarPath: string, callback: (error: Error, grammar: Grammar) => void): void;
+		loadGrammarSync(grammarPath: string): Grammar;
+		loadGrammar(grammarPath: string, callback: (error: Error, grammar: Grammar) => void): void;
+		grammarOverrideForPath(filePath: string): Grammar;
+		setGrammarOverrideForPath(filePath: string, scopeName: string): Grammar;
+		clearGrammarOverrides(): void;
+		selectGrammar(filePath: string, fileContents: string): Grammar;
+	}
+
+	/** Registry containing one or more grammars. */
+	var GrammarRegistry: GrammarRegistryStatic;
+}
+
+declare module 'first-mate' {
+	export = AtomFirstMate;
+}
diff --git a/flux/flux.d.ts b/flux/flux.d.ts
index 8a9dbf967d..bf5bafac4b 100644
--- a/flux/flux.d.ts
+++ b/flux/flux.d.ts
@@ -3,14 +3,14 @@
 // Definitions by: Steve Baker <https://github.com/stkb/>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module 'flux' {
+declare module Flux {
 
     /**
     * Dispatcher class
     * Create an instance to use throughout the application.
     * Or extend it to create a derived dispatcher class.
     *
-    * Specify a type in the 'TPayload' generic argument to use strongly-typed payloads, 
+    * Specify a type in the 'TPayload' generic argument to use strongly-typed payloads,
     * otherwise specify 'any'
     *
     * Examples:
@@ -23,41 +23,45 @@ declare module 'flux' {
         /**
         * Create an instance of the Dispatcher class to use throughout the application.
         *
-        * Specify a type in the 'TPayload' generic argument to use strongly-typed payloads, 
+        * Specify a type in the 'TPayload' generic argument to use strongly-typed payloads,
         * otherwise specify 'any'
         *
         * Examples:
         *     var dispatcher = new flux.Dispatcher<any>()
         *     var typedDispatcher = new flux.Dispatcher<MyCustomActionType>()
         */
-        constructor()
+        constructor();
 
         /**
         * Registers a callback that will be invoked with every payload sent to the dispatcher.
         * Returns a string token to identify the callback to be used with waitFor() or unregister.
         */
-        register(callback: (payload: TPayload) => void): string
-        
+        register(callback: (payload: TPayload) => void): string;
+
         /**
         * Unregisters a callback with the given ID token
         */
-        unregister(id: string): void
+        unregister(id: string): void;
 
         /**
         * Waits for the callbacks with the specified IDs to be invoked before continuing execution
-        * of the current callback. This method should only be used by a callback in response 
+        * of the current callback. This method should only be used by a callback in response
         * to a dispatched payload.
         */
-        waitFor(IDs: string[]): void 
+        waitFor(IDs: string[]): void;
 
         /**
         * Dispatches a payload to all registered callbacks
         */
-        dispatch(payload: TPayload): void 
+        dispatch(payload: TPayload): void;
 
         /**
         * Gets whether the dispatcher is currently dispatching
         */
-        isDispatching(): boolean
+        isDispatching(): boolean;
     }
-}
\ No newline at end of file
+}
+
+declare module "flux" {
+    export = Flux;
+}
diff --git a/fullCalendar/fullCalendar.d.ts b/fullCalendar/fullCalendar.d.ts
index feb537e67b..f73dc2d8bf 100644
--- a/fullCalendar/fullCalendar.d.ts
+++ b/fullCalendar/fullCalendar.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for FullCalendar 1.6.1
 // Project: http://arshaw.com/fullcalendar/
-// Definitions by: Neil Stalker <https://github.com/nestalk>
+// Definitions by: Neil Stalker <https://github.com/nestalk>, Marcelo Camargo <https://github.com/hasellcamargo>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../jquery/jquery.d.ts"/>
@@ -99,7 +99,7 @@ declare module FullCalendar {
         selectHelper?: any; // Boolean/Function
         unselectAuto?: boolean;
         unselectCancel?: string;
-        select?: (startDate: Date, endDate: Date, allDay: boolean, jsEvent: MouseEvent, view: View) => void;
+        select?: (startDate: Date | string, endDate: Date | string, allDay: boolean, jsEvent: MouseEvent, view: View) => void;
         unselect?: (view: View, jsEvent: Event) => void;
 
         // Event Data - http://arshaw.com/fullcalendar/docs/event_data/
@@ -109,7 +109,7 @@ declare module FullCalendar {
          *
          * - EventObject[]
          * - string (JSON feed)
-         * - (start: Date, end: Date, callback: {(events: EventObject[]) => void;}) => void;
+         * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
          */
         events?: any;
 
@@ -119,7 +119,7 @@ declare module FullCalendar {
          * - EventSource
          * - EventObject[]
          * - string (JSON feed)
-         * - (start: Date, end: Date, callback: {(events: EventObject[]) => void;}) => void;
+         * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
          */
         eventSources?: any[];
 
@@ -164,8 +164,8 @@ declare module FullCalendar {
     export interface View {
         name: string;
         title: string;
-        start: Date;
-        end: Date;
+        start: Date | string;
+        end: Date | string;
         visStart: Date;
         visEnd: Date;
     }
@@ -214,8 +214,8 @@ declare module FullCalendar {
         id?: any // String/number
         title: string;
         allDay?: boolean;
-        start: Date;
-        end?: Date;
+        start: Date | string;
+        end?: Date | string;
         url?: string;
         className?: any; // string/Array<string>
         editable?: boolean;
@@ -233,7 +233,7 @@ declare module FullCalendar {
          *
          * - EventObject[]
          * - string (JSON feed)
-         * - (start: Date, end: Date, callback: {(events: EventObject[]) => void;}) => void;
+         * - (start: Date | string, end: Date | string, callback: {(events: EventObject[]) => void;}) => void;
          */
         events?: any;
 
@@ -312,7 +312,7 @@ interface JQuery {
     /**
      * Moves the calendar to an arbitrary date.
      */
-    fullCalendar(method: 'gotoDate', date: Date): void;
+    fullCalendar(method: 'gotoDate', date: Date | string): void;
 
     /**
      * Moves the calendar forward/backward an arbitrary amount of time.
diff --git a/globalize/globalize-tests.ts b/globalize/globalize-tests.ts
index 3d599a611a..a5d25037de 100644
--- a/globalize/globalize-tests.ts
+++ b/globalize/globalize-tests.ts
@@ -1,6 +1,6 @@
 /// <reference path="globalize.d.ts" />
 
-Globalize.culture("fr");
+/*Globalize.culture("fr");
 console.log(Globalize.culture().name);
 
 Globalize.culture("fr-FR");
@@ -66,7 +66,7 @@ Globalize.format(new Date(2012, 1, 20), 'd');
 Globalize.format(new Date(2012, 1, 20), 'D');
 
 
-Globalize.cultures[ "default" ] = {
+Globalize.load[ "default" ] = {
     name: "English",
     englishName: "English",
     nativeName: "English",
@@ -132,4 +132,4 @@ Globalize.cultures[ "default" ] = {
         }
     },
     messages: {}
-}
\ No newline at end of file
+}*/
\ No newline at end of file
diff --git a/globalize/globalize.d.ts b/globalize/globalize.d.ts
index 4510e38cb1..43c126c2f9 100644
--- a/globalize/globalize.d.ts
+++ b/globalize/globalize.d.ts
@@ -1,125 +1,28 @@
 // Type definitions for Globalize
 // Project: https://github.com/jquery/globalize
-// Definitions by: Boris Yankov <https://github.com/borisyankov/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: Aram Taieb <https://github.com/afromogli/>
+// Definitions: https://github.com/afromogli/DefinitelyTyped
 
-
-interface GlobalizePercent {
-    pattern: string[];
-    decimals: number;
-    groupSizes: number[];
-    //",": string;
-    //".": string;
-    symbol: string;
+interface NumberFormatterOptions {
+   minimumIntegerDigits?: number;
+   minimumFractionDigits?: number;
+   maximumFractionDigits?: number;
+   minimumSignificantDigits?: number;
+   maximumSignificantDigits?: number;
+   round?: string;
+   useGrouping?: boolean;
 }
 
-interface GlobalizeCurrency {
-    pattern: string[];
-    decimals: number;
-    groupSizes: number[];
-    //",": string;
-    //".": string;
-    symbol: string;
-}
-
-interface GlobalizeNumberFormat {
-    pattern: string[];
-    decimals: string;
-    //",": string;
-    //".": string;
-    groupSizes: number[];
-    //"+": string;
-    //"-": string;
-    NaN: string;
-    negativeInfinity: string;
-    positiveInfinity: string;
-    percent: GlobalizePercent;
-    currency: GlobalizeCurrency;
-}
-
-interface GlobalizeEra {
-    name: string;
-    start: any;
-    offset: number;
-}
-
-interface GlobalizeDays {
-    names: string[];
-    namesAbbr: string[];
-    namesShort: string[];
-}
-
-interface GlobalizeMonths {
-    names: string[];
-    namesAbbr: string[];
-}
-
-interface GlobalizePatterns {
-    d: string;
-    D: string;
-    t: string;
-    T: string;
-    f: string;
-    F: string;
-    M: string;
-    Y: string;
-    S: string;
-}
-
-interface GlobalizeCalendar {
-    name: string;
-    // "/": string,
-    // ":": string,
-    firstDay: number;
-    days: GlobalizeDays;
-    months: GlobalizeMonths;
-    AM: string[];
-    PM: string[];
-    eras: GlobalizeEra[];
-    twoDigitYearMax: number;
-    patterns: GlobalizePatterns;
-}
-
-interface GlobalizeCalendars {
-    standard: GlobalizeCalendar;
-}
-
-interface GlobalizeCulture {
-    name: string;
-    englishName: string;
-    nativeName: string;
-    isRTL: boolean;
-    language: string;
-    numberFormat: GlobalizeNumberFormat;
-    calendar: GlobalizeCalendar;
-    calendars: GlobalizeCalendars;
-    messages: any;
-}
-interface GlobalizeCultures {
-    [index: number]: GlobalizeCulture;
+interface Cldr {
+   /* TODO: add typings */
 }
 
 interface GlobalizeStatic {
-    cultures: GlobalizeCultures;
-    init(cultureSelector: string): GlobalizeStatic;
-    cultureSelector: string;
+   load(jsonData: any): void;
+   locale(locale: string): Cldr;
 
-    culture(): GlobalizeCulture;
-    culture(cultureSelector: string): GlobalizeCulture;
-    culture(cultureSelector: string[]): GlobalizeCulture;
-
-    addCultureInfo(cultureName: string, baseCultureName: string, info: Object): void;
-    addCultureInfo(cultureName: string, info: Object): void;
-    addCultureInfo(info: Object): void;
-    findClosestCulture(cultureSelector: string): GlobalizeStatic;
-    format(value: number, format: string, cultureSelector?: string): string;
-    format(value: Date, format: string, cultureSelector?: string): string;
-    localize(key: string, cultureSelector?: string): string;
-
-    parseDate(value: string, format?: string, cultureSelector?: string): Date;
-    parseDate(value: string, formats?: string[], cultureSelector?: string): Date;
-    parseInt(value: string, radix?: number, cultureSelector?: string): number;
-    parseFloat(value: string, radix?: number, cultureSelector?: string): number;
+   numberFormatter(options?: NumberFormatterOptions): (value: number) => string;
+   formatNumber(value:number, options?: NumberFormatterOptions): string;
 }
 
 declare var Globalize: GlobalizeStatic;
diff --git a/goJS/goJS-tests.ts b/goJS/goJS-tests.ts
index 18c37df251..dd6266dc7e 100644
--- a/goJS/goJS-tests.ts
+++ b/goJS/goJS-tests.ts
@@ -1,241 +1,243 @@
-// Test file for GoJS.d.ts
+// Test file for goJS.d.ts
 // This is taken from http://gojs.net/latest/samples/basic.html
 
-/*  Copyright (C) 1998 - 2013 by Northwoods Software Corporation. */
+/*  Copyright (C) 1998-2015 by Northwoods Software Corporation. */
 
 /// <reference path="goJS.d.ts" />
 
 function init() {
-  var $ = go.GraphObject.make;  // for conciseness in defining templates
+    var $ = go.GraphObject.make;  // for conciseness in defining templates
 
-  var myDiagram =
-    $(go.Diagram, "myDiagram",  // create a Diagram for the DIV HTML element
-      {
-        // position the graph in the middle of the diagram
-        initialContentAlignment: go.Spot.Center,
+    var myDiagram: go.Diagram =
+        $(go.Diagram, "myDiagram",  // create a Diagram for the DIV HTML element
+            {
+                // position the graph in the middle of the diagram
+                initialContentAlignment: go.Spot.Center,
 
-        // allow double-click in background to create a new node
-        "clickCreatingTool.archetypeNodeData": { text: "Node", color: "white" },
+                // allow double-click in background to create a new node
+                "clickCreatingTool.archetypeNodeData": { text: "Node", color: "white" },
 
-        // allow Ctrl-G to call groupSelection()
-        "commandHandler.archetypeGroupData": { text: "Group", isGroup: true, color: "blue" }
-      });
+                // allow Ctrl-G to call groupSelection()
+                "commandHandler.archetypeGroupData": { text: "Group", isGroup: true, color: "blue" },
 
-  // Define the appearance and behavior for Nodes:
+                // enable undo & redo
+                "undoManager.isEnabled": true
+            });
 
-  // First, define the shared context menu for all Nodes, Links, and Groups.
+    // Define the appearance and behavior for Nodes:
 
-  // To simplify this code we define a function for creating a context menu button:
-  function makeButton(text: string, action, visiblePredicate?) {
-    if (visiblePredicate === undefined) visiblePredicate = function() { return true; };
-    return $("ContextMenuButton",
-      $(go.TextBlock, text),
-      { click: action },
-      new go.Binding("visible", "", visiblePredicate).ofObject());
-  }
+    // First, define the shared context menu for all Nodes, Links, and Groups.
 
-  // a context menu is an Adornment with a bunch of buttons in them
-  var partContextMenu =
-    $(go.Adornment, "Vertical",
-      makeButton("Properties",
-        function(e, obj) {  // the OBJ is this Button
-          var contextmenu = obj.part;  // the Button is in the context menu Adornment
-          var part = contextmenu.adornedPart;  // the adornedPart is the Part that the context menu adorns
-          // now can do something with PART, or with its data, or with the Adornment (the context menu)
-          if (part instanceof go.Link) alert(linkInfo(part.data));
-          else if (part instanceof go.Group) alert(groupInfo(contextmenu));
-          else alert(nodeInfo(part.data));
-        }),
-      makeButton("Cut",
-        function(e, obj) { e.diagram.commandHandler.cutSelection(); },
-        function(o) { return o.diagram.commandHandler.canCutSelection(); }),
-      makeButton("Copy",
-        function(e, obj) { e.diagram.commandHandler.copySelection(); },
-        function(o) { return o.diagram.commandHandler.canCopySelection(); }),
-      makeButton("Paste",
-        function(e, obj) { e.diagram.commandHandler.pasteSelection(e.diagram.lastInput.documentPoint); },
-        function(o) { return o.diagram.commandHandler.canPasteSelection(); }),
-      makeButton("Delete",
-        function(e, obj) { e.diagram.commandHandler.deleteSelection(); },
-        function(o) { return o.diagram.commandHandler.canDeleteSelection(); }),
-      makeButton("Undo",
-        function(e, obj) { e.diagram.commandHandler.undo(); },
-        function(o) { return o.diagram.commandHandler.canUndo(); }),
-      makeButton("Redo",
-        function(e, obj) { e.diagram.commandHandler.redo(); },
-        function(o) { return o.diagram.commandHandler.canRedo(); }),
-      makeButton("Group",
-        function(e, obj) { e.diagram.commandHandler.groupSelection(); },
-        function(o) { return o.diagram.commandHandler.canGroupSelection(); }),
-      makeButton("Ungroup",
-        function(e, obj) { e.diagram.commandHandler.ungroupSelection(); },
-        function(o) { return o.diagram.commandHandler.canUngroupSelection(); })
-      );
-
-  function nodeInfo(d) {  // Tooltip info for a node data object
-    var str = "Node " + d.key + ": " + d.text + "\n";
-    if (d.group)
-      str += "member of " + d.group;
-    else
-      str += "top-level node";
-    return str;
-  }
-
-  // These nodes have text surrounded by a rounded rectangle
-  // whose fill color is bound to the node data.
-  // The user can drag a node by dragging its TextBlock label.
-  // Dragging from the Shape will start drawing a new link.
-  myDiagram.nodeTemplate =
-    $(go.Node, "Auto",
-      { locationSpot: go.Spot.Center },
-      $(go.Shape, "RoundedRectangle",
-        {
-          fill: "white",
-          portId: "", cursor: "pointer",  // the Shape is the port, not the whole Node
-          // allow all kinds of links from and to this port
-          fromLinkable: true, fromLinkableSelfNode: true, fromLinkableDuplicates: true,
-          toLinkable: true, toLinkableSelfNode: true, toLinkableDuplicates: true
-        },
-        new go.Binding("fill", "color")),
-      $(go.TextBlock,
-        {
-          margin: 4,  // make some extra space for the shape around the text
-          isMultiline: false,  // don't allow newlines in text
-          editable: true  // allow in-place editing by user
-        },
-        new go.Binding("text", "text").makeTwoWay()),  // the label shows the node data's text
-      { // this tooltip Adornment is shared by all nodes
-        toolTip:
-        $(go.Adornment, "Auto",
-          $(go.Shape, { fill: "#FFFFCC" }),
-          $(go.TextBlock, { margin: 4 },  // the tooltip shows the result of calling nodeInfo(data)
-            new go.Binding("text", "", nodeInfo))
-          ),
-        // this context menu Adornment is shared by all nodes
-        contextMenu: partContextMenu
-      }
-    );
-
-  // Define the appearance and behavior for Links:
-
-  function linkInfo(d) {  // Tooltip info for a link data object
-    return "Link:\nfrom " + d.from + " to " + d.to;
-  }
-
-  // The link shape and arrowhead have their stroke brush data bound to the "color" property
-  myDiagram.linkTemplate =
-    $(go.Link,
-      { relinkableFrom: true, relinkableTo: true },  // allow the user to relink existing links
-      $(go.Shape,
-        { strokeWidth: 2 },
-        new go.Binding("stroke", "color")),
-      $(go.Shape,
-        { toArrow: "Standard", stroke: null },
-        new go.Binding("fill", "color")),
-      { // this tooltip Adornment is shared by all links
-        toolTip:
-        $(go.Adornment, "Auto",
-          $(go.Shape, { fill: "#FFFFCC" }),
-          $(go.TextBlock, { margin: 4 },  // the tooltip shows the result of calling linkInfo(data)
-            new go.Binding("text", "", linkInfo))
-          ),
-        // the same context menu Adornment is shared by all links
-        contextMenu: partContextMenu
-      }
-    );
-
-  // Define the appearance and behavior for Groups:
-
-  function groupInfo(adornment) {  // takes the tooltip, not a group node data object
-    var g = adornment.adornedPart;  // get the Group that the tooltip adorns
-    var mems = g.memberParts.count;
-    var links = 0;
-    var it = g.memberParts;
-    while (it.next()) {
-      if (it.value instanceof go.Link) links++;
+    // To simplify this code we define a function for creating a context menu button:
+    function makeButton(text: string, action: (e: go.InputEvent, obj: go.GraphObject) => void, visiblePredicate?: (obj: go.GraphObject) => boolean) {
+        if (visiblePredicate === undefined) visiblePredicate = function (o) { return true; };
+        return $("ContextMenuButton",
+            $(go.TextBlock, text),
+            { click: action },
+            // don't bother with binding GraphObject.visible if there's no predicate
+            visiblePredicate ? new go.Binding("visible", "", visiblePredicate).ofObject() : {});
     }
-    return "Group " + g.data.key + ": " + g.data.text + "\n" + mems + " members including " + links + " links";
-  }
 
-  // Groups consist of a title in the color given by the group node data
-  // above a translucent gray rectangle surrounding the member parts
-  myDiagram.groupTemplate =
+    // a context menu is an Adornment with a bunch of buttons in them
+    var partContextMenu =
+        $(go.Adornment, "Vertical",
+            makeButton("Properties",
+                function (e, obj) {  // the OBJ is this Button
+                    var contextmenu = <go.Adornment>obj.part;  // the Button is in the context menu Adornment
+                    var part = contextmenu.adornedPart;  // the adornedPart is the Part that the context menu adorns
+                    // now can do something with PART, or with its data, or with the Adornment (the context menu)
+                    if (part instanceof go.Link) alert(linkInfo(part.data));
+                    else if (part instanceof go.Group) alert(groupInfo(contextmenu));
+                    else alert(nodeInfo(part.data));
+                }),
+            makeButton("Cut",
+                function (e, obj) { e.diagram.commandHandler.cutSelection(); },
+                function (o) { return o.diagram.commandHandler.canCutSelection(); }),
+            makeButton("Copy",
+                function (e, obj) { e.diagram.commandHandler.copySelection(); },
+                function (o) { return o.diagram.commandHandler.canCopySelection(); }),
+            makeButton("Paste",
+                function (e, obj) { e.diagram.commandHandler.pasteSelection(e.diagram.lastInput.documentPoint); },
+                function (o) { return o.diagram.commandHandler.canPasteSelection(); }),
+            makeButton("Delete",
+                function (e, obj) { e.diagram.commandHandler.deleteSelection(); },
+                function (o) { return o.diagram.commandHandler.canDeleteSelection(); }),
+            makeButton("Undo",
+                function (e, obj) { e.diagram.commandHandler.undo(); },
+                function (o) { return o.diagram.commandHandler.canUndo(); }),
+            makeButton("Redo",
+                function (e, obj) { e.diagram.commandHandler.redo(); },
+                function (o) { return o.diagram.commandHandler.canRedo(); }),
+            makeButton("Group",
+                function (e, obj) { e.diagram.commandHandler.groupSelection(); },
+                function (o) { return o.diagram.commandHandler.canGroupSelection(); }),
+            makeButton("Ungroup",
+                function (e, obj) { e.diagram.commandHandler.ungroupSelection(); },
+                function (o) { return o.diagram.commandHandler.canUngroupSelection(); })
+            );
+
+    function nodeInfo(d) {  // Tooltip info for a node data object
+        var str = "Node " + d.key + ": " + d.text + "\n";
+        if (d.group)
+            str += "member of " + d.group;
+        else
+            str += "top-level node";
+        return str;
+    }
+
+    // These nodes have text surrounded by a rounded rectangle
+    // whose fill color is bound to the node data.
+    // The user can drag a node by dragging its TextBlock label.
+    // Dragging from the Shape will start drawing a new link.
+    myDiagram.nodeTemplate =
+    $(go.Node, "Auto",
+        { locationSpot: go.Spot.Center },
+        $(go.Shape, "RoundedRectangle",
+            {
+                fill: "white", // the default fill, if there is no data-binding
+                portId: "", cursor: "pointer",  // the Shape is the port, not the whole Node
+                // allow all kinds of links from and to this port
+                fromLinkable: true, fromLinkableSelfNode: true, fromLinkableDuplicates: true,
+                toLinkable: true, toLinkableSelfNode: true, toLinkableDuplicates: true
+            },
+            new go.Binding("fill", "color")),
+        $(go.TextBlock,
+            {
+                font: "bold 14px sans-serif",
+                stroke: '#333',
+                margin: 6,  // make some extra space for the shape around the text
+                isMultiline: false,  // don't allow newlines in text
+                editable: true  // allow in-place editing by user
+            },
+            new go.Binding("text", "text").makeTwoWay()),  // the label shows the node data's text
+        { // this tooltip Adornment is shared by all nodes
+            toolTip:
+            $(go.Adornment, "Auto",
+                $(go.Shape, { fill: "#FFFFCC" }),
+                $(go.TextBlock, { margin: 4 },  // the tooltip shows the result of calling nodeInfo(data)
+                    new go.Binding("text", "", nodeInfo))
+                ),
+            // this context menu Adornment is shared by all nodes
+            contextMenu: partContextMenu
+        }
+        );
+
+    // Define the appearance and behavior for Links:
+
+    function linkInfo(d) {  // Tooltip info for a link data object
+        return "Link:\nfrom " + d.from + " to " + d.to;
+    }
+
+    // The link shape and arrowhead have their stroke brush data bound to the "color" property
+    myDiagram.linkTemplate =
+    $(go.Link,
+        { relinkableFrom: true, relinkableTo: true },  // allow the user to relink existing links
+        $(go.Shape,
+            { strokeWidth: 2 },
+            new go.Binding("stroke", "color")),
+        $(go.Shape,
+            { toArrow: "Standard", stroke: null },
+            new go.Binding("fill", "color")),
+        { // this tooltip Adornment is shared by all links
+            toolTip:
+            $(go.Adornment, "Auto",
+                $(go.Shape, { fill: "#FFFFCC" }),
+                $(go.TextBlock, { margin: 4 },  // the tooltip shows the result of calling linkInfo(data)
+                    new go.Binding("text", "", linkInfo))
+                ),
+            // the same context menu Adornment is shared by all links
+            contextMenu: partContextMenu
+        }
+        );
+
+    // Define the appearance and behavior for Groups:
+
+    function groupInfo(adornment: go.Adornment) {  // takes the tooltip, not a group node data object
+        var g = <go.Group>adornment.adornedPart;  // get the Group that the tooltip adorns
+        var mems = g.memberParts.count;
+        var links = 0;
+        g.memberParts.each(function (part) {
+            if (part instanceof go.Link) links++;
+        });
+        return "Group " + g.data.key + ": " + g.data.text + "\n" + mems + " members including " + links + " links";
+    }
+
+    // Groups consist of a title in the color given by the group node data
+    // above a translucent gray rectangle surrounding the member parts
+    myDiagram.groupTemplate =
     $(go.Group, "Vertical",
-      {
-        selectionObjectName: "PANEL",  // selection handle goes around shape, not label
-        ungroupable: true  // enable Ctrl-Shift-G to ungroup a selected Group
-      },
-      $(go.TextBlock,
         {
-          font: "bold 12pt sans-serif",
-          isMultiline: false,  // don't allow newlines in text
-          editable: true  // allow in-place editing by user
+            selectionObjectName: "PANEL",  // selection handle goes around shape, not label
+            ungroupable: true  // enable Ctrl-Shift-G to ungroup a selected Group
         },
-        new go.Binding("text", "text").makeTwoWay(),
-        new go.Binding("stroke", "color")),
-      $(go.Panel, "Auto",
-        { name: "PANEL" },
-        $(go.Shape, "Rectangle",  // the rectangular shape around the members
-          { fill: "rgba(128,128,128,0.2)", stroke: "gray", strokeWidth: 3 }),
-        $(go.Placeholder, { padding: 5 })  // represents where the members are
-        ),
-      { // this tooltip Adornment is shared by all groups
-        toolTip:
-        $(go.Adornment, "Auto",
-          $(go.Shape, { fill: "#FFFFCC" }),
-          $(go.TextBlock, { margin: 4 },
-            // bind to tooltip, not to Group.data, to allow access to Group properties
-            new go.Binding("text", "", groupInfo).ofObject())
-          ),
-        // the same context menu Adornment is shared by all groups
-        contextMenu: partContextMenu
-      }
-    );
+        $(go.TextBlock,
+            {
+                font: "bold 12pt sans-serif",
+                isMultiline: false,  // don't allow newlines in text
+                editable: true  // allow in-place editing by user
+            },
+            new go.Binding("text", "text").makeTwoWay(),
+            new go.Binding("stroke", "color")),
+        $(go.Panel, "Auto",
+            { name: "PANEL" },
+            $(go.Shape, "Rectangle",  // the rectangular shape around the members
+                { fill: "rgba(128,128,128,0.2)", stroke: "gray", strokeWidth: 3 }),
+            $(go.Placeholder, { padding: 5 })  // represents where the members are
+            ),
+        { // this tooltip Adornment is shared by all groups
+            toolTip:
+            $(go.Adornment, "Auto",
+                $(go.Shape, { fill: "#FFFFCC" }),
+                $(go.TextBlock, { margin: 4 },
+                    // bind to tooltip, not to Group.data, to allow access to Group properties
+                    new go.Binding("text", "", groupInfo).ofObject())
+                ),
+            // the same context menu Adornment is shared by all groups
+            contextMenu: partContextMenu
+        }
+        );
 
-  // Define the behavior for the Diagram background:
+    // Define the behavior for the Diagram background:
 
-  function diagramInfo(model) {  // Tooltip info for the diagram's model
-    return "Model:\n" + model.nodeDataArray.length + " nodes, " + model.linkDataArray.length + " links";
-  }
+    function diagramInfo(model: go.GraphLinksModel) {  // Tooltip info for the diagram's model
+        return "Model:\n" + model.nodeDataArray.length + " nodes, " + model.linkDataArray.length + " links";
+    }
 
-  // provide a tooltip for the background of the Diagram, when not over any Part
-  myDiagram.toolTip =
+    // provide a tooltip for the background of the Diagram, when not over any Part
+    myDiagram.toolTip =
     $(go.Adornment, "Auto",
-      $(go.Shape, { fill: "#FFFFCC" }),
-      $(go.TextBlock, { margin: 4 },
-        new go.Binding("text", "", diagramInfo))
-    );
+        $(go.Shape, { fill: "#FFFFCC" }),
+        $(go.TextBlock, { margin: 4 },
+            new go.Binding("text", "", diagramInfo))
+        );
 
-  // provide a context menu for the background of the Diagram, when not over any Part
-  myDiagram.contextMenu =
+    // provide a context menu for the background of the Diagram, when not over any Part
+    myDiagram.contextMenu =
     $(go.Adornment, "Vertical",
-      makeButton("Paste",
-        function(e, obj) { e.diagram.commandHandler.pasteSelection(e.diagram.lastInput.documentPoint); },
-        function(o) { return o.diagram.commandHandler.canPasteSelection(); }),
-      makeButton("Undo",
-        function(e, obj) { e.diagram.commandHandler.undo(); },
-        function(o) { return o.diagram.commandHandler.canUndo(); }),
-      makeButton("Redo",
-        function(e, obj) { e.diagram.commandHandler.redo(); },
-        function(o) { return o.diagram.commandHandler.canRedo(); })
-    );
+        makeButton("Paste",
+            function (e, obj) { e.diagram.commandHandler.pasteSelection(e.diagram.lastInput.documentPoint); },
+            function (o) { return o.diagram.commandHandler.canPasteSelection(); }),
+        makeButton("Undo",
+            function (e, obj) { e.diagram.commandHandler.undo(); },
+            function (o) { return o.diagram.commandHandler.canUndo(); }),
+        makeButton("Redo",
+            function (e, obj) { e.diagram.commandHandler.redo(); },
+            function (o) { return o.diagram.commandHandler.canRedo(); })
+        );
 
-  // Create the Diagram's Model:
-  var nodeDataArray = [
-    { key: 1, text: "Alpha", color: "lightblue" },
-    { key: 2, text: "Beta", color: "orange" },
-    { key: 3, text: "Gamma", color: "lightgreen", group: 5 },
-    { key: 4, text: "Delta", color: "pink", group: 5 },
-    { key: 5, text: "Epsilon", color: "green", isGroup: true }
-  ];
-  var linkDataArray = [
-    { from: 1, to: 2, color: "blue" },
-    { from: 2, to: 2 },
-    { from: 3, to: 4, color: "green" },
-    { from: 3, to: 1, color: "purple" }
-  ];
-  myDiagram.model = new go.GraphLinksModel(nodeDataArray, linkDataArray);
-
-  // now enable undo/redo, only after setting the Diagram.model
-  myDiagram.model.undoManager.isEnabled = true;
+    // Create the Diagram's Model:
+    var nodeDataArray = [
+        { key: 1, text: "Alpha", color: "lightblue" },
+        { key: 2, text: "Beta", color: "orange" },
+        { key: 3, text: "Gamma", color: "lightgreen", group: 5 },
+        { key: 4, text: "Delta", color: "pink", group: 5 },
+        { key: 5, text: "Epsilon", color: "green", isGroup: true }
+    ];
+    var linkDataArray = [
+        { from: 1, to: 2, color: "blue" },
+        { from: 2, to: 2 },
+        { from: 3, to: 4, color: "green" },
+        { from: 3, to: 1, color: "purple" }
+    ];
+    myDiagram.model = new go.GraphLinksModel(nodeDataArray, linkDataArray);
 }
diff --git a/goJS/goJS.d.ts b/goJS/goJS.d.ts
index 6c25d148c0..e773dcc2b9 100644
--- a/goJS/goJS.d.ts
+++ b/goJS/goJS.d.ts
@@ -1,45 +1,80 @@
-// Type definitions for GoJS 1.2
+// Type definitions for GoJS v1.5.0
 // Project: http://gojs.net
-// Definitions by: Barbara Duckworth <https://github.com/barbara42/>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
+// Definitions by: Northwoods Software <https://github.com/NorthwoodsSoftware>
+// Definitions: https://github.com/NorthwoodsSoftware/GoJS
 
-/* Copyright (C) 1998-2013 by Northwoods Software Corporation. */
+/* Copyright (C) 1998-2015 by Northwoods Software Corporation. */
 
-// A number of types have been declared "any" because they would best be described by a union of specific types,
-// not as truly "any" type, and TypeScript does not support union types.  Most of the cases are due to:
-//   - a property of type Margin whose setter also accepts a number, for a uniform Margin of that thickness
-//   - a property of type Brush whose setter also accepts a string, a CSS color string for a solid color Brush
-//   - a boolean property that may also be null (tri-state)
-//   - a key type, which may be a string or a number, uniquely identifying a node data within a Model
-//   - a property that is string that names a property or that is a function that gets or sets a value, on an Object in a Model
+// This is for TypeScript 1.4
+// TODO: TypeScript 1.5 modules and destructuring
 
 declare module go {
+    /** A number in place of a Margin object is treated as a uniform Margin with that thickness */
+    type MarginLike = Margin | number;
+
+    /** A string in place of a Brush object is treated as a Solid Brush of that color. */
+    type BrushLike = Brush | string;
+
+    /** A Key is the type of the unique identifier managed by Models for each node data object. */
+    type Key = string | number;
+
+    /** Either name a property or get the value of a property from an object. */
+    type PropertyAccessor = string | ((data: any, newval: any) => any);
+
+    /** A constructor */
+    type Constructor = new (...args: any[]) => Object;
+
     /**
     * An adornment is a special kind of Part that is associated with another Part,
-    * the Adornment#adornedPart.
+    * the Adornment.adornedPart.
     * Adornments are normally associated with a particular GraphObject in the adorned part --
-    * that is the value of #adornedObject.
-    * However, the #adornedObject may be null, in which case the #adornedPart will also be null.
+    * that is the value of .adornedObject.
+    * However, the .adornedObject may be null, in which case the .adornedPart will also be null.
     */
     class Adornment extends Part {
         /**
-        * @param {EnumValue=} type if not supplied, the default Panel type is Panel#Position.
+        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
         */
         constructor(type?: EnumValue);
 
         /**Gets or sets the GraphObject that is adorned.*/
         adornedObject: GraphObject;
 
-        /**Gets the Part that contains the adorned object.*/
+        /**This read-only property returns the Part that contains the adorned object.*/
         adornedPart: Part;
 
-        /**Gets a Placeholder that this Adornment may contain in its visual tree.*/
+        /**This read-only property returns a Placeholder that this Adornment may contain in its visual tree.*/
         placeholder: Placeholder;
     }
 
     /**
-    * The Diagram#commandHandler implements various
-    * commands such as CommandHandler#deleteSelection or CommandHandler#redo.
+    * This class handles animations in a Diagram.  Each Diagram has one, the Diagram.animationManager.
+    */
+    class AnimationManager {
+        /**You do not normally need to create an instance of this class because one already exists as the Diagram.animationManager, which you can modify.*/
+        constructor();
+
+        /**Gets or sets the duration for animations, in milliseconds. The default value is 600 milliseconds.*/
+        duration: number;
+
+        /**This read-only property is true when the AnimationManager is currently animating.*/
+        isAnimating: boolean;
+
+        /**Gets or sets whether this AnimationManager operates. The default value is true.*/
+        isEnabled: boolean;
+
+        /**This read-only property is true when the animation manager is in the middle of an animation tick.*/
+        isTicking: boolean;
+
+        /**
+        * Stops any running animation and updates the Diagram to its final state.
+        */
+        stopAnimation(): void;
+    }
+
+    /**
+    * The Diagram.commandHandler implements various
+    * commands such as CommandHandler.deleteSelection or CommandHandler.redo.
     * The CommandHandler includes keyboard event handling to interpret
     * key presses as commands.
     */
@@ -49,30 +84,42 @@ declare module go {
         */
         constructor();
 
-        /**Gets or sets a data object that is copied by #groupSelection when creating a new Group.*/
+        /**Gets or sets a data object that is copied by .groupSelection when creating a new Group. The default value is null.*/
         archetypeGroupData: Object;
 
-        /**Gets or sets whether #copySelection should also copy subtrees.*/
+        /**Gets or sets whether copySelection should also copy Links that connect with selected Nodes.*/
+        copiesConnectedLinks: boolean;
+
+        /**Gets or sets whether copySelection and copyToClipboard copy the node data property whose value is the containing group data's key. The default value is false.*/
+        copiesGroupKey: boolean;
+
+        /**Gets or sets whether copySelection and copyToClipboard copy the node data property whose value is the tree-parent node data's key. The default value is false.*/
+        copiesParentKey: boolean;
+
+        /**Gets or sets whether .copySelection should also copy subtrees. The default value is false.*/
         copiesTree: boolean;
 
-        /**Gets or sets whether #deleteSelection should also delete subtrees.*/
+        /**Gets or sets the Diagram.scale set by resetZoom. The default value is 1.0.*/
+        defaultScale: number;
+
+        /**Gets or sets whether .deleteSelection should also delete subtrees. The default value is false.*/
         deletesTree: boolean;
 
-        /**Gets the Diagram that is using this CommandHandler.*/
+        /**This read-only property returns the Diagram that is using this CommandHandler.*/
         diagram: Diagram;
 
-        /**Gets or sets the predicate that determines whether or not a node may become a member of a group.*/
+        /**Gets or sets the predicate that determines whether or not a node may become a member of a group. The default predicate is null, which is equivalent to simply returning true.*/
         memberValidation: (g: Group, p: Part) => boolean;
 
-        /**Gets or sets the amount by which #decreaseZoom and #increaseZoom change the Diagram#scale; default is 1.05.*/
+        /**Gets or sets the amount by which .decreaseZoom and .increaseZoom change the Diagram.scale. The default value is 1.05 (5%).*/
         zoomFactor: number;
 
         /**
         * Make sure all of the unnested Parts in the given collection are removed from any containing Groups.
-        * @param {Iterable} coll a collection of Parts.
-        * @param {boolean=} check whether to call #isValidMember to confirm that changing the Part to be a top-level Part is valid.
+        * @param {Iterable<Part>} coll a collection of Parts.
+        * @param {boolean=} check whether to call .isValidMember to confirm that changing the Part to be a top-level Part is valid.
         */
-        addTopLevelParts(coll: Iterable, check?: boolean): boolean;
+        addTopLevelParts(coll: Iterable<Part>, check?: boolean): boolean;
 
         /**
         * This predicate controls whether the user can collapse expanded Groups.
@@ -87,28 +134,28 @@ declare module go {
         canCollapseTree(node?: Node): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #copySelection command.
+        * This predicate controls whether or not the user can invoke the .copySelection command.
         */
         canCopySelection(): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #cutSelection command.
+        * This predicate controls whether or not the user can invoke the .cutSelection command.
         */
         canCutSelection(): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #decreaseZoom command.
-        * @param {number=} factor This defaults to 1/#zoomFactor.  The value should be less than one.
+        * This predicate controls whether or not the user can invoke the .decreaseZoom command.
+        * @param {number=} factor This defaults to 1/.zoomFactor.  The value should be less than one.
         */
         canDecreaseZoom(factor?: number): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #deleteSelection command.
+        * This predicate controls whether or not the user can invoke the .deleteSelection command.
         */
         canDeleteSelection(): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #editTextBlock command.
+        * This predicate controls whether or not the user can invoke the .editTextBlock command.
         * @param {TextBlock=} textblock the TextBlock to consider editing.
         */
         canEditTextBlock(textblock?: TextBlock): boolean;
@@ -126,55 +173,62 @@ declare module go {
         canExpandTree(node?: Node): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #groupSelection command.
+        * This predicate controls whether or not the user can invoke the .groupSelection command.
         */
         canGroupSelection(): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #increaseZoom command.
-        * @param {number=} factor This defaults to #zoomFactor.  The value should be greater than one.
+        * This predicate controls whether or not the user can invoke the .increaseZoom command.
+        * @param {number=} factor This defaults to .zoomFactor.  The value should be greater than one.
         */
         canIncreaseZoom(factor?: number): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #pasteSelection command.
+        * This predicate controls whether or not the user can invoke the .pasteSelection command.
         */
         canPasteSelection(): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #redo command.
+        * This predicate controls whether or not the user can invoke the .redo command.
         */
         canRedo(): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #resetZoom command.
+        * This predicate controls whether or not the user can invoke the .resetZoom command.
         * @param {number=} newscale This defaults to 1.  The value should be greater than zero.
         */
         canResetZoom(newscale?: number): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #selectAll command.
+        * This predicate controls whether or not the user can invoke the .selectAll command.
         */
         canSelectAll(): boolean;
 
+        /**
+        * This predicate controls whether or not the user can invoke the .showContextMenu command.
+        * @param {GraphObject|Diagram=} obj a GraphObject or Diagram with a contextMenu defined.
+        * If none is given, this method will use the first selected object, or else the Diagram.
+        */
+        canShowContextMenu(obj?: GraphObject | Diagram): boolean;
+
         /**
         * This predicate controls whether the user may stop the current tool.
         */
         canStopCommand(): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #undo command.
+        * This predicate controls whether or not the user can invoke the .undo command.
         */
         canUndo(): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #ungroupSelection command.
+        * This predicate controls whether or not the user can invoke the .ungroupSelection command.
         * @param {Group=} group if supplied, ignore the selection and consider ungrouping this particular Group.
         */
         canUngroupSelection(group?: Group): boolean;
 
         /**
-        * This predicate controls whether or not the user can invoke the #zoomToFit command.
+        * This predicate controls whether or not the user can invoke the .zoomToFit command.
         */
         canZoomToFit(): boolean;
 
@@ -182,79 +236,79 @@ declare module go {
         * Collapse all expanded selected Groups.
         * @param {Group=} group if supplied, ignore the selection and collapse this particular Group.
         */
-        collapseSubGraph(group?: Group);
+        collapseSubGraph(group?: Group): void;
 
         /**
         * Collapse all expanded selected Nodes.
         * @param {Node=} node if supplied, ignore the selection and collapse this particular Node subtree.
         */
-        collapseTree(node?: Node);
+        collapseTree(node?: Node): void;
 
         /**
-        * Copy the currently selected parts, Diagram#selection, from the Diagram into the clipboard.
+        * Copy the currently selected parts, Diagram.selection, from the Diagram into the clipboard.
         */
-        copySelection();
+        copySelection(): void;
 
         /**
         * This makes a copy of the given collection of Parts and stores it in a static variable acting as the clipboard.
-        * @param {Iterable} coll A collection of Parts.
+        * @param {Iterable<Part>} coll A collection of Parts.
         */
-        copyToClipboard(coll: Iterable);
+        copyToClipboard(coll: Iterable<Part>): void;
 
         /**
-        * Execute a #copySelection followed by a #deleteSelection.
+        * Execute a .copySelection followed by a .deleteSelection.
         */
-        cutSelection();
+        cutSelection(): void;
 
         /**
-        * Decrease the Diagram#scale by a given factor.
-        * @param {number=} factor This defaults to 1/#zoomFactor.  The value should be less than one.
+        * Decrease the Diagram.scale by a given factor.
+        * @param {number=} factor This defaults to 1/.zoomFactor.  The value should be less than one.
         */
-        decreaseZoom(factor?: number);
+        decreaseZoom(factor?: number): void;
 
         /**
         * Delete the currently selected parts from the diagram.
         */
-        deleteSelection();
+        deleteSelection(): void;
 
         /**
         * This is called by tools to handle keyboard commands.
         */
-        doKeyDown();
+        doKeyDown(): void;
 
         /**
         * This is called by tools to handle keyboard commands.
         */
-        doKeyUp();
+        doKeyUp(): void;
 
         /**
         * Start in-place editing of a TextBlock in the selected Part.
         * @param {TextBlock=} textblock the TextBlock to start editing.
         */
-        editTextBlock(textblock?: TextBlock);
+        editTextBlock(textblock?: TextBlock): void;
 
         /**
         * Expand all collapsed selected Groups.
         * @param {Group=} group if supplied, ignore the selection and expand this particular Group.
         */
-        expandSubGraph(group?: Group);
+        expandSubGraph(group?: Group): void;
 
         /**
         * Expand all collapsed selected Nodes.
         * @param {Node=} node if supplied, ignore the selection and collapse this particular Node subtree.
         */
-        expandTree(node?: Node);
+        expandTree(node?: Node): void;
 
         /**
-        * Add a copy of #archetypeGroupData and add it to the diagram's model to create a new Group and then add the selected Parts to that new group.
+        * Add a copy of .archetypeGroupData and add it to the diagram's model to create a new Group and then add the selected Parts to that new group.
         */
-        groupSelection();
+        groupSelection(): void;
 
         /**
-        * Increase the Diagram#scale by a given factor.
-        * @param {number=} factor This defaults to #zoomFactor.  The value should be greater than one.
+        * Increase the Diagram.scale by a given factor.
+        * @param {number=} factor This defaults to .zoomFactor.  The value should be greater than one.
         */
-        increaseZoom(factor?: Number);
+        increaseZoom(factor?: Number): void;
 
         /**
         * This predicate is called to determine whether a Node may be added as a member of a Group.
@@ -264,52 +318,61 @@ declare module go {
         isValidMember(group: Group, part: Part): boolean;
 
         /**
-        * If the clipboard holds a collection of Parts, and if the Model#dataFormat matches that stored in the clipboard, this makes a copy of the clipboard's parts and adds the copies to this Diagram.
+        * If the clipboard holds a collection of Parts, and if the Model.dataFormat matches that stored in the clipboard, this makes a copy of the clipboard's parts and adds the copies to this Diagram.
         */
-        pasteFromClipboard(): Set;
+        pasteFromClipboard(): Set<Part>;
 
         /**
         * Copy the contents of the clipboard into this diagram, and make those new parts the new selection.
         * @param {Point=} pos Point at which to center the newly pasted parts; if not present the parts are not moved.
         */
-        pasteSelection(pos?: Point);
+        pasteSelection(pos?: Point): void;
 
         /**
-        * Call UndoManager#redo.
+        * Call UndoManager.redo.
         */
-        redo();
+        redo(): void;
 
         /**
-        * Set the Diagram#scale to a new scale value, by default 1.
+        * Set the Diagram.scale to a new scale value, by default 1.
         * @param {number=} newscale This defaults to 1.  The value should be greater than zero.
         */
-        resetZoom(newscale?: number);
+        resetZoom(newscale?: number): void;
 
         /**
         * Select all of the selectable Parts in the diagram.
         */
-        selectAll();
+        selectAll(): void;
+
+        /**
+        * Open the context menu of a given GraphObject.
+        * The given GraphObject must have a GraphObject.contextMenu
+        * defined in order to show anything.
+        * @param {GraphObject|Diagram=} obj a GraphObject or Diagram with a contextMenu defined.
+        * If none is given, this method will use the first selected object, or else the Diagram.
+        */
+        showContextMenu(obj?: GraphObject | Diagram): void;
 
         /**
         * Cancel the operation of the current tool.
         */
-        stopCommand();
+        stopCommand(): void;
 
         /**
-        * Call UndoManager#undo.
+        * Call UndoManager.undo.
         */
-        undo();
+        undo(): void;
 
         /**
         * Remove the group from the diagram without removing its members from the diagram.
         * @param {Group=} group if supplied, ignore the selection and consider ungrouping this particular Group.
         */
-        ungroupSelection(group?: Group);
+        ungroupSelection(group?: Group): void;
 
         /**
-        * Change the Diagram#scale so that the Diagram#documentBounds fits within the viewport.
+        * Change the Diagram.scale so that the Diagram.documentBounds fits within the viewport.
         */
-        zoomToFit();
+        zoomToFit(): void;
     }
 
     /**
@@ -322,7 +385,7 @@ declare module go {
         /**
         * Construct an empty Diagram for a particular DIV HTML element.
         * @param {HTMLDivElement} div A reference to a DIV HTML element in the DOM.
-        * If no DIV is supplied one will be created in memory. The Diagram's Diagram#div property
+        * If no DIV is supplied one will be created in memory. The Diagram's Diagram.div property
         * can then be set later on.
         */
         constructor(div: HTMLDivElement);
@@ -330,7 +393,7 @@ declare module go {
         /**
         * Construct an empty Diagram for a particular DIV HTML element.
         * @param {string=} div The ID of a DIV element in the DOM.
-        * If no DIV identifier is supplied one will be created in memory. The Diagram's Diagram#div property
+        * If no DIV identifier is supplied one will be created in memory. The Diagram's Diagram.div property
         * can then be set later on.
         */
         constructor(div?: string);
@@ -395,11 +458,14 @@ declare module go {
         /**Gets or sets whether the user may zoom into or out of the Diagram.*/
         allowZoom: boolean;
 
+        /**This read-only property returns the AnimationManager for this Diagram.*/
+        animationManager: AnimationManager;
+
         /**Gets or sets the autoScale of the Diagram, controlling whether or not the Diagram's bounds automatically scale to fit the view.*/
         autoScale: EnumValue;
 
         /**Gets or sets the Margin (or number for a uniform Margin) that describes the Diagram's autoScrollRegion.*/
-        autoScrollRegion: any;
+        autoScrollRegion: MarginLike;
 
         /**Gets or sets the function to execute when the user single-primary-clicks on the background of the Diagram.*/
         click: (e: InputEvent) => void;
@@ -407,7 +473,7 @@ declare module go {
         /**Gets or sets the CommandHandler for this Diagram.*/
         commandHandler: CommandHandler;
 
-        /**Gets or sets the content alignment Spot of this Diagram, to be used in determining how parts are positioned when the #viewportBounds width or height is smaller than the #documentBounds.*/
+        /**Gets or sets the content alignment Spot of this Diagram, to be used in determining how parts are positioned when the .viewportBounds width or height is smaller than the .documentBounds.*/
         contentAlignment: Spot;
 
         /**Gets or sets the function to execute when the user single-secondary-clicks on the background of the Diagram.*/
@@ -416,7 +482,7 @@ declare module go {
         /**This Adornment is shown when the use context clicks in the background.*/
         contextMenu: Adornment;
 
-        /**Gets or sets the current cursor for the Diagram, overriding the #defaultCursor.*/
+        /**Gets or sets the current cursor for the Diagram, overriding the .defaultCursor.*/
         currentCursor: string;
 
         /**Gets or sets the current tool for this Diagram that handles all input events.*/
@@ -431,7 +497,7 @@ declare module go {
         /**Gets or sets the Diagram's HTMLDivElement, via an HTML Element ID.*/
         div: HTMLDivElement;
 
-        /**Gets the model-coordinate bounds of the Diagram.*/
+        /**This read-only property returns the model-coordinate bounds of the Diagram.*/
         documentBounds: Rect;
 
         /**Gets or sets the function to execute when the user double-primary-clicks on the background of the Diagram.*/
@@ -440,20 +506,32 @@ declare module go {
         /**Gets or sets the most recent mouse-down InputEvent that occurred.*/
         firstInput: InputEvent;
 
-        /**Gets or sets a fixed bounding rectangle to be returned by #documentBounds and #computeBounds.*/
+        /**Gets or sets a fixed bounding rectangle to be returned by .documentBounds and .computeBounds.*/
         fixedBounds: Rect;
 
-        /**Gets or sets a Panel of type Panel#Grid acting as the background grid extending across the whole viewport of this diagram.*/
+        /**Gets or sets the scrollMode of the Diagram.*/
+        scrollMode: EnumValue;
+
+        /**Gets or sets the Margin (or number for a uniform Margin) that describes a scrollable area that surrounds the document bounds, allowing the user to scroll into empty space.*/
+        scrollMargin: MarginLike;
+
+        /**Gets or sets the function used to determine the position that this Diagram can be scrolled or moved to.*/
+        positionComputation: (d: Diagram, p: Point) => Point;
+
+        /**Gets or sets the function used to determine the scale that this Diagram can be set to.*/
+        scaleComputation: (d: Diagram, s: number) => number;
+
+        /**Gets or sets a Panel of type Panel.Grid acting as the background grid extending across the whole viewport of this diagram.*/
         grid: Panel;
 
         /**Gets or sets the default selection Adornment template, used to adorn selected Groups.*/
         groupSelectionAdornmentTemplate: Adornment;
 
-        /**Gets or sets the default Group template used as the archetype for group data that is added to the #model.*/
+        /**Gets or sets the default Group template used as the archetype for group data that is added to the .model.*/
         groupTemplate: Group;
 
         /**Gets or sets a Map mapping template names to Groups.*/
-        groupTemplateMap: Map;
+        groupTemplateMap: Map<string,Group>;
 
         /**Gets or sets whether the Diagram has a horizontal Scrollbar.*/
         hasHorizontalScrollbar: boolean;
@@ -461,28 +539,31 @@ declare module go {
         /**Gets or sets whether the Diagram has a vertical Scrollbar.*/
         hasVerticalScrollbar: boolean;
 
+        /**This read-only property returns the read-only collection of highlighted Parts.*/
+        highlighteds: Set<Part>;
+
         /**Gets or sets the initialAutoScale of the Diagram.*/
         initialAutoScale: EnumValue;
 
         /**Gets or sets the initial content alignment Spot of this Diagram, to be used in determining how parts are positioned initially relative to the viewport.*/
         initialContentAlignment: Spot;
 
-        /**Gets or sets the spot in the document's area that should be coincident with the #initialViewportSpot of the viewport when the document is first initialized.*/
+        /**Gets or sets the spot in the document's area that should be coincident with the .initialViewportSpot of the viewport when the document is first initialized.*/
         initialDocumentSpot: Spot;
 
-        /**Gets or sets the initial coordinates of this Diagram in the viewport, eventually setting the #position.*/
+        /**Gets or sets the initial coordinates of this Diagram in the viewport, eventually setting the .position.*/
         initialPosition: Point;
 
-        /**Gets or sets the initial scale of this Diagram in the viewport, eventually setting the #scale.*/
+        /**Gets or sets the initial scale of this Diagram in the viewport, eventually setting the .scale.*/
         initialScale: number;
 
-        /**Gets or sets the spot in the viewport that should be coincident with the #initialDocumentSpot of the document when the document is first initialized.*/
+        /**Gets or sets the spot in the viewport that should be coincident with the .initialDocumentSpot of the document when the document is first initialized.*/
         initialViewportSpot: Spot;
 
         /**Gets or sets whether the user may interact with the Diagram.*/
         isEnabled: boolean;
 
-        /**Gets or sets whether the Diagram's Diagram#model is Model#isReadOnly.*/
+        /**Gets or sets whether the Diagram's Diagram.model is Model.isReadOnly.*/
         isModelReadOnly: boolean;
 
         /**Gets or sets whether this Diagram's state has been modified.*/
@@ -501,30 +582,30 @@ declare module go {
         lastInput: InputEvent;
 
         /**Gets an iterator for this Diagram's Layers.*/
-        layers: Iterator;
+        layers: Iterator<Layer>;
 
         /**Gets or sets the Layout used to position all of the top-level nodes and links in this Diagram.*/
         layout: Layout;
 
         /**Returns an iterator of all Links in the Diagram.*/
-        links: Iterator;
+        links: Iterator<Link>;
 
         /**Gets or sets the default selection Adornment template, used to adorn selected Links.*/
         linkSelectionAdornmentTemplate: Adornment;
 
-        /**Gets or sets the default Link template used as the archetype for link data that is added to the #model.*/
+        /**Gets or sets the default Link template used as the archetype for link data that is added to the .model.*/
         linkTemplate: Link;
 
         /**Gets or sets a Map mapping template names to Links.*/
-        linkTemplateMap: Map;
+        linkTemplateMap: Map<string,Link>;
 
-        /**Gets or sets the largest value that #scale may take.*/
+        /**Gets or sets the largest value that .scale may take.*/
         maxScale: number;
 
         /**Gets or sets the maximum number of selected objects.*/
         maxSelectionCount: number;
 
-        /**Gets or sets the smallest value greater than zero that #scale may take.*/
+        /**Gets or sets the smallest value greater than zero that .scale may take.*/
         minScale: number;
 
         /**Gets or sets the Model holding data corresponding to the data-bound nodes and links of this Diagram.*/
@@ -546,22 +627,22 @@ declare module go {
         mouseOver: (e: InputEvent) => void;
 
         /**Returns an iterator of all Nodes and Groups in the Diagram.*/
-        nodes: Iterator;
+        nodes: Iterator<Node>;
 
         /**Gets or sets the default selection Adornment template, used to adorn selected Parts other than Groups or Links.*/
         nodeSelectionAdornmentTemplate: Adornment;
 
-        /**Gets or sets the default Node template used as the archetype for node data that is added to the #model.*/
+        /**Gets or sets the default Node template used as the archetype for node data that is added to the .model.*/
         nodeTemplate: Part;
 
         /**Gets or sets a Map mapping template names to Parts.*/
-        nodeTemplateMap: Map;
+        nodeTemplateMap: Map<string,Part>;
 
         /**Gets or sets the Margin (or number for a uniform Margin) that describes the Diagram's padding, which controls how much extra space there is around the area occupied by the document.*/
-        padding: any;
+        padding: MarginLike;
 
         /**Returns an iterator of all Parts in the Diagram that are not Nodes or Links or Adornments.*/
-        parts: Iterator;
+        parts: Iterator<Part>;
 
         /**Gets or sets the coordinates of this Diagram in the viewport.*/
         position: Point;
@@ -575,114 +656,128 @@ declare module go {
         /**Gets or sets the distance in screen pixels that the vertical scrollbar will scroll when scrolling by a line.*/
         scrollVerticalLineChange: number;
 
-        /**Gets the read-only collection of selected objects.*/
-        selection: Set;
+        /**This read-only property returns the read-only collection of selected Parts.*/
+        selection: Set<Part>;
 
         /**Gets or sets whether ChangedEvents are not recorded by the UndoManager.*/
         skipsUndoManager: boolean;
 
-        /**Gets the UndoManager for this Diagram, which actually belongs to the #model.*/
+        /**This read-only property returns the ToolManager for this Diagram.*/
         toolManager: ToolManager;
 
         /**This Adornment is shown when the mouse stays motionless in the background.*/
         toolTip: Adornment;
 
-        /**Gets the UndoManager for this Diagram, which actually belongs to the #model.*/
+        /**This read-only property returns the UndoManager for this Diagram, which actually belongs to the .model.*/
         undoManager: UndoManager;
 
         /**Gets or sets what kinds of graphs this diagram allows the user to draw.*/
         validCycle: EnumValue;
 
-        /**Gets the bounds of the portion of the Diagram that is viewable from its HTML Canvas.*/
+        /**This read-only property returns the bounds of the portion of the Diagram that is viewable from its HTML Canvas.*/
         viewportBounds: Rect;
 
-        /**Gets or sets the point, in viewport coordinates, where changes to the #scale will keep the focus in the document.*/
+        /**Gets or sets the point, in viewport coordinates, where changes to the .scale will keep the focus in the document.*/
         zoomPoint: Point;
 
         /**
-        * Adds a Part to the Layer that matches the Part's Part#layerName, or else to the default layer, which is named with the empty string.
+        * Adds a Part to the Layer that matches the Part's Part.layerName, or else to the default layer, which is named with the empty string.
         * @param {Part} part
         */
-        add(part: Part);
+        add(part: Part): void;
 
         /**
         * Register an event handler that is called when there is a ChangedEvent.
         * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
         */
-        addChangedListener(listener: (e: ChangedEvent) => void);
+        addChangedListener(listener: (e: ChangedEvent) => void ): void;
 
         /**
         * Register an event handler that is called when there is a DiagramEvent of a given name.
         * @param {string} name the name is normally capitalized, but this method uses case-insensitive comparison.
         * @param {function(DiagramEvent)} listener a function that takes a DiagramEvent as its argument.
         */
-        addDiagramListener(name: string, listener: (e: DiagramEvent) => void);
+        addDiagramListener(name: string, listener: (e: DiagramEvent) => void ): void;
 
         /**
         * Adds a Layer to the list of layers.
         * @param {Layer} layer The Layer to add.
         */
-        addLayer(layer: Layer);
+        addLayer(layer: Layer): void;
 
         /**
         * Adds a layer to the list of layers after a specified layer.
         * @param {Layer} layer The Layer to add.
         * @param {Layer} existingLayer The layer to insert after.
         */
-        addLayerAfter(layer: Layer, existingLayer: Layer);
+        addLayerAfter(layer: Layer, existingLayer: Layer): void;
 
         /**
         * Adds a layer to the list of layers before a specified layer.
         * @param {Layer} layer The Layer to add.
         * @param {Layer} existingLayer The layer to insert before.
         */
-        addLayerBefore(layer: Layer, existingLayer: Layer);
+        addLayerBefore(layer: Layer, existingLayer: Layer): void;
 
         /**
-        * Aligns the Diagram's #position based on a desired document Spot and viewport Spot.
+        * Aligns the Diagram's .position based on a desired document Spot and viewport Spot.
         * @param {Spot} documentspot
         * @param {Spot} viewportspot
         */
-        alignDocument(documentspot: Spot, viewportspot: Spot);
+        alignDocument(documentspot: Spot, viewportspot: Spot): void;
 
         /**
-        * Modifies the #position to show a given Rect of the Diagram by centering the viewport on that Rect.
+        * Modifies the .position to show a given Rect of the Diagram by centering the viewport on that Rect.
         * @param {Rect} r
         */
-        centerRect(r: Rect);
+        centerRect(r: Rect): void;
 
         /**
         * Removes all Parts from the Diagram, including unbound Parts and the background grid, and also clears out the Model and UndoManager.
         */
-        clear();
+        clear(): void;
+
+        /**
+        * Remove highlights from all Parts.
+        */
+        clearHighlighteds(): void;
 
         /**
         * Deselect all selected Parts.
         */
-        clearSelection();
+        clearSelection(): void;
 
         /**
         * Commit the changes of the current transaction.
+        * This just calls UndoManager.commitTransaction.
         * @param {string} tname a descriptive name for the transaction.
         */
         commitTransaction(tname: string): boolean;
 
         /**
-        * This is called during a Diagram update to determine a new value for #documentBounds.
+        * This is called during a Diagram update to determine a new value for .documentBounds.
         */
         computeBounds(): Rect;
 
         /**
-        * Find the union of the GraphObject#actualBounds of all of the Parts in the given collection.
-        * @param {Iterable} coll a collection of Parts.
+        * Find the union of the GraphObject.actualBounds of all of the Parts in the given collection.
+        * @param {Iterable<Part>} coll a collection of Parts.
         */
-        computePartsBounds(coll: Iterable): Rect;
+        computePartsBounds(coll: Iterable<Part>): Rect;
 
         /**
-        * Updates the diagram immediately, then resets initialization flags so that actions taken in the argument function will be considered part of Diagram initialization, and will participate in initial layouts, #initialAutoScale, #initialContentAlignment, etc.
+        * Make a copy of a collection of Parts and return them in a Map mapping each original Part to its copy.
+        * @param {Iterable<Part>} coll  A List or a Set or Iterator of Parts.
+        * @param {Diagram} diagram  The destination diagram; if null, the copied parts are not added to this diagram.
+        * @param {boolean} check  Whether to check Part.canCopy on each part.
+        */
+        copyParts(coll: Iterable<Part>, diagram: Diagram, check: boolean): void;
+
+        /**
+        * Updates the diagram immediately, then resets initialization flags so that actions taken in the argument function will be considered part of Diagram initialization, and will participate in initial layouts, .initialAutoScale, .initialContentAlignment, etc.
         * @param {function()|null=} func an optional function of actions to perform as part of another diagram initialization.
         */
-        delayInitialization(func?: () => void);
+        delayInitialization(func?: () => void ): void;
 
         /**
         * Finds a layer with a given name.
@@ -696,6 +791,13 @@ declare module go {
         */
         findLinkForData(linkdata: Object): Link;
 
+        /**
+        * Return a collection of Links that are bound to data whose properties have values
+        * that match those specified by the given example data.
+        * @param {...Object} examples
+        */
+        findLinksByExample(...examples: Array<Object>): Iterator<Link>;
+
         /**
         * Look for a Node or Group corresponding to a model's node data object.
         * @param {Object} nodedata
@@ -706,7 +808,14 @@ declare module go {
         * Look for a Node or Group corresponding to a model's node data object's unique key.
         * @param {*} key a string or number.
         */
-        findNodeForKey(key: any): Node;
+        findNodeForKey(key: Key): Node;
+
+        /**
+        * Return a collection of Nodes and Groups that are bound to data whose properties have values
+        * that match those specified by the given example data.
+        * @param {...Object} examples
+        */
+        findNodesByExample(...examples: Array<Object>): Iterator<Node>;
 
         /**
         * Find the front-most GraphObject at the given point in document coordinates.
@@ -730,8 +839,8 @@ declare module go {
         * defaulting to a predicate that always returns true.
         * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
         */
-        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: List): Iterable;
-        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: Set): Iterable;
+        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: Set<GraphObject>): Set<GraphObject>;
 
         /**
         * Returns a collection of all GraphObjects that are inside or that intersect a given Rect in document coordinates.
@@ -746,8 +855,8 @@ declare module go {
         * if it must be entirely inside the rectangular area (false).  The default value is false.
         * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
         */
-        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List): Iterable;
-        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set): Iterable;
+        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
 
         /**
         * Returns a collection of all GraphObjects that are within a certain distance of a given point in document coordinates.
@@ -764,13 +873,13 @@ declare module go {
         * The default is true.
         * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
         */
-        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List): Iterable;
-        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set): Iterable;
+        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
 
         /**
         * This convenience function finds the front-most Part that is at a given point and that might be selectable.
         * @param {Point} p a Point in document coordinates.
-        * @param {boolean} selectable Whether to only consider parts that are Part#selectable.
+        * @param {boolean} selectable Whether to only consider parts that are Part.selectable.
         */
         findPartAt(p: Point, selectable: boolean): Part;
 
@@ -784,45 +893,57 @@ declare module go {
         * Look for a Part or Node or Group corresponding to a model's data object's unique key.
         * @param {*} key a string or number.
         */
-        findPartForKey(key: any): Part;
+        findPartForKey(key: Key): Part;
 
         /**
         * Returns an iterator of all Groups that are at top-level, in other words that are not themselves inside other Groups.
         */
-        findTopLevelGroups(): Iterator;
+        findTopLevelGroups(): Iterator<Group>;
 
         /**
         * Returns an iterator of all top-level Nodes that have no tree parents.
         */
-        findTreeRoots(): Iterator;
+        findTreeRoots(): Iterator<Node>;
 
         /**
         * Explicitly bring focus to the Diagram's canvas.
         */
-        focus();
+        focus(): void;
 
         /**
-        * This static method gets the Diagram that is attached to an HTML DIV element.
+        * This static function gets the Diagram that is attached to an HTML DIV element.
         * @param {HTMLDivElement} div
         */
         static fromDiv(div: HTMLDivElement): Diagram;
 
+        /**
+        * Make the given part the only highlighted part.
+        * @param {Part} part
+        */
+        highlight(part: Part): void;
+
+        /**
+        * Highlight all of the Parts supplied in the given collection, and clear all other highlighted Parts.
+        * @param {Iterable<Part>|Array<Part>} coll an Iterable of Parts
+        */
+        highlightCollection(coll: Iterable<Part> | Array<Part>): void;
+
         /**
         * This static function declares that a class (constructor function) derives from another class -- but please note that most classes do not support inheritance.
         * @param {Function} derivedclass
         * @param {Function} baseclass
         */
-        static inherit(derivedclass: new(...args: any[]) => Object, baseclass: new(...args: any[]) => Object);
+        static inherit(derivedclass: Constructor, baseclass: Constructor): void;
 
         /**
         * Perform all invalid layouts.
-        * @param {boolean=} invalidateAll If true, this will explicitly set Layout#isValidLayout to false on each Layout in the diagram.
+        * @param {boolean=} invalidateAll If true, this will explicitly set Layout.isValidLayout to false on each Layout in the diagram.
         */
-        layoutDiagram(invalidateAll?: boolean);
+        layoutDiagram(invalidateAll?: boolean): void;
 
         /**
         * Create an HTMLImageElement that contains a bitmap of the current Diagram.
-        * @param {Object=} properties For details see the argument description of #makeImageData.
+        * @param {Object=} properties For details see the argument description of .makeImageData.
         */
         makeImage(properties?: Object): HTMLImageElement;
 
@@ -832,80 +953,123 @@ declare module go {
             scale: number,
             maxSize: Size,
             position: Point,
-            parts: Iterable,
+            parts: Iterable<Part>,
             padding: (Margin|number),
             showTemporary: boolean,
             showGrid: boolean,
-
+            document: Document,
             type: string,
-            details: Object}=} properties a JavaScript object detailing optional arguments for image creation, to be passed to makeImageData.
+            details: *
+          }=} properties a JavaScript object detailing optional arguments for image creation, to be passed to makeImageData.
         */
         makeImageData(properties?: Object): string;
 
+        /**
+        * Create an SVGElement that contains a SVG rendering of the current Diagram.
+        * By default this method returns a snapshot of the visible diagram, but optional arguments give more options.
+        * @param {{ size: Size,
+            scale: number,
+            maxSize: Size,
+            position: Point,
+            parts: Iterable<Part>,
+            padding: (Margin|number),
+            showTemporary: boolean,
+            showGrid: boolean,
+            document: Document,
+            elementFinished: function(GraphObject, SVGElement),
+            details: *
+          }=} properties a JavaScript object detailing optional arguments for SVG creation.
+        * @return {SVGElement}
+        */
+        makeSvg(properties?: Object): SVGElement;
+
+        /**
+        * Move a collection of Parts in this Diagram by a given offset.
+        * @param {Iterable<Part>} coll  A List or a Set or Iterator of Parts.
+        * @param {Point} offset  the X and Y change to be made to each Part, in document coordinates.
+        * @param {boolean} check  Whether to check Part.canMove on each part.
+        */
+        moveParts(coll: Iterable<Part>, offset: Point, check: boolean): void;
+
         /**
         * Remove all of the Parts created from model data and then create them again.
         */
-        rebuildParts();
+        rebuildParts(): void;
 
         /**
         * Removes a Part from its Layer, provided the Layer is in this Diagram.
         * @param {Part} part
         */
-        remove(part: Part);
+        remove(part: Part): void;
 
         /**
         * Unregister an event handler listener.
         * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
         */
-        removeChangedListener(listener: (e: ChangedEvent) => void);
+        removeChangedListener(listener: (e: ChangedEvent) => void ): void;
 
         /**
         * Unregister a DiagramEvent handler.
         * @param {string} name the name is normally capitalized, but this method uses case-insensitive comparison.
         * @param {function(DiagramEvent)} listener a function that takes a DiagramEvent as its argument.
         */
-        removeDiagramListener(name: string, listener: (e: DiagramEvent) => void);
+        removeDiagramListener(name: string, listener: (e: DiagramEvent) => void ): void;
 
         /**
         * Removes the given layer from the list of layers.
         * @param {Layer} layer
         */
-        removeLayer(layer: Layer);
+        removeLayer(layer: Layer): void;
+
+        /**
+        * This method removes from this Diagram all of the Parts in a collection.
+        * @param {Iterable<Part>|Array<Part>} coll A List or Set or Iterator of Parts.
+        * @param {boolean} check Whether to check Part.canDelete on each part.
+        */
+        removeParts(coll: Iterable<Part> | Array<Part>, check: boolean): void;
 
         /**
         * Rollback the current transaction, undoing any recorded changes.
+        * This just calls UndoManager.rollbackTransaction.
         */
         rollbackTransaction(): boolean;
 
         /**
-        * Scrolling function used by primarily by #commandHandler's CommandHandler#doKeyDown.
+        * Scrolling function used by primarily by .commandHandler's CommandHandler.doKeyDown.
         * @param {string} unit A string representing the unit of the scroll operation. Can be 'pixel', 'line', or 'page'.
         * @param {string} dir The direction of the scroll operation. Can be 'up', 'down', 'left', or 'right'.
         * @param {number=} dist An optional distance multiplier, for multiple pixels, lines, or pages. Default is 1.
         */
-        scroll(unit: string, dir: string, dist?: number);
+        scroll(unit: string, dir: string, dist?: number): void;
 
         /**
-        * Modifies the #position to show a given Rect of the Diagram by centering the viewport on that Rect.
+        * Modifies the .position to show a given Rect of the Diagram by centering the viewport on that Rect.
         * @param {Rect} r
         */
-        scrollToRect(r: Rect);
+        scrollToRect(r: Rect): void;
 
         /**
         * Make the given object the only selected object.
         * @param {GraphObject} part a GraphObject that is already in a layer of this Diagram.
         * If the value is null, this does nothing.
         */
-        select(part: Part);
+        select(part: Part): void;
 
         /**
         * Select all of the Parts supplied in the given collection.
-        * @param {Iterable} coll a List or Set of Parts to be selected.
+        * @param {Iterable<Part>|Array<Part>} coll a List or Set of Parts to be selected.
         */
-        selectCollection(coll: Iterable);
+        selectCollection(coll: Iterable<Part> | Array<Part>): void;
+
+        /**
+        * This method sets a collection of properties according to the property/value pairs that have been set on the given Object,
+        * in the same manner as GraphObject.make does when constructing a Diagram with an argument that is a simple JavaScript Object.
+        */
+        setProperties(props: Object): void;
 
         /**
         * Begin a transaction, where the changes are held by a Transaction object in the UndoManager.
+        * This just calls UndoManager.startTransaction.
         * @param {string=} tname a descriptive name for the transaction.
         */
         startTransaction(tname?: string): boolean;
@@ -925,60 +1089,80 @@ declare module go {
         /**
         * Update all of the data-bound properties of Nodes and Links in this diagram.
         */
-        updateAllTargetBindings();
+        updateAllTargetBindings(): void;
+
+        /**
+        * Update all of the references to nodes in case they had been modified in the model without
+        * properly notifying the model by calling GraphLinksModel.setGroupKeyForNodeData or
+        * GraphLinksModel.setToKeyForLinkData or other similar methods.
+        */
+        updateAllRelationshipsFromData(): void;
 
         /**
         * Scales the Diagram to uniformly fit into the viewport.
         */
-        zoomToFit();
+        zoomToFit(): void;
 
         /**
-        * Modifies the #scale and #position of the Diagram so that the viewport displays a given document-coordinates rectangle.
+        * Modifies the .scale and .position of the Diagram so that the viewport displays a given document-coordinates rectangle.
         * @param {Rect} r rectangular bounds in document coordinates.
-        * @param {EnumValue=} scaling an optional value of either #Uniform (the default) or #UniformToFill.
+        * @param {EnumValue=} scaling an optional value of either .Uniform (the default) or .UniformToFill.
         */
-        zoomToRect(r: Rect, scaling?: EnumValue);
+        zoomToRect(r: Rect, scaling?: EnumValue): void;
 
-        /**This value for Diagram#validCycle states that there are no restrictions on making cycles of links.*/
+        /**This value for Diagram.validCycle states that there are no restrictions on making cycles of links.*/
         static CycleAll: EnumValue;
 
-        /**This value for Diagram#validCycle states that any number of destination links may go out of a node, but at most one source link may come into a node, and there are no directed cycles.*/
+        /**This value for Diagram.validCycle states that any number of destination links may go out of a node, but at most one source link may come into a node, and there are no directed cycles.*/
         static CycleDestinationTree: EnumValue;
 
-        /**This value for Diagram#validCycle states that a valid link from a node will not produce a directed cycle in the graph.*/
+        /**This value for Diagram.validCycle states that a valid link from a node will not produce a directed cycle in the graph.*/
         static CycleNotDirected: EnumValue;
 
-        /**This value for Diagram#validCycle states that a valid link from a node will not produce an undirected cycle in the graph.*/
+        /**This value for Diagram.validCycle states that a valid link from a node will not produce an undirected cycle in the graph.*/
         static CycleNotUndirected: EnumValue;
 
-        /**This value for Diagram#validCycle states that any number of source links may come into a node, but at most one destination link may go out of a node, and there are no directed cycles.*/
+        /**This value for Diagram.validCycle states that any number of source links may come into a node, but at most one destination link may go out of a node, and there are no directed cycles.*/
         static CycleSourceTree: EnumValue;
 
-        /**The default autoScale type, used as the value of Diagram#autoScale: The Diagram does not attempt to scale its bounds to fit the view.*/
+        /**The default autoScale type, used as the value of Diagram.autoScale: The Diagram does not attempt to scale its bounds to fit the view.*/
         static None: EnumValue;
 
-        /**Diagrams with this autoScale type, used as the value of Diagram#autoScale, are scaled uniformly until the documentBounds fits in the view.*/
+        /**Diagrams with this autoScale type, used as the value of Diagram.autoScale, are scaled uniformly until the documentBounds fits in the view.*/
         static Uniform: EnumValue;
 
-        /**Diagrams with this autoScale type, used as the value of Diagram#autoScale, are scaled uniformly until the documentBounds fits in the view.*/
+        /**Diagrams with this autoScale type, used as the value of Diagram.autoScale, are scaled uniformly until the documentBounds fits in the view.*/
         static UniformToFill: EnumValue;
 
-        maybeUpdate();  // undocumented
-        requestUpdate();  // undocumented
+        /**This value for Diagram.scrollMode states that the viewport constrains scrolling to the Diagram document bounds.*/
+        static DocumentScroll: EnumValue;
+
+        /**This value for Diagram.scrollMode states that the viewport does not constrain scrolling to the Diagram document bounds.*/
+        static InfiniteScroll: EnumValue;
+
+        getRenderingHint(name: string): any;  // undocumented
+        setRenderingHint(name: string, val: any): void;  // undocumented
+        getInputOption(name: string): any;  // undocumented
+        setInputOption(name: string, val: any): void;  // undocumented
+        maybeUpdate(): void;  // undocumented
+        requestUpdate(): void;  // undocumented
+        reset(): void;  // undocumented
+        simulatedMouseMove(e: Event, modelpt: Point, overdiag?: Diagram): boolean;  // undocumented
+        simulatedMouseUp(e: Event, other: Diagram, modelpt: Point, curdiag?: Diagram): boolean;  // undocumented
     }
 
     /**
     * A DiagramEvent represents a more abstract event than an InputEvent.
     * They are raised on the Diagram class.
     * One can receive such events by registering a DiagramEvent listener on a Diagram
-    * by calling Diagram#addDiagramListener.
+    * by calling Diagram.addDiagramListener.
     * Some DiagramEvents such as "ObjectSingleClicked" are normally
     * associated with InputEvents.
     * Some DiagramEvents such as "SelectionMoved" or "PartRotated" are associated with the
     * results of Tool-handled gestures or CommandHandler actions.
     * Some DiagramEvents are not necessarily associated with any input events at all,
     * such as "ViewportBoundsChanged", which can happen due to programmatic
-    * changes to the Diagram#position and Diagram#scale properties.
+    * changes to the Diagram.position and Diagram.scale properties.
     */
     class DiagramEvent {
         /**
@@ -989,7 +1173,7 @@ declare module go {
         /**Gets or sets whether any default actions associated with this diagram event should be avoided or cancelled.*/
         cancel: boolean;
 
-        /**Gets the diagram associated with the event.*/
+        /**This read-only property returns the diagram associated with the event.*/
         diagram: Diagram;
 
         /**Gets or sets the name of the kind of diagram event that this represents.*/
@@ -999,7 +1183,7 @@ declare module go {
         parameter: any;
 
         /**Gets or sets an optional object that is the subject of the diagram event.*/
-        subject: Object;
+        subject: any;
     }
 
     /**
@@ -1011,19 +1195,19 @@ declare module go {
         */
         constructor();
 
-        /**Gets or sets the function to execute when the ActionTool is cancelled and this GraphObject's #isActionable is set to true.*/
+        /**Gets or sets the function to execute when the ActionTool is cancelled and this GraphObject's .isActionable is set to true.*/
         actionCancel: (e: InputEvent, obj: GraphObject) => void;
 
-        /**Gets or sets the function to execute on a mouse-down event when this GraphObject's #isActionable is set to true.*/
+        /**Gets or sets the function to execute on a mouse-down event when this GraphObject's .isActionable is set to true.*/
         actionDown: (e: InputEvent, obj: GraphObject) => void;
 
-        /**Gets or sets the function to execute on a mouse-move event when this GraphObject's #isActionable is set to true.*/
+        /**Gets or sets the function to execute on a mouse-move event when this GraphObject's .isActionable is set to true.*/
         actionMove: (e: InputEvent, obj: GraphObject) => void;
 
-        /**Gets or sets the function to execute on a mouse-up event when this GraphObject's #isActionable is set to true.*/
+        /**Gets or sets the function to execute on a mouse-up event when this GraphObject's .isActionable is set to true.*/
         actionUp: (e: InputEvent, obj: GraphObject) => void;
 
-        /**Gets the bounds of this GraphObject in container coordinates.*/
+        /**This read-only property returns the bounds of this GraphObject in container coordinates.*/
         actualBounds: Rect;
 
         /**Gets or sets the alignment Spot of this GraphObject used in Panel layouts, to determine where in the area allocated by the panel this object should be placed.*/
@@ -1036,10 +1220,10 @@ declare module go {
         angle: number;
 
         /**Gets or sets the areaBackground Brush (or CSS color string) of this GraphObject.*/
-        areaBackground: any;
+        areaBackground: BrushLike;
 
         /**Gets or sets the background Brush (or CSS color string) of this GraphObject, filling the rectangle of this object's local coordinate space.*/
-        background: any;
+        background: BrushLike;
 
         /**Gets or sets the function to execute when the user single-primary-clicks on this object.*/
         click: (e: InputEvent, obj: GraphObject) => void;
@@ -1062,7 +1246,7 @@ declare module go {
         /**Gets or sets the desired size of this GraphObject in local coordinates.*/
         desiredSize: Size;
 
-        /**Gets the Diagram that this GraphObject is in, if it is.*/
+        /**This read-only property returns the Diagram that this GraphObject is in, if it is.*/
         diagram: Diagram;
 
         /**Gets or sets the function to execute when the user double-primary-clicks on this object.*/
@@ -1074,8 +1258,8 @@ declare module go {
         /**Gets or sets the length of the last segment of a link coming from this port.*/
         fromEndSegmentLength: number;
 
-        /**Gets or sets whether the user may draw Links from this port.*/
-        fromLinkable: any;
+        /**Gets or sets whether the user may draw Links from this port. The value must be either a boolean or null.*/
+        fromLinkable: boolean;
 
         /**Gets or sets whether the user may draw duplicate Links from this port.*/
         fromLinkableDuplicates: boolean;
@@ -1101,16 +1285,16 @@ declare module go {
         /**Gets or sets whether a GraphObject is the "main" object for some types of Panel.*/
         isPanelMain: boolean;
 
-        /**Gets the GraphObject's containing Layer, if there is any.*/
+        /**This read-only property returns the GraphObject's containing Layer, if there is any.*/
         layer: Layer;
 
         /**Gets or sets the size of empty area around this GraphObject, as a Margin (or number for a uniform Margin), in the containing Panel coordinates.*/
-        margin: any;
+        margin: MarginLike;
 
         /**Gets or sets the maximum size of this GraphObject in container coordinates (either a Panel or the document).*/
         maxSize: Size;
 
-        /**Gets the measuredBounds of the GraphObject in container coordinates (either a Panel or the document).*/
+        /**This read-only property returns the measuredBounds of the GraphObject in container coordinates (either a Panel or the document).*/
         measuredBounds: Rect;
 
         /**Gets or sets the minimum size of this GraphObject in container coordinates (either a Panel or the document).*/
@@ -1143,16 +1327,19 @@ declare module go {
         /**Gets or sets the name for this object.*/
         name: string;
 
-        /**Gets the natural bounding rectangle of this GraphObject in local coordinates, before any transformation by #scale or #angle, and before any resizing due to #minSize or #maxSize or #stretch.*/
+        /**This read-only property returns the natural bounding rectangle of this GraphObject in local coordinates, before any transformation by .scale or .angle, and before any resizing due to .minSize or .maxSize or .stretch.*/
         naturalBounds: Rect;
 
-        /**Gets the GraphObject's containing Panel, or null if this object is not in a Panel.*/
+        /**Gets or sets the multiplicative opacity for this GraphObject and (if a Panel) all nested elements.*/
+        opacity: number;
+
+        /**This read-only property returns the GraphObject's containing Panel, or null if this object is not in a Panel.*/
         panel: Panel;
 
-        /**Gets the Part containing this object, if any.*/
+        /**This read-only property returns the Part containing this object, if any.*/
         part: Part;
 
-        /**Gets or sets whether or not this GraphObject can be chosen by visual "find" methods such as Diagram#findObjectAt.*/
+        /**Gets or sets whether or not this GraphObject can be chosen by visual "find" methods such as Diagram.findObjectAt.*/
         pickable: boolean;
 
         /**Gets or sets an identifier for an object acting as a port on a Node.*/
@@ -1191,8 +1378,8 @@ declare module go {
         /**Gets or sets the length of the last segment of a link going to this port.*/
         toEndSegmentLength: number;
 
-        /**Gets or sets whether the user may draw Links to this port.*/
-        toLinkable: any;
+        /**Gets or sets whether the user may draw Links to this port. The value must be either a boolean or null.*/
+        toLinkable: boolean;
 
         /**Gets or sets whether the user may draw duplicate Links to this port.*/
         toLinkableDuplicates: boolean;
@@ -1222,13 +1409,20 @@ declare module go {
         * Add a data-binding of a property on this GraphObject to a property on a data object.
         * @param {Binding} binding
         */
-        bind(binding: Binding);
+        bind(binding: Binding): void;
 
         /**
         * Creates a deep copy of this GraphObject and returns it.
         */
         copy(): GraphObject;
 
+        /**
+        * This static function defines a named function that GraphObject.make can use to build objects.
+        * @param {string} name a capitalized name; must not be "" or "None"
+        * @param {function(Array<*>):Object} func
+        */
+        static defineBuilder(name: string, func: (args: any[]) => Object): void;
+
         /**
         * Returns the effective angle that the object is drawn at, in document coordinates.
         */
@@ -1262,10 +1456,16 @@ declare module go {
         isContainedBy(panel: GraphObject): boolean;
 
         /**
-        * This predicate is true if this object is #visible and each of its visual containing panels are also visible.
+        * This predicate is true if this object is .visible and each of its visual containing panels are also visible.
         */
         isVisibleObject(): boolean;
 
+        /**
+        * This method sets a collection of properties according to the property/value pairs that have been set on the given Object,
+        * in the same manner as GraphObject.make does when constructing a GraphObject with an argument that is a simple JavaScript Object.
+        */
+        setProperties(props: Object): void;
+
         /**
         * This static function builds an object given its class and additional arguments providing initial properties or GraphObjects that become Panel elements.
         * @param {function()|string} type a class function or the name of a class in the "go" namespace,
@@ -1279,28 +1479,33 @@ declare module go {
         * is recognized to take that value,
         * or a string that is used as the value of a commonly set property.
         */
-        static make(type: any, ...initializers: any[]): any;
+        static make(type: Constructor | string, ...initializers: any[]): any;
 
-        /**GraphObjects with this as the value of GraphObject#stretch are stretched depending on the context they are used.*/
+        /**GraphObjects with this as the value of GraphObject.stretch are stretched depending on the context they are used.*/
         static Default: EnumValue;
 
-        /**GraphObjects with this as the value of GraphObject#stretch are scaled in both directions so as to fit exactly in the given bounds; there is no clipping but the aspect ratio may change, causing the object to appear stretched.*/
+        /**GraphObjects with this as the value of GraphObject.stretch are scaled in both directions so as to fit exactly in the given bounds; there is no clipping but the aspect ratio may change, causing the object to appear stretched.*/
         static Fill: EnumValue;
 
-        /**GraphObjects with this as the value of GraphObject#stretch are scaled as much as possible in the x-axis*/
+        /**GraphObjects with this as the value of GraphObject.stretch are scaled as much as possible in the x-axis*/
         static Horizontal: EnumValue;
 
-        /**GraphObjects with this as the value of GraphObject#stretch are not automatically scaled to fit in the given bounds; there may be clipping in one or both directions.*/
+        /**GraphObjects with this as the value of GraphObject.stretch are not automatically scaled to fit in the given bounds; there may be clipping in one or both directions.*/
         static None: EnumValue;
 
-        /**Pictures with this as the value of Picture#imageStretch are drawn with equal scale in both directions to fit the arranged (actual) bounds.*/
+        /**Pictures with this as the value of Picture.imageStretch are drawn with equal scale in both directions to fit the arranged (actual) bounds.*/
         static Uniform: EnumValue;
 
-        /**Pictures with this as the value of Picture#imageStretch are drawn with equal scale in both directions to fit the larger side of the image bounds.*/
+        /**Pictures with this as the value of Picture.imageStretch are drawn with equal scale in both directions to fit the larger side of the image bounds.*/
         static UniformToFill: EnumValue;
 
-        /**GraphObjects with this as the value of GraphObject#stretch are scaled as much as possible in the y-axis*/
+        /**GraphObjects with this as the value of GraphObject.stretch are scaled as much as possible in the y-axis*/
         static Vertical: EnumValue;
+
+        protected cloneProtected(copy: GraphObject): void;  // undocumented
+        static fromSvg(svg: string): GraphObject;  // undocumented
+        static fromSvg(svg: Document): GraphObject;  // undocumented
+        static getBuilders(): Map<string,(args: any[]) => Object>;  // undocumented
     }
 
     /**
@@ -1314,10 +1519,19 @@ declare module go {
         */
         constructor(type?: EnumValue);
 
-        /**Gets or sets whether the size of the area of the Group's #placeholder should remain the same during a DraggingTool move until a drop occurs.*/
+        /**Gets or sets whether the size of the area of the Group's .placeholder should remain the same during a DraggingTool move until a drop occurs. The default value is false.*/
         computesBoundsAfterDrag: boolean;
 
-        /**Gets or sets whether the subgraph contained by this group is expanded.*/
+        /**Gets or sets whether the bounds of a Group's Placeholder includes the bounds of member Links. The default value is true.*/
+        computesBoundsIncludingLinks: boolean;
+
+        /**Gets or sets whether the bounds of a Group's Placeholder includes the previous Group.location. The default value is false.*/
+        computesBoundsIncludingLocation: boolean;
+
+        /**Gets or sets whether drag-and-drop events may be bubbled up to this Group if not handled by member Parts.*/
+        handlesDragDropForMembers: boolean;
+
+        /**Gets or sets whether the subgraph contained by this group is expanded. The default value is true.*/
         isSubGraphExpanded: boolean;
 
         /**Gets or sets the Layout used to position all of the immediate member nodes and links in this group.*/
@@ -1326,8 +1540,8 @@ declare module go {
         /**Gets or sets the function that is called after a member Part has been added to this Group.*/
         memberAdded: (a: Group, b: Part) => void;
 
-        /**Gets an iterator over the member Parts of this Group.*/
-        memberParts: Iterator;
+        /**This read-only property returns an iterator over the member Parts of this Group.*/
+        memberParts: Iterator<Part>;
 
         /**Gets or sets the function that is called after a member Part has been removed from this Group.*/
         memberRemoved: (a: Group, b: Part) => void;
@@ -1335,68 +1549,80 @@ declare module go {
         /**Gets or sets the predicate that determines whether or not a Part may become a member of this group.*/
         memberValidation: (a: Group, b: Part) => boolean;
 
-        /**Gets a Placeholder that this group may contain in its visual tree.*/
+        /**This read-only property returns a Placeholder that this group may contain in its visual tree.*/
         placeholder: Placeholder;
 
-        /**Gets or sets the function that is called when #isSubGraphExpanded has changed value.*/
+        /**Gets or sets the function that is called when .isSubGraphExpanded has changed value.*/
         subGraphExpandedChanged: (a: Group) => void;
 
         /**Gets or sets whether the user may ungroup this group.*/
         ungroupable: boolean;
 
-        /**Gets or sets whether the subgraph starting at this group had been collapsed by a call to #expandSubGraph on the containing Group.*/
+        /**Gets or sets whether the subgraph starting at this group had been collapsed by a call to .expandSubGraph on the containing Group.*/
         wasSubGraphExpanded: boolean;
 
         /**
-        * Add the Parts in the given collection as members of this Group for those Parts for which CommandHandler#isValidMember returns true.
-        * @param {Iterable} coll
-        * @param {boolean=} check whether to call CommandHandler#isValidMember to confirm that it is valid to add the Part to be a member of this Group.
+        * Add the Parts in the given collection as members of this Group for those Parts for which CommandHandler.isValidMember returns true.
+        * @param {Iterable<Part>} coll
+        * @param {boolean=} check whether to call CommandHandler.isValidMember to confirm that it is valid to add the Part to be a member of this Group.
         */
-        addMembers(coll: Iterable, check?: boolean): boolean;
+        addMembers(coll: Iterable<Part>, check?: boolean): boolean;
 
         /**
-        * See if the given collection of Parts contains non-Links all for which CommandHandler#isValidMember returns true.
-        * @param {Iterable} coll
+        * See if the given collection of Parts contains non-Links all for which CommandHandler.isValidMember returns true.
+        * @param {Iterable<Part>} coll
         */
-        canAddMembers(coll: Iterable): boolean;
+        canAddMembers(coll: Iterable<Part>): boolean;
 
         /**
-        * This predicate returns true if #ungroupable is true, if the layer's Layer#allowUngroup is true, and if the diagram's Diagram#allowUngroup is true.
+        * This predicate returns true if .ungroupable is true, if the layer's Layer.allowUngroup is true, and if the diagram's Diagram.allowUngroup is true.
         */
         canUngroup(): boolean;
 
         /**
         * Hide each of the member nodes and links of this group, and recursively collapse any member groups.
         */
-        collapseSubGraph();
+        collapseSubGraph(): void;
 
         /**
         * Show each member node and link, and perhaps recursively expand nested subgraphs.
         */
-        expandSubGraph();
+        expandSubGraph(): void;
+
+        /**
+        * Returns an iterator over all of the Links that connect with this group or any node contained by this group,
+        * in either direction, but that are not internal to this group.
+        */
+        findExternalLinksConnected(): Iterator<Link>;
+
+        /**
+        * Returns an iterator over all of the Nodes that are connected with this group or any node contained by this group,
+        * by a link in either direction, but that are not internal to this group.
+        */
+        findExternalNodesConnected(): Iterator<Node>;
 
         /**
         * Return a collection of Parts that are all of the nodes and links that are members of this group, including inside nested groups, but excluding this group itself.
         */
-        findSubGraphParts(): Set;
+        findSubGraphParts(): Set<Part>;
 
         /**
         * Move this Group and all of its member parts, recursively.
         * @param {Point} newpos a new Point in document coordinates.
         */
-        move(newpos: Point);
+        move(newpos: Point): void;
     }
 
     /**
     * An InputEvent represents a mouse or keyboard event.
     * The principal properties hold information about a particular input event.
-    * These properties include the #documentPoint at which a mouse event
+    * These properties include the .documentPoint at which a mouse event
     * occurred in document coordinates,
-    * the corresponding point in view/element coordinates, #viewPoint,
-    * the #key for keyboard events,
-    * and the #modifiers and #button at the time.
-    * Additional descriptive properties include #clickCount, #delta,
-    * #timestamp, and the source event #event (if available).
+    * the corresponding point in view/element coordinates, .viewPoint,
+    * the .key for keyboard events,
+    * and the .modifiers and .button at the time.
+    * Additional descriptive properties include .clickCount, .delta,
+    * .timestamp, and the source event .event (if available).
     */
     class InputEvent {
         /**
@@ -1404,10 +1630,10 @@ declare module go {
         */
         constructor();
 
-        /**Gets whether the alt key is being held down.*/
+        /**Gets or sets whether the alt key is being held down.*/
         alt: boolean;
 
-        /**Gets or sets whether the underlying #event is prevented from bubbling up the hierarchy of HTML elements outside of the Diagram and whether any default action is canceled.*/
+        /**Gets or sets whether the underlying .event is prevented from bubbling up the hierarchy of HTML elements outside of the Diagram and whether any default action is canceled.*/
         bubbles: boolean;
 
         /**Gets or sets the button that caused this event.*/
@@ -1416,13 +1642,13 @@ declare module go {
         /**Gets or sets whether this event represents a click or a double-click.*/
         clickCount: number;
 
-        /**Gets whether the control key is being held down.*/
+        /**Gets or sets whether the control key is being held down.*/
         control: boolean;
 
         /**Gets or sets the amount of change associated with a mouse-wheel rotation.*/
         delta: number;
 
-        /**Gets the source diagram associated with the event.*/
+        /**This read-only property returns the source diagram associated with the event.*/
         diagram: Diagram;
 
         /**Gets or sets the point at which this input event occurred, in document coordinates.*/
@@ -1437,25 +1663,31 @@ declare module go {
         /**Gets or sets whether an InputEvent that applies to a GraphObject and bubbles up the chain of containing Panels is stopped from continuing up the chain.*/
         handled: boolean;
 
+        /**This property is true when the InputEvent is caused by a touch event that registered more than one touch.*/
+        isMultiTouch: boolean;
+
+        /**This read-only property is true when the InputEvent is caused by a touch event.*/
+        isTouchEvent: boolean;
+
         /**Gets or sets the key pressed or released as this event.*/
         key: string;
 
-        /**Gets whether the logical left mouse button is being held down.*/
+        /**Gets or sets whether the logical left mouse button is being held down.*/
         left: boolean;
 
-        /**Gets whether the meta key is being held down.*/
+        /**Gets or sets whether the meta key is being held down.*/
         meta: boolean;
 
-        /**Gets whether the logical middle mouse button is being held down.*/
+        /**Gets or sets whether the logical middle mouse button is being held down.*/
         middle: boolean;
 
         /**Gets or sets the modifier keys that were used with the mouse or keyboard event.*/
         modifiers: number;
 
-        /**Gets whether the logical right mouse button is being held down.*/
+        /**Gets or sets whether the logical right mouse button is being held down.*/
         right: boolean;
 
-        /**Gets whether the shift key is being held down.*/
+        /**Gets or sets whether the shift key is being held down.*/
         shift: boolean;
 
         /**Gets or sets the diagram associated with the canvas that the event is currently targeting.*/
@@ -1485,7 +1717,7 @@ declare module go {
     */
     class Layer {
         /**
-        * This constructs an empty Layer; you should set the #name before adding the Layer to a Diagram.
+        * This constructs an empty Layer; you should set the .name before adding the Layer to a Diagram.
         */
         constructor();
 
@@ -1525,7 +1757,7 @@ declare module go {
         /**Gets or sets whether the user may ungroup existing groups in this layer.*/
         allowUngroup: boolean;
 
-        /**Gets the Diagram that is using this Layer.*/
+        /**This read-only property returns the Diagram that is using this Layer.*/
         diagram: Diagram;
 
         /**Gets or sets whether the objects in this layer are considered temporary.*/
@@ -1537,13 +1769,13 @@ declare module go {
         /**Gets or sets the opacity for all parts in this layer.*/
         opacity: number;
 
-        /**Gets an iterator for this Layer's Parts.*/
-        parts: Iterator;
+        /**This read-only property returns an iterator for this Layer's Parts.*/
+        parts: Iterator<Part>;
 
-        /**Gets a backwards iterator for this Layer's Parts, for iterating over the parts in reverse order.*/
-        partsBackwards: Iterator;
+        /**This read-only property returns a backwards iterator for this Layer's Parts, for iterating over the parts in reverse order.*/
+        partsBackwards: Iterator<Part>;
 
-        /**Gets or sets whether methods such as #findObjectAt find any of the objects in this layer.*/
+        /**Gets or sets whether methods such as .findObjectAt find any of the objects in this layer.*/
         pickable: boolean;
 
         /**Gets or sets whether the user may view any of the objects in this layer.*/
@@ -1571,8 +1803,8 @@ declare module go {
         * defaulting to a predicate that always returns true.
         * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
         */
-        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: List): Iterable;
-        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: Set): Iterable;
+        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsAt(p: Point, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, coll?: Set<GraphObject>): Set<GraphObject>;
 
         /**
         * Returns a collection of all GraphObjects that are inside or that intersect a given Rect in document coordinates.
@@ -1587,8 +1819,8 @@ declare module go {
         * if it must be entirely inside the rectangular area (false).  The default value is false.
         * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
         */
-        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List): Iterable;
-        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set): Iterable;
+        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsIn(r: Rect, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
 
         /**
         * Returns a collection of all GraphObjects that are within a certain distance of a given point in document coordinates.
@@ -1604,15 +1836,15 @@ declare module go {
         * if it must be entirely inside the circular area (false).  The default value is true.
         * @param {List|Set=} coll An optional collection (List or Set) to add the results to.
         */
-        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List): Iterable;
-        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set): Iterable;
+        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: List<GraphObject>): List<GraphObject>;
+        findObjectsNear(p: Point, dist: number, navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean, partialInclusion?: boolean, coll?: Set<GraphObject>): Set<GraphObject>;
     }
 
     /**
     * A Link is a Part that connects Nodes.
-    * The link relationship is directional, going from Link#fromNode to Link#toNode.
-    * A link can connect to a specific port element in a node, as named by the Link#fromPortId
-    * and Link#toPortId properties.
+    * The link relationship is directional, going from Link.fromNode to Link.toNode.
+    * A link can connect to a specific port element in a node, as named by the Link.fromPortId
+    * and Link.toPortId properties.
     */
     class Link extends Part {
         /**
@@ -1623,13 +1855,13 @@ declare module go {
         /**Gets or sets how the route is computed, including whether it uses the points of its old route to determine the new route.*/
         adjusting: EnumValue;
 
-        /**Gets or sets how rounded the corners are for adjacent line segments when the #curve is #None #JumpGap, or #JumpOver and the two line segments are orthogonal to each other.*/
+        /**Gets or sets how rounded the corners are for adjacent line segments when the .curve is .None .JumpGap, or .JumpOver and the two line segments are orthogonal to each other.*/
         corner: number;
 
         /**Gets or sets the way the path is generated from the route's points.*/
         curve: EnumValue;
 
-        /**Gets or sets how far the control points are offset when the #curve is #Bezier or when there are multiple links between the same two ports.*/
+        /**Gets or sets how far the control points are offset when the .curve is .Bezier or when there are multiple links between the same two ports.*/
         curviness: number;
 
         /**Gets or sets how the direction of the last segment is computed when the node is rotated.*/
@@ -1641,7 +1873,7 @@ declare module go {
         /**Gets or sets the Node that this link comes from.*/
         fromNode: Node;
 
-        /**Gets a GraphObject that is the "from" port that this link is connected from.*/
+        /**This read-only property returns a GraphObject that is the "from" port that this link is connected from.*/
         fromPort: GraphObject;
 
         /**Gets or sets the function that is called after this Link changes which Node or port it connects from.*/
@@ -1653,37 +1885,37 @@ declare module go {
         /**Gets or sets how far the end segment stops short of the actual port.*/
         fromShortLength: number;
 
-        /**Gets or sets where this link should connect at the #fromPort.*/
+        /**Gets or sets where this link should connect at the .fromPort.*/
         fromSpot: Spot;
 
-        /**Gets the Geometry that is used by the #path, the link Shape based on the route points.*/
+        /**This read-only property returns the Geometry that is used by the .path, the link Shape based on the route points.*/
         geometry: Geometry;
 
         /**This read-only property is true when this Link has any label Nodes, Nodes that are owned by this Link and are arranged along its path.*/
         isLabeledLink: boolean;
 
-        /**This read-only property true if #routing is a value that implies that the points of the route should be orthogonal, such that each point shares a common X or a common Y value with the immediately previous and next points.*/
+        /**This read-only property true if .routing is a value that implies that the points of the route should be orthogonal, such that each point shares a common X or a common Y value with the immediately previous and next points.*/
         isOrthogonal: boolean;
 
-        /**Gets or sets whether this Link is part of the tree for tree operations such as Node#findTreeChildrenNodes or Node#collapseTree.*/
+        /**Gets or sets whether this Link is part of the tree for tree operations such as Node.findTreeChildrenNodes or Node.collapseTree.*/
         isTreeLink: boolean;
 
-        /**Gets an iterator over the Nodes that act as labels on this Link.*/
-        labelNodes: Iterator;
+        /**This read-only property returns an iterator over the Nodes that act as labels on this Link.*/
+        labelNodes: Iterator<Node>;
 
-        /**Gets the angle of the path at the #midPoint.*/
+        /**This read-only property returns the angle of the path at the .midPoint.*/
         midAngle: number;
 
-        /**Gets the point at the middle of the path.*/
+        /**This read-only property returns the point at the middle of the path.*/
         midPoint: Point;
 
-        /**Gets the Shape representing the path of this Link.*/
+        /**This read-only property returns the Shape representing the path of this Link.*/
         path: Shape;
 
-        /**Gets or sets the List of Points in the route.*/
-        points: List;
+        /**Gets or sets the List of Points in the route. Can also be set as an Array of numbers.*/
+        points: List<Point>;
 
-        /**Gets the number of points in the route.*/
+        /**This read-only property returns the number of points in the route.*/
         pointsCount: number;
 
         /**Gets or sets whether the user may reconnect an existing link at the "from" end.*/
@@ -1698,10 +1930,10 @@ declare module go {
         /**Gets or sets whether the link's path tries to avoid other nodes.*/
         routing: EnumValue;
 
-        /**Gets or sets how far the control points are from the points of the route when #routing is #Orthogonal and #curve is #Bezier.*/
+        /**Gets or sets how far the control points are from the points of the route when .routing is .Orthogonal and .curve is .Bezier.*/
         smoothness: number;
 
-        /**Gets or sets how far the control points are from the points of the route when #routing is #Orthogonal and #curve is #Bezier.*/
+        /**Gets or sets how far the control points are from the points of the route when .routing is .Orthogonal and .curve is .Bezier.*/
         toEndSegmentDirection: EnumValue;
 
         /**Gets or sets the length of the last segment.*/
@@ -1710,7 +1942,7 @@ declare module go {
         /**Gets or sets the Node that this link goes to.*/
         toNode: Node;
 
-        /**Gets a GraphObject that is the "to" port that this link is connected to.*/
+        /**This read-only property returns a GraphObject that is the "to" port that this link is connected to.*/
         toPort: GraphObject;
 
         /**Gets or sets the function that is called after this Link changes which Node or port it connects to.*/
@@ -1722,16 +1954,16 @@ declare module go {
         /**Gets or sets how far the end segment stops short of the actual port.*/
         toShortLength: number;
 
-        /**Gets or sets where this link should connect at the #toPort.*/
+        /**Gets or sets where this link should connect at the .toPort.*/
         toSpot: Spot;
 
         /**
-        * This predicate returns true if #relinkableFrom is true, if the layer's Layer#allowRelink is true, and if the diagram's Diagram#allowRelink is true.
+        * This predicate returns true if .relinkableFrom is true, if the layer's Layer.allowRelink is true, and if the diagram's Diagram.allowRelink is true.
         */
         canRelinkFrom(): boolean;
 
         /**
-        * This predicate returns true if #relinkableTo is true, if the layer's Layer#allowRelink is true, and if the diagram's Diagram#allowRelink is true.
+        * This predicate returns true if .relinkableTo is true, if the layer's Layer.allowRelink is true, and if the diagram's Diagram.allowRelink is true.
         */
         canRelinkTo(): boolean;
 
@@ -1765,7 +1997,7 @@ declare module go {
         * @param {GraphObject} otherport the GraphObject port at the other end of the link.
         * @param {Point=} result an optional Point that is modified and returned; otherwise it allocates and returns a new Point
         */
-        getLinkPoint(node: Node, port: GraphObject, spot: Spot, from: boolean, ortho: boolean, othernode: Node, otherport: GraphObject, result?: Point)
+        getLinkPoint(node: Node, port: GraphObject, spot: Spot, from: boolean, ortho: boolean, othernode: Node, otherport: GraphObject, result?: Point): Point;
 
         /**
         * Compute the intersection point for the edge of a particular port GraphObject, given a point, when no particular spot or side has been specified.
@@ -1802,61 +2034,85 @@ declare module go {
         * Move this link to a new position.
         * @param {Point} newpos
         */
-        move(newpos: Point);
+        move(newpos: Point): void;
 
-        /**Used as a value for Link#routing: each segment is horizontal or vertical, but the route tries to avoid crossing over nodes.*/
+        /**Used as a value for Link.routing: each segment is horizontal or vertical, but the route tries to avoid crossing over nodes.*/
         static AvoidsNodes: EnumValue;
 
-        /**Used as a value for Link#curve, to indicate that the link path uses Bezier curve segments.*/
+        /**Used as a value for Link.curve, to indicate that the link path uses Bezier curve segments.*/
         static Bezier: EnumValue;
 
-        /**Used as a value for Link#adjusting, to indicate that the link route computation should keep the intermediate points of the previous route, just modifying the first and/or last points; if the routing is orthogonal, it will only modify the first two and/or last two points.*/
+        /**Used as a value for Link.adjusting, to indicate that the link route computation should keep the intermediate points of the previous route, just modifying the first and/or last points; if the routing is orthogonal, it will only modify the first two and/or last two points.*/
         static End: EnumValue;
 
-        /**Used as a value for Link#curve, to indicate that orthogonal link segments will be discontinuous where they cross over other orthogonal link segments that have a Link#curve or JumpOver or JumpGap.*/
+        /**Used as a value for Link.curve, to indicate that orthogonal link segments will be discontinuous where they cross over other orthogonal link segments that have a Link.curve or JumpOver or JumpGap.*/
         static JumpGap: EnumValue;
 
-        /**Used as a value for Link#curve, to indicate that orthogonal link segments will veer around where they cross over other orthogonal link segments that have a Link#curve or JumpOver or JumpGap.*/
+        /**Used as a value for Link.curve, to indicate that orthogonal link segments will veer around where they cross over other orthogonal link segments that have a Link.curve or JumpOver or JumpGap.*/
         static JumpOver: EnumValue;
 
-        /**This is the default value for Link#curve and Link#adjusting, to indicate that the path geometry consists of straight line segments and to indicate that the link route computation does not depend on any previous route points; this can also be used as a value for GraphObject#segmentOrientation to indicate that the object is never rotated along the link route -- its angle is unchanged.*/
+        /**This is the default value for Link.curve and Link.adjusting, to indicate that the path geometry consists of straight line segments and to indicate that the link route computation does not depend on any previous route points; this can also be used as a value for GraphObject.segmentOrientation to indicate that the object is never rotated along the link route -- its angle is unchanged.*/
         static None: EnumValue;
 
-        /**Used as the default value for Link#routing: the route goes fairly straight between ports.*/
+        /**Used as the default value for Link.routing: the route goes fairly straight between ports.*/
         static Normal: EnumValue;
 
-        /**This value for GraphObject#segmentOrientation results in the GraphObject turned to have the same angle as the route: the GraphObject's angle is always the same as the angle of the link's route at the segment where the GraphObject is attached; use this orientation for arrow heads.*/
+        /**This value for GraphObject.segmentOrientation results in the GraphObject turned to have the same angle as the route: the GraphObject's angle is always the same as the angle of the link's route at the segment where the GraphObject is attached; use this orientation for arrow heads.*/
         static OrientAlong: EnumValue;
 
-        /**This value for GraphObject#segmentOrientation results in the GraphObject being turned counter-clockwise to be perpendicular to the route: the GraphObject's angle is always 90 degrees less than the angle of the link's route at the segment where the GraphObject is attached.*/
+        /**This value for GraphObject.segmentOrientation results in the GraphObject being turned counter-clockwise to be perpendicular to the route: the GraphObject's angle is always 90 degrees less than the angle of the link's route at the segment where the GraphObject is attached.*/
         static OrientMinus90: EnumValue;
 
-        /**This value for GraphObject#segmentOrientation results in the GraphObject turned counter-clockwise to be perpendicular to the route, just like Link#OrientMinus90, but is never upside down: the GraphObject's angle always being 90 degrees less than the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
+        /**This value for GraphObject.segmentOrientation results in the GraphObject turned counter-clockwise to be perpendicular to the route, just like Link.OrientMinus90, but is never upside down: the GraphObject's angle always being 90 degrees less than the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
         static OrientMinus90Upright: EnumValue;
 
-        /**This value for GraphObject#segmentOrientation results in the GraphObject's angle always being 180 degrees opposite from the angle of the link's route at the segment where the GraphObject is attached.*/
+        /**This value for GraphObject.segmentOrientation results in the GraphObject's angle always being 180 degrees opposite from the angle of the link's route at the segment where the GraphObject is attached.*/
         static OrientOpposite: EnumValue;
 
-        /**This value for GraphObject#segmentOrientation results in the GraphObject is turned clockwise to be perpendicular to the route: the GraphObject's angle is always 90 degrees more than the angle of the link's route at the segment where the GraphObject is attached.*/
+        /**This value for GraphObject.segmentOrientation results in the GraphObject is turned clockwise to be perpendicular to the route: the GraphObject's angle is always 90 degrees more than the angle of the link's route at the segment where the GraphObject is attached.*/
         static OrientPlus90: EnumValue;
 
-        /**This value for GraphObject#segmentOrientation results in the GraphObject turned clockwise to be perpendicular to the route, just like Link#OrientPlus90, but is never upside down: the GraphObject's angle always being 90 degrees more than the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
+        /**This value for GraphObject.segmentOrientation results in the GraphObject turned clockwise to be perpendicular to the route, just like Link.OrientPlus90, but is never upside down: the GraphObject's angle always being 90 degrees more than the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
         static OrientPlus90Upright: EnumValue;
 
-        /**This value for GraphObject#segmentOrientation results in the GraphObject turned to have the same angle as the route, just like Link#OrientAlong, but is never upside down: the GraphObject's angle always following the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
+        /**This value for GraphObject.segmentOrientation results in the GraphObject turned to have the same angle as the route, just like Link.OrientAlong, but is never upside down: the GraphObject's angle always following the angle of the link's route at the segment where the GraphObject is attached; this is typically only used for TextBlocks or Panels that contain text.*/
         static OrientUpright: EnumValue;
 
-        /**This value for GraphObject#segmentOrientation results in the GraphObject's angle always following the angle of the link's route at the segment where the GraphObject is attached, but never upside down and never angled more than +/- 45 degrees: when the route's angle is within 45 degrees of vertical (90 or 270 degrees), the GraphObject's angle is set to zero; this is typically only used for TextBlocks or Panels that contain text.*/
+        /**This value for GraphObject.segmentOrientation results in the GraphObject's angle always following the angle of the link's route at the segment where the GraphObject is attached, but never upside down and never angled more than +/- 45 degrees: when the route's angle is within 45 degrees of vertical (90 or 270 degrees), the GraphObject's angle is set to zero; this is typically only used for TextBlocks or Panels that contain text.*/
         static OrientUpright45: EnumValue;
 
-        /**Used as a value for Link#routing: each segment is horizontal or vertical.*/
+        /**Used as a value for Link.routing: each segment is horizontal or vertical.*/
         static Orthogonal: EnumValue;
 
-        /**Used as a value for Link#adjusting, to indicate that the link route computation should scale and rotate the intermediate points so that the link's shape looks approximately the same; if the routing is orthogonal, this value is treated as if it were Link#End.*/
+        /**Used as a value for Link.adjusting, to indicate that the link route computation should scale and rotate the intermediate points so that the link's shape looks approximately the same; if the routing is orthogonal, this value is treated as if it were Link.End.*/
         static Scale: EnumValue;
 
-        /**Used as a value for Link#adjusting, to indicate that the link route computation should linearly interpolate the intermediate points so that the link's shape looks stretched; if the routing is orthogonal, this value is treated as if it were Link#End.*/
+        /**Used as a value for Link.adjusting, to indicate that the link route computation should linearly interpolate the intermediate points so that the link's shape looks stretched; if the routing is orthogonal, this value is treated as if it were Link.End.*/
         static Stretch: EnumValue;
+
+        routeBounds: Rect;  // undocumented
+        protected computeEndSegmentLength(node: Node, port: GraphObject, spot: Spot, from: boolean): number;  // undocumented
+        protected computeSpot(from: boolean): Spot;  // undocumented
+        protected computeOtherPoint(othernode: Node, otherport: GraphObject): Point;  // undocumented
+        protected computeShortLength(from: boolean): number;  // undocumented
+        protected computeCurve(): EnumValue;  // undocumented
+        protected computeCorner(): number;  // undocumented
+        protected computeCurviness(): number;  // undocumented
+        protected computeThickness(): number;  // undocumented
+        hasCurviness(): boolean;  // undocumented
+        invalidateRoute(): void;  // undocumented
+        updateRoute(): void;  // undocumented
+        protected computePoints(): boolean;  // undocumented
+        clearPoints(): void;  // undocumented
+        addPoint(p: Point): void;  // undocumented
+        addPointAt(x: number, y: number): void;  // undocumented
+        insertPoint(i: number, p: Point): void;  // undocumented
+        insertPointAt(i: number, x: number, y: number): void;  // undocumented
+        removePoint(i: number): void;  // undocumented
+        setPoint(i: number, p: Point): void;  // undocumented
+        setPointAt(i: number, x: number, y: number): void;  // undocumented
+        invalidateGeometry(): void;  // undocumented
+        makeGeometry(): Geometry;  // undocumented
     }
 
     /**
@@ -1868,17 +2124,17 @@ declare module go {
     class Node extends Part {
         /**
         * Constructs an empty Node.
-        * @param {EnumValue=} type if not supplied, the default Panel type is Panel#Position.
+        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
         */
         constructor(type?: EnumValue);
 
-        /**Gets or sets whether this Node is to be avoided by Links whose Link#routing is Link#AvoidsNodes.*/
+        /**Gets or sets whether this Node is to be avoided by Links whose Link.routing is Link.AvoidsNodes.*/
         avoidable: boolean;
 
         /**Gets or sets the Margin (or number for a uniform Margin) around this Node in which avoidable links will not be routed.*/
-        avoidableMargin: any;
+        avoidableMargin: MarginLike;
 
-        /**Gets whether a Node is a label node for a Link.*/
+        /**This read-only property is true when this Node is a label node for a Link.*/
         isLinkLabel: boolean;
 
         /**Gets or sets whether the subtree graph starting at this node is expanded.*/
@@ -1896,19 +2152,25 @@ declare module go {
         /**Gets or sets the function that is called after a Link has been disconnected from this Node.*/
         linkDisconnected: (a: Node, b: Link, c: GraphObject) => void;
 
-        /**Gets an iterator over all of the Links that are connected with this node.*/
-        linksConnected: Iterator;
+        /**Gets or sets a predicate that determines whether or not a Link may be connected with this node; any of the arguments may be null.*/
+        linkValidation: (from: Node, fromPort: GraphObject, to: Node, toPort: GraphObject, link: Link) => boolean;
 
-        /**Get the primary GraphObject representing a port in this node.*/
+        /**This read-only property returns an iterator over all of the Links that are connected with this node.*/
+        linksConnected: Iterator<Link>;
+
+        /**This read-only property returns the primary GraphObject representing a port in this node.*/
         port: GraphObject;
 
-        /**Gets an iterator over all of the GraphObjects in this node that act as ports.*/
-        ports: Iterator;
+        /**This read-only property returns an iterator over all of the GraphObjects in this node that act as ports.*/
+        ports: Iterator<GraphObject>;
 
-        /**Gets or sets the function that is called when #isTreeExpanded has changed value.*/
+        /**Gets or sets how link points are computed when the port spot is a "side" spot.*/
+        portSpreading: EnumValue;
+
+        /**Gets or sets the function that is called when .isTreeExpanded has changed value.*/
         treeExpandedChanged: (node: Node) => void;
 
-        /**Gets or sets whether the subtree graph starting at this node had been collapsed by a call to #expandTree on the parent node.*/
+        /**Gets or sets whether the subtree graph starting at this node had been collapsed by a call to .expandTree on the parent node.*/
         wasTreeExpanded: boolean;
 
         /**
@@ -1916,7 +2178,7 @@ declare module go {
         * @param {number=} level How many levels of the tree, starting at this node, to keep expanded if already expanded;
         *    the default is 1, hiding all tree children of this node.  Values less than 1 are treated as 1.
         */
-        collapseTree(level?: number);
+        collapseTree(level?: number): void;
 
         /**
         * Show each child node and the connecting link, and perhaps recursively expand their child nodes.
@@ -1924,7 +2186,7 @@ declare module go {
         *    the default is 2, showing all tree children of this node and potentially more.
         *    Values less than 2 are treated as 2.
         */
-        expandTree(level?: number);
+        expandTree(level?: number): void;
 
         /**
         * Returns an iterator over all of the Links that go from this node to another node or vice-versa, perhaps limited to a given port id on this node and a port id on the other node.
@@ -1932,25 +2194,25 @@ declare module go {
         * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
         * @param {string|null=} otherpid A port identifier string; if null the link's portId is ignored and all links are included in the search.
         */
-        findLinksBetween(othernode: Node, pid?: string, otherpid?: string): Iterator;
+        findLinksBetween(othernode: Node, pid?: string, otherpid?: string): Iterator<Link>;
 
         /**
         * Returns an iterator over all of the Links that connect with this node in either direction, perhaps limited to the given port id on this node.
         * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
         */
-        findLinksConnected(pid?: string): Iterator;
+        findLinksConnected(pid?: string): Iterator<Link>;
 
         /**
         * Returns an iterator over all of the Links that go into this node, perhaps limited to the given port id on this node.
         * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
         */
-        findLinksInto(pid?: string): Iterator;
+        findLinksInto(pid?: string): Iterator<Link>;
 
         /**
         * Returns an iterator over all of the Links that come out of this node, perhaps limited to the given port id on this node.
         * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
         */
-        findLinksOutOf(pid?: string): Iterator;
+        findLinksOutOf(pid?: string): Iterator<Link>;
 
         /**
         * Returns an iterator over all of the Links that go from this node to another node, perhaps limited to a given port id on this node and a port id on the other node.
@@ -1958,28 +2220,28 @@ declare module go {
         * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
         * @param {string|null=} otherpid A port identifier string; if null the link's portId is ignored and all links are included in the search.
         */
-        findLinksTo(othernode: Node, pid?: string, otherpid?: string): Iterator;
+        findLinksTo(othernode: Node, pid?: string, otherpid?: string): Iterator<Link>;
 
         /**
         * Returns an iterator over the Nodes that are connected with this node in either direction, perhaps limited to the given port id on this node.
         * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
         */
-        findNodesConnected(pid?: string): Iterator;
+        findNodesConnected(pid?: string): Iterator<Node>;
 
         /**
         * Returns an iterator over the Nodes that are connected with this node by links going into this node, perhaps limited to the given port id on this node.
         * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
         */
-        findNodesInto(pid?: string): Iterator;
+        findNodesInto(pid?: string): Iterator<Node>;
 
         /**
         * Returns an iterator over the Nodes that are connected with this node by links coming out of this node, perhaps limited to the given port id on this node.
         * @param {string|null=} pid A port identifier string; if null the link's portId is ignored and all links are included in the search.
         */
-        findNodesOutOf(pid?: string): Iterator;
+        findNodesOutOf(pid?: string): Iterator<Node>;
 
         /**
-        * Find a GraphObject with a given GraphObject#portId.
+        * Find a GraphObject with a given GraphObject.portId.
         * @param {string} pid
         */
         findPort(pid: string): GraphObject;
@@ -1987,15 +2249,21 @@ declare module go {
         /**
         * Returns an Iterator for the collection of Links that connect with the immediate tree children of this node.
         */
-        findTreeChildrenLinks(): Iterator;
+        findTreeChildrenLinks(): Iterator<Link>;
 
         /**
         * Returns an Iterator for the collection of Nodes that are the immediate tree children of this node.
         */
-        findTreeChildrenNodes(): Iterator;
+        findTreeChildrenNodes(): Iterator<Node>;
 
         /**
-        * Returns the Link that connects with the tree parent Node of this node if the graph is tree-structured, if there is such a link and Link#isTreeLink is true.
+        * Return how deep this node is in a tree structure.
+        * For tree root nodes, this returns zero.
+        */
+        findTreeLevel(): number;
+
+        /**
+        * Returns the Link that connects with the tree parent Node of this node if the graph is tree-structured, if there is such a link and Link.isTreeLink is true.
         */
         findTreeParentLink(): Link;
 
@@ -2009,7 +2277,7 @@ declare module go {
         * @param {number=} level How many levels of the tree, starting at this node, to include;
         *    the default is Infinity, including all tree children of this node.  Values less than 1 are treated as 1.
         */
-        findTreeParts(level?: number): Set;
+        findTreeParts(level?: number): Set<Part>;
 
         /**
         * Return the Node that is at the root of the tree that this node is in, perhaps this node itself.
@@ -2022,23 +2290,32 @@ declare module go {
         */
         isInTreeOf(node: Node): boolean;
 
-        /**This value for GraphObject#fromEndSegmentDirection and GraphObject#toEndSegmentDirection indicates that the link's end segment angle stays the same even if the node is rotated.*/
+        /**This value for GraphObject.fromEndSegmentDirection and GraphObject.toEndSegmentDirection indicates that the link's end segment angle stays the same even if the node is rotated.*/
         static DirectionAbsolute: EnumValue;
 
-        /**This value for Link#fromEndSegmentDirection and Link#toEndSegmentDirection indicates that the real value is inherited from the corresponding connected port.*/
+        /**This value for Link.fromEndSegmentDirection and Link.toEndSegmentDirection indicates that the real value is inherited from the corresponding connected port.*/
         static DirectionDefault: EnumValue;
 
-        /**This value for GraphObject#fromEndSegmentDirection and GraphObject#toEndSegmentDirection indicates that the link's end segment angle is rotated to match the node's angle.*/
+        /**This value for GraphObject.fromEndSegmentDirection and GraphObject.toEndSegmentDirection indicates that the link's end segment angle is rotated to match the node's angle.*/
         static DirectionRotatedNode: EnumValue;
 
-        /**This value for GraphObject#fromEndSegmentDirection and GraphObject#toEndSegmentDirection indicates that the link's end segment angle is rotated to match the node's angle, but only in increments of 90 degrees.*/
+        /**This value for GraphObject.fromEndSegmentDirection and GraphObject.toEndSegmentDirection indicates that the link's end segment angle is rotated to match the node's angle, but only in increments of 90 degrees.*/
         static DirectionRotatedNodeOrthogonal: EnumValue;
+
+        /**This value for Node.portSpreading indicates that links connecting with a port should be distributed evenly along the side(s) indicated by a Spot that is a "side" Spot.*/
+        static SpreadingEvenly: EnumValue;
+
+        /**This value for Node.portSpreading indicates that links connecting with a port should connect at a single point on the side(s) indicated by a Spot that is a "side" Spot.*/
+        static SpreadingNone: EnumValue;
+
+        /**This value for Node.portSpreading indicates that links connecting with a port should be packed together based on the link's shape's width on the side(s) indicated by a Spot that is a "side" Spot.*/
+        static SpreadingPacked: EnumValue;
     }
 
     /**
     * An Overview is a Diagram that displays all of a different diagram,
     * with a rectangular box showing the viewport displayed by that other diagram.
-    * All you need to do is set Overview#observed.
+    * All you need to do is set Overview.observed.
     */
     class Overview extends Diagram {
         /**
@@ -2050,7 +2327,7 @@ declare module go {
         */
         constructor(id?: string);
 
-        /**Gets or sets the rectangular Part that represents the viewport of the #observed Diagram.*/
+        /**Gets or sets the rectangular Part that represents the viewport of the .observed Diagram.*/
         box: Part;
 
         /**Gets or sets whether this overview draws the temporary layers of the observed Diagram.*/
@@ -2062,8 +2339,8 @@ declare module go {
 
     /**
     * Palette extends the Diagram class to allow objects to be dragged and placed onto other Diagrams.
-    * Its Diagram#layout is a GridLayout.
-    * The Palette is Diagram#isReadOnly but to support drag-and-drop its Diagram#allowDragOut is true.
+    * Its Diagram.layout is a GridLayout.
+    * The Palette is Diagram.isReadOnly but to support drag-and-drop its Diagram.allowDragOut is true.
     */
     class Palette extends Diagram {
         /**
@@ -2079,102 +2356,102 @@ declare module go {
     /**
     * A Panel is a GraphObject that holds other GraphObjects as its elements.
     * A Panel is responsible for sizing and positioning its elements.
-    * Every Panel has a #type and establishes its own coordinate system. The #type of a Panel
+    * Every Panel has a .type and establishes its own coordinate system. The .type of a Panel
     * determines how it will size and arrange its elements.
     */
     class Panel extends GraphObject {
         /**
-        * Constructs an empty Panel of the given #type.
-        * @param {EnumValue=} type If not supplied, the default Panel type is Panel#Position.
+        * Constructs an empty Panel of the given .type.
+        * @param {EnumValue=} type If not supplied, the default Panel type is Panel.Position.
         */
         constructor(type?: EnumValue);
 
-        /**Gets the number of columns in this Panel if it is of #type Panel#Table.*/
+        /**This read-only property returns the number of columns in this Panel if it is of .type Panel.Table.*/
         columnCount: number;
 
-        /**Gets or sets how this Panel's columns deal with extra space if the Panel is of #type Panel#Table.*/
+        /**Gets or sets how this Panel's columns deal with extra space if the Panel is of .type Panel.Table.*/
         columnSizing: EnumValue;
 
         /**Gets or sets the optional model data to which this panel is data-bound.*/
-        data: Object;
+        data: any;
 
-        /**Gets or sets the default alignment spot of this Panel, used as the alignment for an element when its GraphObject#alignment value is Spot#Default.*/
+        /**Gets or sets the default alignment spot of this Panel, used as the alignment for an element when its GraphObject.alignment value is Spot.Default.*/
         defaultAlignment: Spot;
 
         /**Gets or sets the default dash array for a particular column's separator.*/
-        defaultColumnSeparatorDashArray: any[];
+        defaultColumnSeparatorDashArray: Array<number>;
 
-        /**Gets or sets the default Brush stroke (or CSS color string) for columns in a Table Panel provided a given column has a nonzero RowColumnDefinition#separatorStrokeWidth.*/
-        defaultColumnSeparatorStroke: any;
+        /**Gets or sets the default Brush stroke (or CSS color string) for columns in a Table Panel provided a given column has a nonzero RowColumnDefinition.separatorStrokeWidth.*/
+        defaultColumnSeparatorStroke: BrushLike;
 
         /**Gets or sets the default stroke width for a particular column's separator.*/
         defaultColumnSeparatorStrokeWidth: number;
 
         /**Gets or sets the default dash array for a particular row's separator.*/
-        defaultRowSeparatorDashArray: any[];
+        defaultRowSeparatorDashArray: Array<number>;
 
-        /**Gets or sets the default Brush stroke (or CSS color string) for rows in a Table Panel provided a given row has a nonzero RowColumnDefinition#separatorStrokeWidth.*/
-        defaultRowSeparatorStroke: any;
+        /**Gets or sets the default Brush stroke (or CSS color string) for rows in a Table Panel provided a given row has a nonzero RowColumnDefinition.separatorStrokeWidth.*/
+        defaultRowSeparatorStroke: BrushLike;
 
         /**Gets or sets the default stroke width for a particular row's separator.*/
         defaultRowSeparatorStrokeWidth: number;
 
         /**Gets or sets the additional padding for a particular row or column, a Margin (or number for a uniform Margin).*/
-        defaultSeparatorPadding: any;
+        defaultSeparatorPadding: MarginLike;
 
-        /**Gets or sets the default stretch of this Panel, used as the stretch for an element when its GraphObject#stretch value is GraphObject#Default.*/
+        /**Gets or sets the default stretch of this Panel, used as the stretch for an element when its GraphObject.stretch value is GraphObject.Default.*/
         defaultStretch: EnumValue;
 
-        /**Gets an iterator over the collection of the GraphObjects that this panel manages.*/
-        elements: Iterator;
+        /**This read-only property returns an iterator over the collection of the GraphObjects that this panel manages.*/
+        elements: Iterator<GraphObject>;
 
-        /**Gets or sets the distance between lines in a #Grid panel.*/
+        /**Gets or sets the distance between lines in a .Grid panel.*/
         gridCellSize: Size;
 
-        /**Gets or sets an origin point for the grid cells in a #Grid panel.*/
+        /**Gets or sets an origin point for the grid cells in a .Grid panel.*/
         gridOrigin: Point;
 
         /**Gets or sets a JavaScript Array of values or objects, each of which will be represented by a Panel as elements in this Panel.*/
-        itemArray: any[];
+        itemArray: Array<any>;
 
         /**Gets or sets the name of the item data property that returns a string describing that data's category, or a function that takes an item data object and returns that string; the default value is the name 'category'.*/
-        itemCategoryProperty: any;
+        itemCategoryProperty: PropertyAccessor;
 
-        /**Gets or sets the default Panel template used as the archetype for item data that are in #itemArray.*/
+        /**This read-only property returns the index of the item in the containing Panel's Panel.itemArray that this Panel represents.*/
+        itemIndex: number;
+
+        /**Gets or sets the default Panel template used as the archetype for item data that are in .itemArray.*/
         itemTemplate: Panel;
 
         /**Gets or sets a Map mapping template names to Panels.*/
-        itemTemplateMap: Map;
+        itemTemplateMap: Map<string,Panel>;
 
-        /**Gets or sets the first column that this Panel of #type Panel#Table displays.*/
+        /**Gets or sets the first column that this Panel of .type Panel.Table displays.*/
         leftIndex: number;
 
-        /**Gets or sets the multiplicative opacity for this Panel and all children.*/
-        opacity: number;
-
         /**Gets or sets the space between this Panel's border and its content, as a Margin (or number for a uniform Margin), depending on the type of panel.*/
-        padding: any;
+        padding: MarginLike;
 
-        /**Gets the number of row in this Panel if it is of #type Panel#Table.*/
+        /**This read-only property returns the number of row in this Panel if it is of .type Panel.Table.*/
         rowCount: number;
 
-        /**Gets or sets how this Panel's rows deal with extra space if the Panel is of #type Panel#Table.*/
+        /**Gets or sets how this Panel's rows deal with extra space if the Panel is of .type Panel.Table.*/
         rowSizing: EnumValue;
 
-        /**Gets or sets the first row that this this Panel of #type Panel#Table displays.*/
+        /**Gets or sets the first row that this this Panel of .type Panel.Table displays.*/
         topIndex: number;
 
         /**Gets or sets the type of the Panel.*/
         type: EnumValue;
 
-        /**Gets or sets how a #Viewbox panel will resize its content.*/
+        /**Gets or sets how a .Viewbox panel will resize its content.*/
         viewboxStretch: EnumValue;
 
         /**
         * Adds a GraphObject to the end of this Panel's list of elements, visually in front of all of the other elements.
         * @param {GraphObject} element A GraphObject.
         */
-        add(element: GraphObject);
+        add(element: GraphObject): void;
 
         /**
         * Creates a deep copy of this Panel and returns it.
@@ -2194,7 +2471,13 @@ declare module go {
         findColumnForLocalX(x: number): number;
 
         /**
-        * Search the visual tree starting at this Panel for a GraphObject whose GraphObject#name is the given name.
+        * Returns the first immediate child element with GraphObject.isPanelMain set to true,
+        * or if there is no such child element, just the first element.
+        */
+        findMainElement(): GraphObject;
+
+        /**
+        * Search the visual tree starting at this Panel for a GraphObject whose GraphObject.name is the given name.
         * @param {string} name The name to search for, using a case-sensitive string comparison.
         */
         findObject(name: string): GraphObject;
@@ -2222,64 +2505,64 @@ declare module go {
         * @param {number} index
         * @param {GraphObject} element A GraphObject.
         */
-        insertAt(index: number, element: GraphObject);
+        insertAt(index: number, element: GraphObject): void;
 
         /**
-        * Create and add new GraphObjects corresponding to and bound to the data in the #itemArray, after removing all existing elements from this Panel.
+        * Create and add new GraphObjects corresponding to and bound to the data in the .itemArray, after removing all existing elements from this Panel.
         */
-        rebuildItemElements();
+        rebuildItemElements(): void;
 
         /**
         * Removes a GraphObject from this Panel's list of elements.
         * @param {GraphObject} element A GraphObject.
         */
-        remove(element: GraphObject);
+        remove(element: GraphObject): void;
 
         /**
         * Removes an GraphObject from this Panel's list of elements at the specified index.
         * @param {number} idx
         */
-        removeAt(idx: number);
+        removeAt(idx: number): void;
 
         /**
         * Removes the RowColumnDefinition for a particular row in this Table Panel.
         * @param {number} idx the non-negative zero-based integer row index.
         */
-        removeColumnDefinition(idx: number);
+        removeColumnDefinition(idx: number): void;
 
         /**
         * Removes the RowColumnDefinition for a particular row in this Table Panel.
         * @param {number} idx the non-negative zero-based integer row index.
         */
-        removeRowDefinition(idx: number);
+        removeRowDefinition(idx: number): void;
 
         /**
-        * Re-evaluate all data bindings on this panel, in order to assign new property values to the GraphObjects in this visual tree based on this this object's #data property values.
+        * Re-evaluate all data bindings on this panel, in order to assign new property values to the GraphObjects in this visual tree based on this this object's .data property values.
         * @param {string=} srcprop An optional source data property name:
         *   when provided, only evaluates those Bindings that use that particular property;
         *   when not provided or when it is the empty string, all bindings are evaluated.
         */
-        updateTargetBindings(srcprop?: string);
+        updateTargetBindings(srcprop?: string): void;
 
-        /**This value for #type resizes the main element to fit around the other elements; the main element is the first GraphObject with GraphObject#isPanelMain set to true, or else the first GraphObject if none have that property set to true.*/
+        /**This value for .type resizes the main element to fit around the other elements; the main element is the first GraphObject with GraphObject.isPanelMain set to true, or else the first GraphObject if none have that property set to true.*/
         static Auto: EnumValue;
 
-        /**This value for #type is used to draw regular patterns of lines.*/
+        /**This value for .type is used to draw regular patterns of lines.*/
         static Grid: EnumValue;
 
-        /**This value for #type lays out the elements horizontally with their GraphObject#alignment property dictating their alignment on the Y-axis.*/
+        /**This value for .type lays out the elements horizontally with their GraphObject.alignment property dictating their alignment on the Y-axis.*/
         static Horizontal: EnumValue;
 
-        /**This value for #type is used for Links and adornments that act as Links.*/
+        /**This value for .type is used for Links and adornments that act as Links.*/
         static Link: EnumValue;
 
-        /**The default #type arranges each element according to their GraphObject#position.*/
+        /**The default .type arranges each element according to their GraphObject.position.*/
         static Position: EnumValue;
 
-        /**This value for #type arranges GraphObjects about a main element using the GraphObject#alignment and GraphObject#alignmentFocus properties; the main element is the first GraphObject with GraphObject#isPanelMain set to true, or else the first GraphObject if none have that property set to true.*/
+        /**This value for .type arranges GraphObjects about a main element using the GraphObject.alignment and GraphObject.alignmentFocus properties; the main element is the first GraphObject with GraphObject.isPanelMain set to true, or else the first GraphObject if none have that property set to true.*/
         static Spot: EnumValue;
 
-        /**This value for #type arranges GraphObjects into rows and columns; set the GraphObject#row and GraphObject#column properties on each element.*/
+        /**This value for .type arranges GraphObjects into rows and columns; set the GraphObject.row and GraphObject.column properties on each element.*/
         static Table: EnumValue;
 
         /**Organizational Panel type that is only valid inside of a Table panel.*/
@@ -2288,29 +2571,29 @@ declare module go {
         /**Organizational Panel type that is only valid inside of a Table panel.*/
         static TableRow: EnumValue;
 
-        /**This value for #type lays out the elements vertically with their GraphObject#alignment property dictating their alignment on the X-axis.*/
+        /**This value for .type lays out the elements vertically with their GraphObject.alignment property dictating their alignment on the X-axis.*/
         static Vertical: EnumValue;
 
-        /**This value for #type rescales a single GraphObject to fit inside the panel depending on the element's GraphObject#stretch property.*/
+        /**This value for .type rescales a single GraphObject to fit inside the panel depending on the element's GraphObject.stretch property.*/
         static Viewbox: EnumValue;
     }
 
     /**
     * This is the base class for all user-manipulated top-level objects.
-    * Because it inherits from Panel}, it is automatically a visual container
+    * Because it inherits from Panel, it is automatically a visual container
     * of other GraphObjects.
-    * Because it thus also inherits from GraphObject}, it also has properties such as
-    * GraphObject#actualBounds}, GraphObject#contextMenu}, and GraphObject#visible}.
+    * Because it thus also inherits from GraphObject, it also has properties such as
+    * GraphObject.actualBounds, GraphObject.contextMenu, and GraphObject.visible.
     */
     class Part extends Panel {
         /**
         * The constructor builds an empty Part.
-        * @param {EnumValue=} type if not supplied, the default Panel type is Panel#Position.
+        * @param {EnumValue=} type if not supplied, the default Panel type is Panel.Position.
         */
         constructor(type?: EnumValue);
 
-        /**Gets an iterator over all of the Adornments associated with this part.*/
-        adornments: Iterator;
+        /**This read-only property returns an iterator over all of the Adornments associated with this part.*/
+        adornments: Iterator<Adornment>;
 
         /**Gets or sets the category of this part, typically used to distinguish different kinds of nodes or links.*/
         category: string;
@@ -2327,7 +2610,7 @@ declare module go {
         /**Gets or sets whether the user may delete this part.*/
         deletable: boolean;
 
-        /**Gets the Diagram that this Part is in.*/
+        /**This read-only property returns the Diagram that this Part is in.*/
         diagram: Diagram;
 
         /**Gets or sets the function used to determine the location that this Part can be dragged to.*/
@@ -2336,6 +2619,12 @@ declare module go {
         /**Gets or sets whether the user may group this part to be a member of a new Group.*/
         groupable: boolean;
 
+        /**Gets or sets whether this Part may be animated.*/
+        isAnimated: boolean;
+
+        /**Gets or sets whether this Part is highlighted.*/
+        isHighlighted: boolean;
+
         /**Gets or sets whether this Part is part of the document bounds.*/
         isInDocumentBounds: boolean;
 
@@ -2351,7 +2640,7 @@ declare module go {
         /**Gets whether this part is not member of any Group node nor is it a label node for a Link.*/
         isTopLevel: boolean;
 
-        /**Gets the Layer that this Part is in.*/
+        /**This read-only property returns the Layer that this Part is in.*/
         layer: Layer;
 
         /**Gets or sets the function to execute when this part changes layers.*/
@@ -2363,16 +2652,16 @@ declare module go {
         /**Gets or sets "Layout..." flags that control when the Layout that is responsible for this Part is invalidated.*/
         layoutConditions: number;
 
-        /**Gets or sets the position of this part in document coordinates, based on the #locationSpot in this part's #locationObject.*/
+        /**Gets or sets the position of this part in document coordinates, based on the .locationSpot in this part's .locationObject.*/
         location: Point;
 
-        /**Gets the GraphObject that determines the location of this Part.*/
+        /**This read-only property returns the GraphObject that determines the location of this Part.*/
         locationObject: GraphObject;
 
         /**Gets or sets the name of the GraphObject that provides the location of this Part.*/
         locationObjectName: string;
 
-        /**Gets or sets the location Spot of this Node, the spot on the #locationObject that is used in positioning this part in the diagram.*/
+        /**Gets or sets the location Spot of this Node, the spot on the .locationObject that is used in positioning this part in the diagram.*/
         locationSpot: Spot;
 
         /**Gets or sets the maximum location of this Part to which the user may drag using the DraggingTool.*/
@@ -2396,7 +2685,7 @@ declare module go {
         /**Gets or sets the width and height multiples used when resizing.*/
         resizeCellSize: Size;
 
-        /**Gets the GraphObject that should get resize handles when this part is selected.*/
+        /**This read-only property returns the GraphObject that should get resize handles when this part is selected.*/
         resizeObject: GraphObject;
 
         /**Gets or sets the name of the GraphObject that should get a resize handle when this part is selected.*/
@@ -2408,7 +2697,7 @@ declare module go {
         /**Gets or sets the adornment template used to create a rotation handle Adornment for this part.*/
         rotateAdornmentTemplate: Adornment;
 
-        /**Gets the GraphObject that should get rotate handles when this part is selected.*/
+        /**This read-only property returns the GraphObject that should get rotate handles when this part is selected.*/
         rotateObject: GraphObject;
 
         /**Gets or sets the name of the GraphObject that should get a rotate handle when this part is selected.*/
@@ -2426,7 +2715,7 @@ declare module go {
         /**Gets or sets the function to execute when this part is selected or deselected.*/
         selectionChanged: (p: Part) => void;
 
-        /**Gets the GraphObject that should get a selection handle when this part is selected.*/
+        /**This read-only property returns the GraphObject that should get a selection handle when this part is selected.*/
         selectionObject: GraphObject;
 
         /**Gets or sets the name of the GraphObject that should get a selection handle when this part is selected.*/
@@ -2444,7 +2733,7 @@ declare module go {
         /**Gets or sets a text string that is associated with this part.*/
         text: string;
 
-        /**Gets or sets whether the user may do in-place text editing on TextBlocks in this part that have TextBlock#editable set to true.*/
+        /**Gets or sets whether the user may do in-place text editing on TextBlocks in this part that have TextBlock.editable set to true.*/
         textEditable: boolean;
 
         /**
@@ -2452,25 +2741,25 @@ declare module go {
         * @param {string} category a string identifying the kind or role of the given adornment for this Part.
         * @param {Adornment} ad
         */
-        addAdornment(category: string, ad: Adornment);
+        addAdornment(category: string, ad: Adornment): void;
 
         /**
-        * This predicate returns true if #copyable is true, if the layer's Layer#allowCopy is true, and if the diagram's Diagram#allowCopy is true.
+        * This predicate returns true if .copyable is true, if the layer's Layer.allowCopy is true, and if the diagram's Diagram.allowCopy is true.
         */
         canCopy(): boolean;
 
         /**
-        * This predicate returns true if #deletable is true, if the layer's Layer#allowDelete is true, and if the diagram's Diagram#allowDelete is true.
+        * This predicate returns true if .deletable is true, if the layer's Layer.allowDelete is true, and if the diagram's Diagram.allowDelete is true.
         */
         canDelete(): boolean;
 
         /**
-        * This predicate returns true if #textEditable is true, if the layer's Layer#allowTextEdit is true, and if the diagram's Diagram#allowTextEdit is true.
+        * This predicate returns true if .textEditable is true, if the layer's Layer.allowTextEdit is true, and if the diagram's Diagram.allowTextEdit is true.
         */
         canEdit(): boolean;
 
         /**
-        * This predicate returns true if #groupable is true, if the layer's Layer#allowGroup is true, and if the diagram's Diagram#allowGroup is true.
+        * This predicate returns true if .groupable is true, if the layer's Layer.allowGroup is true, and if the diagram's Diagram.allowGroup is true.
         */
         canGroup(): boolean;
 
@@ -2480,34 +2769,34 @@ declare module go {
         canLayout(): boolean;
 
         /**
-        * This predicate returns true if #movable is true, if the layer's Layer#allowMove is true, and if the diagram's Diagram#allowMove is true.
+        * This predicate returns true if .movable is true, if the layer's Layer.allowMove is true, and if the diagram's Diagram.allowMove is true.
         */
         canMove(): boolean;
 
         /**
-        * This predicate returns true if #reshapable is true, if the layer's Layer#allowReshape is true, and if the diagram's Diagram#allowReshape is true.
+        * This predicate returns true if .reshapable is true, if the layer's Layer.allowReshape is true, and if the diagram's Diagram.allowReshape is true.
         */
         canReshape(): boolean;
 
         /**
-        * This predicate returns true if #resizable is true, if the layer's Layer#allowResize is true, and if the diagram's Diagram#allowResize is true.
+        * This predicate returns true if .resizable is true, if the layer's Layer.allowResize is true, and if the diagram's Diagram.allowResize is true.
         */
         canResize(): boolean;
 
         /**
-        * This predicate returns true if #rotatable is true, if the layer's Layer#allowRotate is true, and if the diagram's Diagram#allowRotate is true.
+        * This predicate returns true if .rotatable is true, if the layer's Layer.allowRotate is true, and if the diagram's Diagram.allowRotate is true.
         */
         canRotate(): boolean;
 
         /**
-        * This predicate returns true if #selectable is true, if the layer's Layer#allowSelect is true, and if the diagram's Diagram#allowSelect is true.
+        * This predicate returns true if .selectable is true, if the layer's Layer.allowSelect is true, and if the diagram's Diagram.allowSelect is true.
         */
         canSelect(): boolean;
 
         /**
         * Remove all adornments associated with this part.
         */
-        clearAdornments();
+        clearAdornments(): void;
 
         /**
         * Find an Adornment of a given category associated with this Part.
@@ -2522,7 +2811,13 @@ declare module go {
         findCommonContainingGroup(other: Part): Group;
 
         /**
-        * Gets the top-level Part for this part, which is itself when #isTopLevel is true.
+        * Return how deep this part is in the hierarchy of nested Groups.
+        * For top level parts, i.e. isTopLevel, this returns zero.
+        */
+        findSubGraphLevel(): number;
+
+        /**
+        * Gets the top-level Part for this part, which is itself when .isTopLevel is true.
         */
         findTopLevelPart(): Part;
 
@@ -2530,10 +2825,10 @@ declare module go {
         * Invalidate the Layout that is responsible for positioning this Part.
         * @param {number=} condition the reason that the layout should be invalidated --
         * some combination of "Layout..." flag values;
-        * if this argument is not supplied, any value of #layoutConditions other than Part#LayoutNone
+        * if this argument is not supplied, any value of .layoutConditions other than Part.LayoutNone
         * will allow the layout to be invalidated.
         */
-        invalidateLayout(condition?: number);
+        invalidateLayout(condition?: number): void;
 
         /**
         * This predicate is true if this part is a member of the given Part, perhaps indirectly.
@@ -2550,62 +2845,73 @@ declare module go {
         * Move this part and any parts that are owned by this part to a new position.
         * @param {Point} newpos a new Point in document coordinates.
         */
-        move(newpos: Point);
+        move(newpos: Point): void;
 
         /**
         * Remove any Adornment of the given category that may be associated with this Part.
         * @param {string} category a string identifying the kind or role of the given adornment for this Part.
         */
-        removeAdornment(category: string);
+        removeAdornment(category: string): void;
 
         /**
-        * This is responsible for creating any selection Adornment (if this Part #isSelected) and any tool adornments for this part.*/
-        updateAdornments();
+        * This is responsible for creating any selection Adornment (if this Part .isSelected) and any tool adornments for this part.*/
+        updateAdornments(): void;
 
         /**
-        * Re-evaluate all data bindings on this Part, in order to assign new property values to the GraphObjects in this visual tree based on this this object's #data property values.
+        * Re-evaluate all data bindings on this Part, in order to assign new property values to the GraphObjects in this visual tree based on this this object's .data property values.
         * @param {string=} srcprop An optional source data property name:
         *   when provided, only evaluates those Bindings that use that particular property;
         *   when not provided or when it is the empty string, all bindings are evaluated.
         */
-        updateTargetBindings(srcprop?: string);
+        updateTargetBindings(srcprop?: string): void;
 
-        /**This flag may be combined with other "Layout" flags as the value of the Part#layoutConditions property to indicate that when a Part is added to a Diagram or Group, it invalidates the Layout responsible for the Part.*/
+        /**
+        * Update all of the references to nodes in case they had been modified in the model without
+        * properly notifying the model by calling GraphLinksModel.setGroupKeyForNodeData or
+        * GraphLinksModel.setToKeyForLinkData or other similar methods.
+        */
+        updateRelationshipsFromData(): void;
+
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part is added to a Diagram or Group, it invalidates the Layout responsible for the Part.*/
         static LayoutAdded: number;
 
-        /**This flag may be combined with other "Layout" flags as the value of the Part#layoutConditions property to indicate that when a Group has been laid out, it invalidates the Layout responsible for that Group; this flag is ignored for Parts that are not Groups.*/
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Group has been laid out, it invalidates the Layout responsible for that Group; this flag is ignored for Parts that are not Groups.*/
         static LayoutGroupLayout: number;
 
-        /**This flag may be combined with other "Layout" flags as the value of the Part#layoutConditions property to indicate that when a Part's GraphObject#visible becomes false, it invalidates the Layout responsible for the Part.*/
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part's GraphObject.visible becomes false, it invalidates the Layout responsible for the Part.*/
         static LayoutHidden: number;
 
-        /**This flag may be combined with other "Layout" flags as the value of the Part#layoutConditions property to indicate that when a Part's GraphObject#actualBounds changes size, it invalidates the Layout responsible for the Part; this flag is ignored for Parts that are Links.*/
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Node or simple Part's .category changes, it invalidates the Layout responsible for the Part; this flag is ignored for Parts that are Links.*/
+        static LayoutNodeReplaced: number;
+
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part's GraphObject.actualBounds changes size, it invalidates the Layout responsible for the Part; this flag is ignored for Parts that are Links.*/
         static LayoutNodeSized: number;
 
-        /**This value may be used as the value of the Part#layoutConditions property to indicate that no operation on this Part causes invalidation of the Layout responsible for this Part.*/
+        /**This value may be used as the value of the Part.layoutConditions property to indicate that no operation on this Part causes invalidation of the Layout responsible for this Part.*/
         static LayoutNone: number;
 
-        /**This flag may be combined with other "Layout" flags as the value of the Part#layoutConditions property to indicate that when a Part is removed from a Diagram or Group, it invalidates the Layout responsible for the Part.*/
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part is removed from a Diagram or Group, it invalidates the Layout responsible for the Part.*/
         static LayoutRemoved: number;
 
-        /**This flag may be combined with other "Layout" flags as the value of the Part#layoutConditions property to indicate that when a Part's GraphObject#visible becomes true, it invalidates the Layout responsible for the Part.*/
+        /**This flag may be combined with other "Layout" flags as the value of the Part.layoutConditions property to indicate that when a Part's GraphObject.visible becomes true, it invalidates the Layout responsible for the Part.*/
         static LayoutShown: number;
 
-        /**This is the default value for the Part#layoutConditions property: the Layout responsible for the Part is invalidated when the Part is added or removed from the Diagram or Group or when it changes visibility or size or when a Group's layout has been performed.*/
+        /**This is the default value for the Part.layoutConditions property: the Layout responsible for the Part is invalidated when the Part is added or removed from the Diagram or Group or when it changes visibility or size or when a Group's layout has been performed.*/
         static LayoutStandard: number;
 
-        ensureBounds();  // undocumented
+        ensureBounds(): void;  // undocumented
+        moveTo(x: number, y: number): void;  // undocumented
     }
 
     /**
     * A Picture is a GraphObject that shows an image, video-frame, or Canvas element.
-    * You can specify what to show by either setting the #source URL property
-    * to a URL string or the #element property to an HTMLImageElement,
+    * You can specify what to show by either setting the .source URL property
+    * to a URL string or the .element property to an HTMLImageElement,
     * HTMLCanvasElement, or HTMLVideoElement.
     */
     class Picture extends GraphObject {
         /**
-        * The constructor creates a picture that shows nothing until the #source or #element is specified.
+        * The constructor creates a picture that shows nothing until the .source or .element is specified.
         */
         constructor();
 
@@ -2618,52 +2924,57 @@ declare module go {
         /**Gets or sets how the Picture's image is stretched within its bounding box.*/
         imageStretch: EnumValue;
 
-        /**Gets the natural size of this picture as determined by its source's width and height.*/
+        /**This read-only property returns the natural size of this picture as determined by its source's width and height.*/
         naturalBounds: Rect;
 
         /**Gets or sets the Picture's source URL, which can be any valid image (png, jpg, gif, etc) URL.*/
         source: string;
 
+        /**Gets or sets a function that returns a value for image.crossOrigin, which is null by default.*/
+        sourceCrossOrigin: (pic: Picture) => string;
+
         /**Gets or sets the rectangular area of the source image that this picture should display.*/
         sourceRect: Rect;
+
+        static clearCache(url?: string): void;  // undocumented
     }
 
     /**
     * If a Placeholder is in the visual tree of a Group, it represents the area of all of the member Parts of that Group.
-    * If a Placeholder is in the visual tree of an Adornment, it represents the area of the Adornment#adornedObject.
+    * If a Placeholder is in the visual tree of an Adornment, it represents the area of the Adornment.adornedObject.
     * It can only be used in the visual tree of a Group node or an Adornment.
     * There can be at most one Placeholder in a Group or an Adornment.
     */
     class Placeholder extends GraphObject {
         /**
-        * The only common initialize of a Placeholder is to set its #padding.
+        * The only common initialize of a Placeholder is to set its .padding.
         */
         constructor();
 
-        /**Gets or sets the padding as a Margin (or number for a uniform Margin) around the members of the Group or around the Adornment#adornedObject GraphObject.*/
-        padding: any;
+        /**Gets or sets the padding as a Margin (or number for a uniform Margin) around the members of the Group or around the Adornment.adornedObject GraphObject.*/
+        padding: MarginLike;
     }
 
     /**
     * The RowColumnDefinition class describes constraints on a row or a column
-    * in a Panel of type Panel#Table.
+    * in a Panel of type Panel.Table.
     * It also provides information about the actual layout after the
     * Table Panel has been arranged.
     */
     class RowColumnDefinition {
         /**
-        * You do not need to use this constructor, because calls to Panel#getRowDefinition or Panel#getColumnDefinition will automatically create and remember a RowColumnDefinition for you.
+        * You do not need to use this constructor, because calls to Panel.getRowDefinition or Panel.getColumnDefinition will automatically create and remember a RowColumnDefinition for you.
         */
         constructor();
 
-        /**Gets the usable row height or column width, after arrangement, that objects in this row or column can be placed within.*/
+        /**This read-only property returns the usable row height or column width, after arrangement, that objects in this row or column can be placed within.*/
         actual: number;
 
         /**Gets or sets a default alignment for elements that are in this row or column.*/
         alignment: Spot;
 
         /**Gets or sets the background Brush (or CSS color string) for a particular row or column, which fills the entire span of the column, including any separatorPadding.*/
-        background: any;
+        background: BrushLike;
 
         /**Determines whether or not the background, if there is one, is in front of or behind the separators.*/
         coversSeparators: boolean;
@@ -2671,10 +2982,10 @@ declare module go {
         /**Gets or sets the row height.*/
         height: number;
 
-        /**Gets which row or column this RowColumnDefinition describes in the #panel.*/
+        /**This read-only property returns which row or column this RowColumnDefinition describes in the .panel.*/
         index: number;
 
-        /**Gets whether this describes a row or a column in the #panel.*/
+        /**This read-only property returns whether this describes a row or a column in the .panel.*/
         isRow: boolean;
 
         /**Gets or sets the maximum row height or column width.*/
@@ -2683,20 +2994,20 @@ declare module go {
         /**Gets or sets the minimum row height or column width.*/
         minimum: number;
 
-        /**Gets the Panel that this row or column definition is in.*/
+        /**This read-only property returns the Panel that this row or column definition is in.*/
         panel: Panel;
 
-        /**Gets the actual arranged row or column starting position, after arrangement.*/
+        /**This read-only property returns the actual arranged row or column starting position, after arrangement.*/
         position: number;
 
-        /**Gets or sets the dash array for dashing the spacing provided this row or column has a nonzero RowColumnDefinition#separatorStrokeWidth and non-null RowColumnDefinition#separatorStroke.*/
-        separatorDashArray: any[];
+        /**Gets or sets the dash array for dashing the spacing provided this row or column has a nonzero RowColumnDefinition.separatorStrokeWidth and non-null RowColumnDefinition.separatorStroke.*/
+        separatorDashArray: Array<number>;
 
         /**Gets or sets the additional padding for a particular row or column, a Margin (or number for a uniform Margin).*/
-        separatorPadding: any;
+        separatorPadding: MarginLike;
 
-        /**Gets or sets the Brush (or CSS color string) for a particular row or column, provided that row or column has a nonzero RowColumnDefinition#separatorStrokeWidth.*/
-        separatorStroke: any;
+        /**Gets or sets the Brush (or CSS color string) for a particular row or column, provided that row or column has a nonzero RowColumnDefinition.separatorStrokeWidth.*/
+        separatorStroke: BrushLike;
 
         /**Gets or sets the stroke width for a particular row or column's separator,*/
         separatorStrokeWidth: number;
@@ -2707,7 +3018,7 @@ declare module go {
         /**Gets or sets the default stretch for elements that are in this row or column.*/
         stretch: EnumValue;
 
-        /**Gets the total arranged row height or column width, after arrangement.*/
+        /**This read-only property returns the total arranged row height or column width, after arrangement.*/
         total: number;
 
         /**Gets or sets the column width.*/
@@ -2717,27 +3028,30 @@ declare module go {
         * Add a data-binding of a property on this object to a property on a data object.
         * @param {Binding} binding
         */
-        bind(binding: Binding);
+        bind(binding: Binding): void;
 
-        /**The default #sizing, which resolves to RowColumnDefinition#None or else the Table Panel's rowSizing and columnSizing if present.*/
+        /**The default .sizing, which resolves to RowColumnDefinition.None or else the Table Panel's rowSizing and columnSizing if present.*/
         static Default: EnumValue;
 
-        /**The default #sizing if none is specified on the Table Panel's rowSizing and columnSizing.*/
+        /**The default .sizing if none is specified on the Table Panel's rowSizing and columnSizing.*/
         static None: EnumValue;
 
-        /**If a Table Panel is larger than all the rows then this #sizing grants this row and any others with the same value the extra space, apportioned proportionally between them*/
+        /**If a Table Panel is larger than all the rows then this .sizing grants this row and any others with the same value the extra space, apportioned proportionally between them*/
         static ProportionalExtra: EnumValue;
+
+        computeEffectiveSpacing(): number;  // undocumented
+        computeEffectiveSpacingTop(): number;  // undocumented
     }
 
     /**
     * A Shape is a GraphObject that shows a geometric figure.
     * The Geometry determines what is drawn;
-    * the properties #fill and #stroke
+    * the properties .fill and .stroke
     * (and other stroke properties) determine how it is drawn.
     */
     class Shape extends GraphObject {
         /**
-        * A newly constructed Shape has a default #figure of "None", which constructs a rectangular geometry, and is filled and stroked with a black brush.
+        * A newly constructed Shape has a default .figure of "None", which constructs a rectangular geometry, and is filled and stroked with a black brush.
         */
         constructor();
 
@@ -2745,7 +3059,7 @@ declare module go {
         figure: string;
 
         /**Gets or sets the Brush (or CSS color string) that describes the fill of the Shape.*/
-        fill: any;
+        fill: BrushLike;
 
         /**Gets or sets the name of the kind of arrowhead that this shape should take when this shape is an element of a Link.*/
         fromArrow: string;
@@ -2756,16 +3070,16 @@ declare module go {
         /**Gets or sets how the shape's geometry is proportionally created given its computed size.*/
         geometryStretch: EnumValue;
 
-        /**When set, creates a Geometry and normalizes it from a given path string, then sets the Geometry on this Shape and offsets the GraphObject#position by an appropriate amount.*/
+        /**When set, creates a Geometry and normalizes it from a given path string, then sets the Geometry on this Shape and offsets the GraphObject.position by an appropriate amount.*/
         geometryString: string;
 
-        /**Gets or sets how frequently this shape should be drawn within a Grid Panel, in multiples of the Panel#gridCellSize.*/
+        /**Gets or sets how frequently this shape should be drawn within a Grid Panel, in multiples of the Panel.gridCellSize.*/
         interval: number;
 
-        /**Gets or sets the whether the #position denotes the panel coordinates of the geometry or of the stroked area.*/
+        /**Gets or sets the whether the .position denotes the panel coordinates of the geometry or of the stroked area.*/
         isGeometryPositioned: boolean;
 
-        /**Gets the natural bounds of this Shape as determined by its #geometry's bounds.*/
+        /**This read-only property returns the natural bounds of this Shape as determined by its .geometry's bounds.*/
         naturalBounds: Rect;
 
         /**Gets or sets a property for parameterizing the construction of a Geometry from a figure.*/
@@ -2781,13 +3095,13 @@ declare module go {
         spot2: Spot;
 
         /**Gets or sets the Brush (or CSS color string) that describes the stroke of the Shape.*/
-        stroke: any;
+        stroke: BrushLike;
 
         /**Gets or sets the style for the stroke's line cap.*/
         strokeCap: string;
 
         /**Gets or sets the dash array for creating dashed lines.*/
-        strokeDashArray: any[];
+        strokeDashArray: Array<number>;
 
         /**Gets or sets the offset for dashed lines, used in the phase pattern.*/
         strokeDashOffset: number;
@@ -2803,10 +3117,48 @@ declare module go {
 
         /**Gets or sets the name of the kind of arrowhead that this shape should take when this shape is an element of a Link.*/
         toArrow: string;
+
+        /**
+        * This static function returns a read-only Map of named geometry generators.
+        * @return {Map} the keys are figure names; the values are either synonymed names or generator functions
+        */
+        static getFigureGenerators(): Map<string,(shape: Shape, width: number, height: number) => Geometry>;
+
+        /**
+        * This static function defines a named figure geometry generator for Shapes.
+        * @param {string} name new figure name must start with an uppercase letter, and must not be "None"
+        * @param {function(Shape, number, number):Geometry} func returns a Geometry for the given Shape, width, and height
+        */
+        static defineFigureGenerator(name: string, func: (shape: Shape, width: number, height: number) => Geometry): void;
+        /**
+        * This static function defines a synonym for a named figure geometry generator.
+        * @param {string} name the new figure name must start with an uppercase letter, and must not be "None"
+        * @param {string} synonym an existing figure name
+        */
+        static defineFigureGenerator(name: string, synonym: string): void;
+
+        /**
+        * This static function returns a read-only Map of named arrowhead geometries.
+        * @return {Map} the keys are arrowhead names; the values are Geometry objects
+        */
+        static getArrowheadGeometries(): Map<string,Geometry>;
+
+        /**
+        * This static function defines a named arrowhead geometry.
+        * @param {string} name the new arrowhead name must start with an uppercase letter, and must not be "None"
+        * @param {Geometry} geo the Geometry for the arrowhead
+        */
+        static defineArrowheadGeometry(name: string, geo: Geometry): void;
+        /**
+        * This static function defines a named arrowhead geometry.
+        * @param {string} name the new arrowhead name must start with an uppercase letter, and must not be "None"
+        * @param {string} pathstr a geometry path string that will be passed to Geometry.parse
+        */
+        static defineArrowheadGeometry(name: string, pathstr: string): void;
     }
 
     /**
-    * A TextBlock is a GraphObject that displays a #text string in a given #font.
+    * A TextBlock is a GraphObject that displays a .text string in a given .font.
     */
     class TextBlock extends GraphObject {
         /**
@@ -2814,7 +3166,7 @@ declare module go {
         */
         constructor();
 
-        /**Gets or sets whether or not this TextBlock allows in-place editing of the #text string by the user with the help of the TextEditingTool.*/
+        /**Gets or sets whether or not this TextBlock allows in-place editing of the .text string by the user with the help of the TextEditingTool.*/
         editable: boolean;
 
         /**Gets or sets the function to call if a text edit made with the TextEditingTool is invalid.*/
@@ -2832,14 +3184,20 @@ declare module go {
         /**Gets or sets whether or not the text is underlined.*/
         isUnderline: boolean;
 
-        /**Gets the total number of lines in this TextBlock, including lines created from returns and wrapping.*/
+        /**This read-only property returns the total number of lines in this TextBlock, including lines created from returns and wrapping.*/
         lineCount: number;
 
-        /**Gets the natural bounds of this TextBlock in local coordinates, as determined by its #font and #text string.*/
+        /**Gets or sets the maximum number of lines that this TextBlock may display.*/
+        maxLines: number;
+
+        /**This read-only property returns the natural bounds of this TextBlock in local coordinates, as determined by its .font and .text string.*/
         naturalBounds: Rect;
 
-        /**Gets or sets the Brush (or CSS color string) that describes the stroke (color) of the #font.*/
-        stroke: any;
+        /**Gets or sets how text that is too long to display should be handled.*/
+        overflow: EnumValue;
+
+        /**Gets or sets the Brush (or CSS color string) that describes the stroke (color) of the .font.*/
+        stroke: BrushLike;
 
         /**Gets or sets the current text string.*/
         text: string;
@@ -2859,11 +3217,21 @@ declare module go {
         /**The TextBlock will not wrap its text.*/
         static None: EnumValue;
 
+        /** Used as the default value for TextBlock.overflow: if the width is too small to display all text, the TextBlock will clip.*/
+        static OverflowClip: EnumValue;
+
+        /** Used as a value for TextBlock.overflow: if the width is too small to display all text, the TextBlock will display an ellipsis.*/
+        static OverflowEllipsis: EnumValue;
+
         /**The TextBlock will wrap text and the width of the TextBlock will be the desiredSize's width, if any.*/
         static WrapDesiredSize: EnumValue;
 
         /**The TextBlock will wrap text, making the width of the TextBlock equal to the width of the longest line.*/
         static WrapFit: EnumValue;
+
+        static isValidFont(font: string): boolean;  // undocumented
+        static getEllipsis(): string;  // undocumented
+        static setEllipsis(val: string): void;  // undocumented
     }
 
 
@@ -2872,14 +3240,14 @@ declare module go {
     * of a Shape or the stroke of a shape or a TextBlock or the
     * background of any GraphObject.
     * A Brush must not be modified once it has been assigned to a GraphObject,
-    * such as the Shape#fill or TextBlock#stroke
-    * or GraphObject#background.
+    * such as the Shape.fill or TextBlock.stroke
+    * or GraphObject.background.
     * However, a Brush may be shared by multiple GraphObjects.
     */
     class Brush {
         /**
         * Construct a Brush class of a given type.
-        * @param {EnumValue} type one of the values  Brush#Solid, Brush#Linear, Brush#Radial, Brush#Pattern.
+        * @param {EnumValue} type one of the values  Brush.Solid, Brush.Linear, Brush.Radial, Brush.Pattern.
         */
         constructor(type: EnumValue);
         /**
@@ -2892,7 +3260,7 @@ declare module go {
         color: string;
 
         /**Gets or sets a Map holding all of the color stops used in this gradient, where the key is a number, the fractional distance between zero and one (inclusive), and where the corresponding value is a color string.*/
-        colorStops: Map;
+        colorStops: Map<number,string>;
 
         /**Gets or sets the ending location for a linear or radial gradient.*/
         end: Spot;
@@ -2900,7 +3268,7 @@ declare module go {
         /**Gets or sets the radius of a radial brush at the end location.*/
         endRadius: number;
 
-        /**Gets or sets the pattern of a brush of type Brush#Pattern, an HTMLImageElement or HTMLCanvasElement.*/
+        /**Gets or sets the pattern of a brush of type Brush.Pattern, an HTMLImageElement or HTMLCanvasElement or HTMLVideoElement.*/
         pattern: any;
 
         /**Gets or sets the starting location for a linear or radial gradient.*/
@@ -2914,13 +3282,13 @@ declare module go {
 
         /**
         * Specify a particular color at a particular fraction of the distance.
-        * If the  #type is Brush#Solid, change the type to Brush#Linear.
+        * If the  .type is Brush.Solid, change the type to Brush.Linear.
         * You should have a color stop at zero and a color stop at one.
         * You should not have duplicate color stop values at the same fractional distance.
         * @param {number} loc between zero and one, inclusive.
         * @param {string} color a CSS color string
         */
-        addColorStop(loc: number, color: string);
+        addColorStop(loc: number, color: string): void;
 
         /**
         * Create a copy of this Brush, with the same values.
@@ -2928,23 +3296,25 @@ declare module go {
         copy(): Brush;
 
         /**
-        * This static method can be used to generate a random color string.
+        * This static function can be used to generate a random color string.
         * @param {number=} min a number between zero and 255, defaults to 128.
         * @param {number=} max a number between zero and 255, defaults to 255.
         */
         static randomColor(min?: number, max?: number): string;
 
-        /**For linear gradient brushes, used as the value for Brush#type.*/
+        /**For linear gradient brushes, used as the value for Brush.type.*/
         static Linear: EnumValue;
 
-        /**For pattern brushes, used as the value for Brush#type.*/
+        /**For pattern brushes, used as the value for Brush.type.*/
         static Pattern: EnumValue;
 
-        /**For radial gradient brushes, used as the value for Brush#type.*/
+        /**For radial gradient brushes, used as the value for Brush.type.*/
         static Radial: EnumValue;
 
-        /**For simple, solid color brushes, used as the value for Brush#type.*/
+        /**For simple, solid color brushes, used as the value for Brush.type.*/
         static Solid: EnumValue;
+
+        static isValidColor(color: string): boolean;  // undocumented
     }
 
     /**
@@ -2958,38 +3328,48 @@ declare module go {
         /**
         * Construct an empty Geometry.
         * The geometry type must be one of the following values:
-        * Geometry#Line, Geometry#Ellipse, Geometry#Rectangle, Geometry#Path.
-        * @param {EnumValue=} type If not supplied, the default Geometry type is Geometry#Path.
+        * Geometry.Line, Geometry.Ellipse, Geometry.Rectangle, Geometry.Path.
+        * @param {EnumValue=} type If not supplied, the default Geometry type is Geometry.Path.
         */
         constructor(type?: EnumValue);
 
-        /**Gets a rectangle that contains all points within the Geometry.*/
+        /**This read-only property returns a rectangle that contains all points within the Geometry.*/
         bounds: Rect;
 
-        /**Gets or sets the ending X coordinate of the Geometry if it is of type #Line, #Rectangle, or #Ellipse.*/
+        /**Gets or sets the Shape.geometryStretch value the Shape should use by default.*/
+        defaultStretch: EnumValue;
+
+        /**Gets or sets the ending X coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
         endX: number;
 
-        /**Gets or sets the ending Y coordinate of the Geometry if it is of type #Line, #Rectangle, or #Ellipse.*/
+        /**Gets or sets the ending Y coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
         endY: number;
 
-        /**Gets or sets the List of PathFigures that describes the content of the path for Geometries of type #Path.*/
-        figures: List;
+        /**Gets or sets the List of PathFigures that describes the content of the path for Geometries of type .Path.*/
+        figures: List<PathFigure>;
 
-        /**Gets or sets the spot to use when the Shape#spot1 value is Spot#Default.*/
+        /**Gets or sets the spot to use when the Shape.spot1 value is Spot.Default.*/
         spot1: Spot;
 
-        /**Gets or sets the spot to use when the Shape#spot2 value is Spot#Default.*/
+        /**Gets or sets the spot to use when the Shape.spot2 value is Spot.Default.*/
         spot2: Spot;
 
-        /**Gets or sets the starting X coordinate of the Geometry if it is of type #Line, #Rectangle, or #Ellipse.*/
+        /**Gets or sets the starting X coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
         startX: number;
 
-        /**Gets or sets the starting Y coordinate of the Geometry if it is of type #Line, #Rectangle, or #Ellipse.*/
+        /**Gets or sets the starting Y coordinate of the Geometry if it is of type .Line, .Rectangle, or .Ellipse.*/
         startY: number;
 
         /**Gets or sets the type of the Geometry.*/
         type: EnumValue;
 
+        /**
+        * Add a PathFigure to the figures list.
+        * @param {PathFigure} figure a newly allocated unshared PathFigure that will become owned by this Geometry
+        * @return {Geometry} this
+        */
+        add(figure: PathFigure): Geometry;
+
         /**
         * Computes the Geometry's bounds without adding an origin point, and returns those bounds as a rect.
         */
@@ -3016,8 +3396,9 @@ declare module go {
         * Offsets the Geometry in place by a given (x, y) amount
         * @param {number} x The x-axis offset factor.
         * @param {number} y The y-axis offset factor.
+        * @return {Geometry} this
         */
-        offset(x: number, y: number);
+        offset(x: number, y: number): Geometry;
 
         /**
         * Produce a Geometry from a string that uses an SVG-like compact path geometry syntax.
@@ -3036,18 +3417,20 @@ declare module go {
         * @param {number} angle The angle to rotate by.
         * @param {number=} x The optional X point to rotate the geometry about. If no point is given, this value is 0.
         * @param {number=} y The optional Y point to rotate the geometry about. If no point is given, this value is 0.
+        * @return {Geometry} this
         */
-        rotate(angle: number, x?: number, y?: number);
+        rotate(angle: number, x?: number, y?: number): Geometry;
 
         /**
         * Scales the Geometry in place by a given (x, y) scale factor
         * @param {number} x The x-axis scale factor.
         * @param {number} y The y-axis scale factor.
+        * @return {Geometry} this
         */
-        scale(x: number, y: number);
+        scale(x: number, y: number): Geometry;
 
         /**
-        * This static method can be used to write out a Geometry as a string
+        * This static function can be used to write out a Geometry as a string
         * that can be read by Geometry.parse.
         * The string produced by this method is a superset of the SVG path
         * string rules that contains some additional GoJS-specific tokens.
@@ -3056,17 +3439,19 @@ declare module go {
         */
         static stringify(val: Geometry): string;
 
-        /**For drawing an ellipse fitting within a rectangle; a value for Geometry#type.*/
+        /**For drawing an ellipse fitting within a rectangle; a value for Geometry.type.*/
         static Ellipse: EnumValue;
 
-        /**For drawing a simple straight line; a value for Geometry#type.*/
+        /**For drawing a simple straight line; a value for Geometry.type.*/
         static Line: EnumValue;
 
-        /**For drawing a complex path made of a list of PathFigures; a value for Geometry#type.*/
+        /**For drawing a complex path made of a list of PathFigures; a value for Geometry.type.*/
         static Path: EnumValue;
 
-        /**For drawing a rectangle; a value for Geometry#type.*/
+        /**For drawing a rectangle; a value for Geometry.type.*/
         static Rectangle: EnumValue;
+
+        equalsApprox(g: Geometry): boolean;  // undocumented
     }
 
     /**
@@ -3142,14 +3527,14 @@ declare module go {
         isReal(): boolean;
 
         /**
-        * This static method can be used to read in a Margin from a string that was produced by Margin.stringify.
+        * This static function can be used to read in a Margin from a string that was produced by Margin.stringify.
         * @param {string} str
         */
         static parse(str: string): Margin;
 
         /**
-        * Replace the transformation matrix of this Transform with those of another Transform.
-        * @param {Transform} t the other Transform from which to copy the transformation matrix.
+        * Modify this Margin so that its Top, Right, Bottom, and Left values are the same as the given Margin.
+        * @param {Margin} m the Margin whose values are to be copied
         */
         set(m: Margin): Margin;
 
@@ -3161,14 +3546,16 @@ declare module go {
         setTo(t: number, r: number, b: number, l: number): Margin;
 
         /**
-        * This static method can be used to write out a Margin as a string that can be read by Margin.parse.
+        * This static function can be used to write out a Margin as a string that can be read by Margin.parse.
         * @param {Margin} val
         */
         static stringify(val: Margin): string;
+
+        equalsApprox(m: Margin): boolean;  // undocumented
     }
 
     /**
-    * A PathFigure represents a section of a Geometry}.
+    * A PathFigure represents a section of a Geometry.
     * It is a single connected series of
     * two-dimensional geometric PathSegments.
     */
@@ -3177,12 +3564,13 @@ declare module go {
         * Constructs an empty figure.
         * The optional arguments specify the starting point of the figure.
         * You'll want to add a new instance of a PathFigure to the
-        * Geometry#figures list of a Geometry.
+        * Geometry.figures list of a Geometry.
         * @param {number=} sx optional: the X coordinate of the start point (default is zero).
         * @param {number=} sy optional: the Y coordinate of the start point (default is zero).
         * @param {boolean=} filled optional: whether the figure is filled (default is true).
+        * @param {boolean=} shadowed optional: whether the figure may be drawn with a shadow (default is true).
         */
-        constructor(sx?: number, sy?: number, filled?: boolean);
+        constructor(sx?: number, sy?: number, filled?: boolean, shadowed?: boolean);
 
         /**Gets or sets whether this PathFigure is drawn filled.*/
         isFilled: boolean;
@@ -3191,7 +3579,7 @@ declare module go {
         isShadowed: boolean;
 
         /**Gets or sets the List of PathSegments that define this PathFigure.*/
-        segments: List;
+        segments: List<PathSegment>;
 
         /**Gets or sets the starting point X coordinate of the PathFigure.*/
         startX: number;
@@ -3199,17 +3587,26 @@ declare module go {
         /**Gets or sets the starting point Y coordinate of the PathFigure.*/
         startY: number;
 
+        /**
+        * Add a PathSegment to the segments list.
+        * @param {PathSegment} segment a newly allocated unshared PathSegment that will become owned by this PathFigure
+        * @return {PathFigure} this
+        */
+        add(segment: PathSegment): PathFigure;
+
         /**
         * Create a copy of this PathFigure, with the same values and segments.
         */
         copy(): PathFigure;
+
+        equalsApprox(f: PathFigure): boolean;  // undocumented
     }
 
     /**
     * A PathSegment represents a straight line or curved segment of a path between
-    * two or more points that are part of a PathFigure}.
-    * A PathSegment must not be modified once its containing PathFigure}'s
-    * Geometry} has been assigned to a Shape}.
+    * two or more points that are part of a PathFigure.
+    * A PathSegment must not be modified once its containing PathFigure's
+    * Geometry has been assigned to a Shape.
     */
     class PathSegment {
         /**
@@ -3226,10 +3623,10 @@ declare module go {
         */
         constructor(type: EnumValue, ex?: number, ey?: number, x1?: number, y1?: number, x2?: number, y2?: number, clockwise?: boolean);
 
-        /**Gets or sets the center X value of the Arc for a PathSegment of type #Arc.*/
+        /**Gets or sets the center X value of the Arc for a PathSegment of type .Arc.*/
         centerX: number;
 
-        /**Gets or sets the center Y value of the Arc for a PathSegment of type #Arc.*/
+        /**Gets or sets the center Y value of the Arc for a PathSegment of type .Arc.*/
         centerY: number;
 
         /**Gets or sets the X coordinate of the end point for all kinds of PathSegment.*/
@@ -3238,43 +3635,43 @@ declare module go {
         /**Gets or sets the Y coordinate of the end point for all kinds of PathSegment.*/
         endY: number;
 
-        /**Gets or sets the sweep-flag for a PathSegment of type #SvgArc.*/
+        /**Gets or sets the sweep-flag for a PathSegment of type .SvgArc.*/
         isClockwiseArc: boolean;
 
         /**Gets or sets whether the path is closed after this PathSegment.*/
         isClosed: boolean;
 
-        /**Gets or sets the large-arc-flag for a PathSegment of type #SvgArc.*/
+        /**Gets or sets the large-arc-flag for a PathSegment of type .SvgArc.*/
         isLargeArc: boolean;
 
-        /**Gets or sets the X value of the first control point for a PathSegment of type #Bezier or #QuadraticBezier.*/
+        /**Gets or sets the X value of the first control point for a PathSegment of type .Bezier or .QuadraticBezier.*/
         point1X: number;
 
-        /**Gets or sets the Y value of the first control point for a PathSegment of type #Bezier or #QuadraticBezier.*/
+        /**Gets or sets the Y value of the first control point for a PathSegment of type .Bezier or .QuadraticBezier.*/
         point1Y: number;
 
-        /**Gets or sets the X value of the second control point for a PathSegment of type cubic #Bezier.*/
+        /**Gets or sets the X value of the second control point for a PathSegment of type cubic .Bezier.*/
         point2X: number;
 
-        /**Gets or sets the Y value of the second control point for a PathSegment of type cubic #Bezier.*/
+        /**Gets or sets the Y value of the second control point for a PathSegment of type cubic .Bezier.*/
         point2Y: number;
 
-        /**Gets or sets the X value of the radius for a PathSegment of type #Arc.*/
+        /**Gets or sets the X value of the radius for a PathSegment of type .Arc.*/
         radiusX: number;
 
-        /**Gets or sets the Y value of the radius for a PathSegment of type #Arc.*/
+        /**Gets or sets the Y value of the radius for a PathSegment of type .Arc.*/
         radiusY: number;
 
-        /**Gets or sets the starting angle for a PathSegment of type #Arc.*/
+        /**Gets or sets the starting angle for a PathSegment of type .Arc.*/
         startAngle: number;
 
-        /**Gets or sets the length of angle in degrees, or amount of arc to "sweep" for a PathSegment of type #Arc.*/
+        /**Gets or sets the length of angle in degrees, or amount of arc to "sweep" for a PathSegment of type .Arc.*/
         sweepAngle: number;
 
         /**Gets or sets the type of the PathSegment.*/
         type: EnumValue;
 
-        /**Gets or sets the X-axis rotation for a PathSegment of type #SvgArc.*/
+        /**Gets or sets the X-axis rotation for a PathSegment of type .SvgArc.*/
         xAxisRotation: number;
 
         /**
@@ -3287,23 +3684,25 @@ declare module go {
         */
         copy(): PathSegment;
 
-        /**For drawing an arc segment, a value for PathSegment#type.*/
+        /**For drawing an arc segment, a value for PathSegment.type.*/
         static Arc: EnumValue;
 
-        /**For drawing a cubic bezier segment, a value for PathSegment#type.*/
+        /**For drawing a cubic bezier segment, a value for PathSegment.type.*/
         static Bezier: EnumValue;
 
-        /**For drawing a straight line segment, a value for PathSegment#type.*/
+        /**For drawing a straight line segment, a value for PathSegment.type.*/
         static Line: EnumValue;
 
-        /**For beginning a new subpath, a value for PathSegment#type.*/
+        /**For beginning a new subpath, a value for PathSegment.type.*/
         static Move: EnumValue;
 
-        /**For drawing a quadratic bezier segment, a value for PathSegment#type.*/
+        /**For drawing a quadratic bezier segment, a value for PathSegment.type.*/
         static QuadraticBezier: EnumValue;
 
-        /**For drawing an SVG arc segment, a value for PathSegment#type.*/
+        /**For drawing an SVG arc segment, a value for PathSegment.type.*/
         static SvgArc: EnumValue;
+
+        equalsApprox(s: PathSegment): boolean;  // undocumented
     }
 
     /**
@@ -3341,7 +3740,7 @@ declare module go {
         copy(): Point;
 
         /**
-        * This static method returns the angle in degrees of the line from point P to point Q.
+        * This static function returns the angle in degrees of the line from point P to point Q.
         * @param {number} px
         * @param {number} py
         * @param {number} qx
@@ -3365,7 +3764,7 @@ declare module go {
         directionPoint(p: Point): number;
 
         /**
-        * This static method returns the square of the distance from the point P
+        * This static function returns the square of the distance from the point P
         * to the finite line segment from point A to point B.
         * @param {number} px
         * @param {number} py
@@ -3384,7 +3783,7 @@ declare module go {
         distanceSquared(px: number, py: number): number;
 
         /**
-        * This static method returns the square of the distance from the point P to the point Q.
+        * This static function returns the square of the distance from the point P to the point Q.
         * @param {number} px
         * @param {number} py
         * @param {number} qx
@@ -3432,11 +3831,27 @@ declare module go {
         offset(dx: number, dy: number): Point;
 
         /**
-        * This static method can be used to read in a Point from a string that was produced by Point.stringify.
+        * This static function can be used to read in a Point from a string that was produced by Point.stringify.
         * @param {string} str
         */
         static parse(str: string): Point;
 
+        /**
+        * Modify this point to be the closest point to this point that is on a finite line segment given by (px,py) and (qx,qy).
+        * @param {number} px
+        * @param {number} py
+        * @param {number} qx
+        * @param {number} qy
+        */
+        projectOntoLineSegment(px: number, py: number, qx: number, qy: number): Point;
+
+        /**
+        * Modify this point to be the closest point to this point that is on a finite line segment given by P and Q.
+        * @param {Point} p
+        * @param {Point} q
+        */
+        projectOntoLineSegmentPoint(p: Point, q: Point): Point;
+
         /**
         * Modify this Point so that has been rotated about the origin by the given angle.
         * @param {number} angle an angle in degrees.
@@ -3452,7 +3867,6 @@ declare module go {
 
         /**
         * Modify this Point so that its X and Y values are the same as the given Point.
-        *
         * @param {Point} p the given Point.
         */
         set(p: Point): Point;
@@ -3460,21 +3874,21 @@ declare module go {
         /**
         * Modify this Point so that its X and Y values correspond to a particular Spot
         * in a given Rect.
-        * The result is meaningless if Spot#isNoSpot is true for the given Spot.
+        * The result is meaningless if Spot.isNoSpot is true for the given Spot.
         * @param {Rect} r the Rect for which we are finding the point.
-        * @param {Spot} spot the Spot; Spot#isSpot must be true for this Spot.
+        * @param {Spot} spot the Spot; Spot.isSpot must be true for this Spot.
         */
         setRectSpot(r: Rect, spot: Spot): Point;
 
         /**
         * Modify this Point so that its X and Y values correspond to a particular Spot
         * in a given rectangle.
-        * The result is meaningless if Spot#isNoSpot is true for the given Spot.
+        * The result is meaningless if Spot.isNoSpot is true for the given Spot.
         * @param {number} x The X coordinate of the Rect for which we are finding the point.
         * @param {number} y The Y coordinate of the Rect for which we are finding the point.
         * @param {number} w The Width of the Rect for which we are finding the point.
         * @param {number} h The Height of the Rect for which we are finding the point.
-        * @param {Spot} spot the Spot; Spot#isSpot must be true for this Spot.
+        * @param {Spot} spot the Spot; Spot.isSpot must be true for this Spot.
         */
         setSpot(x: number, y: number, w: number, h: number, spot: Spot): Point;
 
@@ -3486,7 +3900,25 @@ declare module go {
         setTo(x: number, y: number): Point;
 
         /**
-        * This static method can be used to write out a Point as a string that can be read by Point.parse.
+        * Modify this point to be at the nearest point on an infinite grid,
+        * given the grid's origin and size of each grid cell.
+        * @param {number} originx
+        * @param {number} originy
+        * @param {number} cellwidth
+        * @param {number} cellheight
+        */
+        snapToGrid(originx: number, originy: number, cellwidth: number, cellheight: number): Point;
+
+        /**
+        * Modify this point to be at the nearest point on an infinite grid,
+        * given the grid's origin and size of each grid cell.
+        * @param {Point} origin
+        * @param {Size} cellsize
+        */
+        snapToGridPoint(origin: Point, cellsize: Size): Point;
+
+        /**
+        * This static function can be used to write out a Point as a string that can be read by Point.parse.
         * @param {Point} val
         */
         static stringify(val: Point): string;
@@ -3497,6 +3929,8 @@ declare module go {
         * @param {Point} p The Point to subtract from the current Point.
         */
         subtract(p: Point): Point;
+
+        equalsApprox(p: Point): boolean;  // undocumented
     }
 
     /**
@@ -3588,7 +4022,7 @@ declare module go {
         contains(x: number, y: number, w?: number, h?: number): boolean;
 
         /**
-        * This static method indicates whether a Rect contains the given Point/Rect.
+        * This static function indicates whether a Rect contains the given Point/Rect.
         * @param {number} rx The X coordinate of a Rect.
         * @param {number} ry The Y coordinate of a Rect.
         * @param {number} rw The Width of a Rect.
@@ -3671,7 +4105,7 @@ declare module go {
         intersectRect(r: Rect): Rect;
 
         /**
-        * This static method indicates whether a Rect partly or wholly overlaps the given Rect.
+        * This static function indicates whether a Rect partly or wholly overlaps the given Rect.
         * @param {number} rx The X coordinate of a Rect.
         * @param {number} ry The Y coordinate of a Rect.
         * @param {number} rw The Width of a Rect.
@@ -3717,7 +4151,7 @@ declare module go {
         offset(dx: number, dy: number): Rect;
 
         /**
-        * This static method can be used to read in a Rect from a string that was produced by Rect.stringify.
+        * This static function can be used to read in a Rect from a string that was produced by Rect.stringify.
         * @param {string} str
         */
         static parse(str: string): Rect;
@@ -3743,10 +4177,10 @@ declare module go {
         /**
         * Modify this Rect so that a given Spot is at a given (x,y) point using this Rect's size.
         * Return this rectangle for which the spot is at that point, without modifying the size.
-        * The result is meaningless if Spot#isNoSpot is true.
+        * The result is meaningless if Spot.isNoSpot is true.
         * @param {number} x the point where the spot should be.
         * @param {number} y the point where the spot should be.
-        * @param {Spot} spot a Spot; Spot#isSpot must be true.
+        * @param {Spot} spot a Spot; Spot.isSpot must be true.
         */
         setSpot(x: number, y: number, spot: Spot): Rect;
 
@@ -3760,7 +4194,7 @@ declare module go {
         setTo(x: number, y: number, w: number, h: number): Rect;
 
         /**
-        * This static method can be used to write out a Rect as a string that can be read by Rect.parse.
+        * This static function can be used to write out a Rect as a string that can be read by Rect.parse.
         * @param {Rect} val
         */
         static stringify(val: Rect): string;
@@ -3792,6 +4226,8 @@ declare module go {
         * @param {Rect} r The Rect to include in the new bounds.
         */
         unionRect(r: Rect): Rect;
+
+        equalsApprox(r: Rect): boolean;  // undocumented
     }
 
     /**
@@ -3843,7 +4279,7 @@ declare module go {
         isReal(): boolean;
 
         /**
-        * This static method can be used to read in a Size from a string that was produced by Size.stringify.
+        * This static function can be used to read in a Size from a string that was produced by Size.stringify.
         * @param {string} str
         */
         static parse(str: string): Size;
@@ -3862,10 +4298,12 @@ declare module go {
         setTo(w: number, h: number): Size;
 
         /**
-        * This static method can be used to write out a Size as a string that can be read by Size.parse.
+        * This static function can be used to write out a Size as a string that can be read by Size.parse.
         * @param {Size} val
         */
         static stringify(val: Size): string;
+
+        equalsApprox(s: Size): boolean;  // undocumented
     }
 
     /**
@@ -3930,7 +4368,7 @@ declare module go {
         isDefault(): boolean;
 
         /**
-        * True if this is an unspecific special spot, such as Spot#None or one of the sides.
+        * True if this is an unspecific special spot, such as Spot.None or one of the sides.
         */
         isNoSpot(): boolean;
 
@@ -3940,7 +4378,7 @@ declare module go {
         isSide(): boolean;
 
         /**
-        * True if this is a specific spot, not a side nor Spot#None.
+        * True if this is a specific spot, not a side nor Spot.None.
         */
         isSpot(): boolean;
 
@@ -3950,7 +4388,7 @@ declare module go {
         opposite(): Spot;
 
         /**
-        * This static method can be used to read in a Spot from a string that was produced by Spot.stringify.
+        * This static function can be used to read in a Spot from a string that was produced by Spot.stringify.
         * @param {string} str
         */
         static parse(str: string): Spot;
@@ -3971,7 +4409,7 @@ declare module go {
         setTo(x: number, y: number, offx: number, offy: number): Spot;
 
         /**
-        * This static method can be used to write out a Spot as a string that can be read by Spot.parse.
+        * This static function can be used to write out a Spot as a string that can be read by Spot.parse.
         * @param {Spot} val
         */
         static stringify(val: Spot): string;
@@ -3979,7 +4417,7 @@ declare module go {
         /**The set of points on all sides of the bounding rectangle.*/
         static AllSides: Spot;
 
-        /**A synonym for Spot#BottomCenter.*/
+        /**A synonym for Spot.BottomCenter.*/
         static Bottom: Spot;
 
         /**The specific point at the middle of the bottom side of bounding rectangle.*/
@@ -4006,7 +4444,7 @@ declare module go {
         /**Use this value to indicate that the real spot value is inherited from elsewhere.*/
         static Default: Spot;
 
-        /**A synonym for Spot#LeftCenter.*/
+        /**A synonym for Spot.LeftCenter.*/
         static Left: Spot;
 
         /**The specific point at the middle of the left side of bounding rectangle.*/
@@ -4018,16 +4456,16 @@ declare module go {
         /**The set of points at the left side of the bounding rectangle.*/
         static LeftSide: Spot;
 
-        /**A synonym for Spot#BottomCenter.*/
+        /**A synonym for Spot.BottomCenter.*/
         static MiddleBottom: Spot;
 
-        /**A synonym for Spot#LeftCenter.*/
+        /**A synonym for Spot.LeftCenter.*/
         static MiddleLeft: Spot;
 
-        /**A synonym for Spot#RightCenter.*/
+        /**A synonym for Spot.RightCenter.*/
         static MiddleRight: Spot;
 
-        /**A synonym for Spot#TopCenter.*/
+        /**A synonym for Spot.TopCenter.*/
         static MiddleTop: Spot;
 
         /**Use this Spot value to indicate no particular spot -- code looking for a particular point on an element will need to do their own calculations to determine the desired point depending on the circumstances.*/
@@ -4045,7 +4483,7 @@ declare module go {
         /**The set of points on all sides of the bounding rectangle except top side.*/
         static NotTopSide: Spot;
 
-        /**A synonym for Spot#RightCenter.*/
+        /**A synonym for Spot.RightCenter.*/
         static Right: Spot;
 
         /**The specific point at the middle of the right side of bounding rectangle.*/
@@ -4054,7 +4492,7 @@ declare module go {
         /**The set of points at the right side of the bounding rectangle.*/
         static RightSide: Spot;
 
-        /**A synonym for Spot#TopCenter.*/
+        /**A synonym for Spot.TopCenter.*/
         static Top: Spot;
 
         /**The set of points at the top or bottom sides of the bounding rectangle.*/
@@ -4081,7 +4519,7 @@ declare module go {
 
 
     /**
-    * A Binding describes how to automatically set a property on a GraphObject}
+    * A Binding describes how to automatically set a property on a GraphObject
     * to a value of a property of data in the model.
     * The target property name and the data source property name are strings.
     * All name matching is case-sensitive.
@@ -4098,59 +4536,131 @@ declare module go {
         * @param {function(*,*=) | null=} conv A function converting the data property value to the value to set the target property.
         *   If the function is null or not supplied, no conversion takes place.
         */
-        constructor(targetprop?: string, sourceprop?: string, conv?: (a: any, b?: any) => any);
+        constructor(targetprop?: string, sourceprop?: string, conv?: (a: any, b: any) => any);
 
-        /**Gets or sets a converter function to apply to the GraphObject property value in order to produce the value to set to a data property.*/
-        backConverter: (a: any, b?: any) => any;
+        /**
+        * Gets or sets a converter function to apply to the GraphObject property value
+        * in order to produce the value to set to a data property.
+        * This conversion function is only used in a TwoWay binding,
+        * when transferring a value from the target to the source.
+        * The default value is null -- no conversion takes place.
+        * Otherwise the value should be a function that takes one or two arguments
+        * and returns the desired value.
+        * However, the return value is ignored when the .sourceProperty
+        * is the empty string.
+        * The function is passed the value from the target
+        * (the first argument) and the source Panel.data object (the second argument).
+        * If the .sourceProperty is a property name, that property is set to
+        * the function's return value.
+        * If the .sourceProperty is the empty string, the function should
+        * modify the second argument, which will be the source data object.
+        */
+        backConverter: (a: any, b: any) => any;
 
-        /**Gets or sets a converter function to apply to the data property value in order to produce the value to set to the target property.*/
-        converter: (a: any, b?: any) => any;
+        /**
+        * Gets or sets a converter function to apply to the data property value
+        * in order to produce the value to set to the target property.
+        * This conversion function is used in both OneWay and TwoWay bindings,
+        * when transferring a value from the source to the target.
+        * The default value is null -- no conversion takes place.
+        * Otherwise the value should be a function that takes one or two arguments
+        * and returns the desired value.
+        * However, the return value is ignored when the .targetProperty
+        * is the empty string.
+        * The function is passed the value from the source
+        * (the first argument) and the target GraphObject (the second argument).
+        * If the .targetProperty is a property name, that property is set to
+        * the function's return value.
+        * If the .targetProperty is the empty string, the function should
+        * modify the second argument, which will be the target object.
+        */
+        converter: (a: any, b: any) => any;
 
-        /**Gets or sets the directions and frequency in which the binding may be evaluated.*/
+        /**
+        * Gets or sets the directions and frequency in which the binding may be evaluated.
+        * The default value is Binding.OneWay.
+        * Binding.TwoWay is the other choice.
+        * Use OneWay bindings to initialize GraphObject properties based on model data,
+        * or to modify GraphObject properties when the model data changes will a call to Model.setDataProperty.
+        * Use TwoWay bindings to keep model data in sync with changes to GraphObject properties.
+        * For efficiency, avoid TwoWay bindings on GraphObject properties that do not change value in your app.
+        * You should not have a TwoWay binding on a node data object's key property.
+        */
         mode: EnumValue;
 
-        /**Gets or sets the name of the GraphObject that should act as a source object whose property should be gotten by this data binding.*/
+        /**
+        * Gets or sets the name of the GraphObject that should act as a source object
+        * whose property should be gotten by this data binding.
+        * The default value is null, which uses the bound Panel.data as the source.
+        * If the value is a string, it should be the name of a GraphObject in the
+        * visual tree of the Panel that is bound to the data.
+        * Use the empty string to refer to the root panel.
+        */
         sourceName: string;
 
-        /**Gets or sets the name of the property to get from the bound data object, the value of Panel#data.*/
+        /**
+        * Gets or sets the name of the property to get from the bound data object,
+        * the value of Panel.data.
+        * The default value is the empty string, which results in setting the target
+        * property to the whole data object, rather than to a property value of the data object.
+        */
         sourceProperty: string;
 
-        /**Gets or sets the name of the property to be set on the target GraphObject.*/
+        /**
+        * Gets or sets the name of the property to be set on the target GraphObject.
+        * The default value is the empty string; you normally set this to be the name of a property.
+        */
         targetProperty: string;
 
         /**
-        * Modify this Binding to set its #mode to be Binding#TwoWay, and
+        * Modify this Binding to set its .mode to be Binding.TwoWay, and
         * provide an optional conversion function to convert GraphObject property
         * values back to data values.
-        *
+        * Use TwoWay bindings to keep model data in sync with changes to GraphObject properties.
+        * For efficiency, avoid TwoWay bindings on GraphObject properties that do not change value in your app.
         * You should not have a TwoWay binding on a node data object's key property.
         * @param {function(*,*=) | null=} backconv
         */
-        makeTwoWay(backconv?: (a: any, b?: any) => any): Binding;
+        makeTwoWay(backconv?: (a: any, b: any) => any): Binding;
 
         /**
-        * Modify this Binding to set its #sourceName property so as to identify
+        * Modify this Binding to set its .sourceName property so as to identify
         * a GraphObject in the visual tree of the bound Panel.
-        * @param {string=} srcname the GraphObject#name of an element in the visual tree of the bound Panel;
+        * @param {string=} srcname the GraphObject.name of an element in the visual tree of the bound Panel;
         * use an empty string to refer to the root panel of that visual tree.
         */
         ofObject(srcname?: string): Binding;
 
         /**
-        * This static method can be used to create a function that parses a string into an enumerated value, given the class that the enumeration values are defined on and a default value if the string cannot be parsed successfully.
+        * This static function can be used to create a function that parses
+        * a string into an enumerated value, given the class that the enumeration values
+        * are defined on and a default value if the string cannot be parsed successfully.
+        * The normal usage is to pass the result of this function as the conversion function of a Binding.
+        * This binding will try to parse the string that is the value of the bound data's "dataPropName" property.
+        * If it is a legitimate enumerated value defined on the Link class, the conversion
+        * function will return that value.
+        * If the bound data's "dataPropName" property is not present or has an unrecognized value,
+        * the Link.routing property gets the default value, Link.Normal.
+        * @param {function()} ctor the class constructor that defines the enumerated values that are being parsed.
+        * @param {EnumValue} defval the default enumerated value to return if it fails to parse the given string.
         */
-        static parseEnum(ctor: new(...args: any[]) => Object, defval: EnumValue): (a: string) => EnumValue;
+        static parseEnum(ctor: Constructor, defval: EnumValue): (a: string) => EnumValue;
 
         /**
-        * This static method can be used to convert an object to a string, looking for commonly defined data properties, such as "text", "name", "key", or "id".
+        * This static function can be used to convert an object to a string,
+        * looking for commonly defined data properties, such as "text", "name", "key", or "id".
+        * If none are found, this just calls toString() on it.
+        * @param {*} val
         */
         static toString(val: any): string;
 
-        /**This value for Binding#mode uses data source values and sets GraphObject properties.*/
+        /**This value for Binding.mode uses data source values and sets GraphObject properties.*/
         static OneWay: EnumValue;
 
-        /**This value for Binding#mode uses data source values and GraphObject properties and keeps them in sync.*/
+        /**This value for Binding.mode uses data source values and GraphObject properties and keeps them in sync.*/
         static TwoWay: EnumValue;
+
+        ofModel(): Binding;  // undocumented
     }
 
     /**
@@ -4158,8 +4668,8 @@ declare module go {
     * but also for model data, a Model, or a Diagram.
     * The most common case is for remembering the name of a property
     * and the before-and-after values for that property.
-    * You can listen for changed events on the model using Model#addChangedListener
-    * and on the Diagram using Diagram#addChangedListener.
+    * You can listen for changed events on the model using Model.addChangedListener
+    * and on the Diagram using Diagram.addChangedListener.
     */
     class ChangedEvent {
         /**
@@ -4173,10 +4683,13 @@ declare module go {
         /**Gets or sets the Diagram that was modified.*/
         diagram: Diagram;
 
+        /**This read-only property is true when this ChangeEvent is of type ChangedEvent.Transaction and represents the end of a transactional change.*/
+        isTransactionFinished: boolean;
+
         /**Gets or sets the Model or TreeModel or GraphLinksModel that was modified.*/
         model: Model;
 
-        /**Gets the name of the model change, reflecting a change to model data in addition to a change to the model itself.*/
+        /**This read-only property returns the name of the model change, reflecting a change to model data in addition to a change to the model itself.*/
         modelChange: string;
 
         /**Gets or sets an optional value associated with the new value.*/
@@ -4186,7 +4699,7 @@ declare module go {
         newValue: any;
 
         /**Gets or sets the Object that was modified.*/
-        object: Object;
+        object: any;
 
         /**Gets or sets an optional value associated with the old value.*/
         oldParam: any;
@@ -4195,7 +4708,7 @@ declare module go {
         oldValue: any;
 
         /**Gets or sets the name of the property change.*/
-        propertyName: any;
+        propertyName: PropertyAccessor;
 
         /**
         * This predicate returns true if you can call redo().
@@ -4210,7 +4723,7 @@ declare module go {
         /**
         * Forget any object references that this ChangedEvent may have.
         */
-        clear();
+        clear(): void;
 
         /**
         * Make a copy of this ChangedEvent.
@@ -4234,23 +4747,23 @@ declare module go {
         /**
         * Re-perform this object change after an undo().
         */
-        redo();
+        redo(): void;
 
         /**
         * Reverse the effects of this object change.
         */
-        undo();
+        undo(): void;
 
-        /**For inserting into collections, and used as the value for ChangedEvent#change.*/
+        /**For inserting into collections, and used as the value for ChangedEvent.change.*/
         static Insert: EnumValue;
 
-        /**For simple property changes, and used as the value for ChangedEvent#change.*/
+        /**For simple property changes, and used as the value for ChangedEvent.change.*/
         static Property: EnumValue;
 
-        /**For removing from collections, and used as the value for ChangedEvent#change.*/
+        /**For removing from collections, and used as the value for ChangedEvent.change.*/
         static Remove: EnumValue;
 
-        /**For informational events, such as transactions and undo/redo operations, and used as the value for ChangedEvent#change.*/
+        /**For informational events, such as transactions and undo/redo operations, and used as the value for ChangedEvent.change.*/
         static Transaction: EnumValue;
     }
 
@@ -4263,22 +4776,41 @@ declare module go {
     */
     class GraphLinksModel extends Model {
         /**
-        * This constructs an empty GraphLinksModel unless one provides arguments as the initial data array values for the Model#nodeDataArray and GraphLinksModel#linkDataArray properties.
-        * @param {Array=} nodedataarray an optional Array containing JavaScript objects to be represented by Nodes.
-        * @param {Array=} linkdataarray an optional Array containing JavaScript objects to be represented by Links.
+        * This constructs an empty GraphLinksModel unless one provides arguments as the initial data array values for the Model.nodeDataArray and GraphLinksModel.linkDataArray properties.
+        * @param {Array<Object>=} nodedataarray an optional Array containing JavaScript objects to be represented by Nodes.
+        * @param {Array<Object>=} linkdataarray an optional Array containing JavaScript objects to be represented by Links.
         */
         constructor(nodedataarray?: Array<Object>, linkdataarray?: Array<Object>);
 
-        /**Gets or sets a data object that will be copied and added to the model as a new node data each time there is a link reference (either the "to" or the "from" of a link data) to a node key that does not yet exist in the model.*/
+        /**
+        * Gets or sets a data object that will be copied and added to the model as a new node data each time there
+        * is a link reference (either the "to" or the "from" of a link data) to a node key that does not yet exist in the model.
+        * The default value is null -- node data is not automatically copied and added to the model
+        * when there is an unresolved reference in a link data.
+        * When adding or modifying a link data if there is a "from" or "to" key value for which Model.findNodeDataForKey returns null,
+        * it will call Model.copyNodeData on this property value and Model.addNodeData on the result.
+        */
         archetypeNodeData: Object;
 
-        /**Gets or sets a function that makes a copy of a link data object.*/
+        /**
+        * Gets or sets a function that makes a copy of a link data object.
+        * You may need to set this property in order to ensure that a copied Link is bound
+        * to data that does not share certain data structures between the original link data and the copied link data.
+        * The value may be null in order to cause .copyLinkData to make a shallow copy of a JavaScript Object.
+        * The default value is null.
+        */
         copyLinkDataFunction: (obj: Object, model: GraphLinksModel) => Object;
 
-        /**Gets or sets the name of the data property that returns a string describing that data's category, or a function that takes a link data object and returns that category string; the default value is the name 'category'.*/
-        linkCategoryProperty: any;
+        /**
+        * Gets or sets the name of the data property that returns a string naming that data's category,
+        * or a function that takes a link data object and returns that category string;
+        * the default value is the name 'category'.
+        * This is used by the diagram to distinguish between different kinds of links.
+        * The name must not be null.
+        */
+        linkCategoryProperty: PropertyAccessor;
 
-        /**Gets or sets the array of link data objects that correspond to Links in the Diagram.*/
+        /**Gets or sets the array of link data objects that correspond to Links in the Diagram; the initial value is an empty Array.*/
         linkDataArray: Array<Object>;
 
         /**
@@ -4288,50 +4820,94 @@ declare module go {
         * the default value is the name 'from'.
         * The name must not be null.
         * If the value is an empty string,
-        * #getFromKeyForLinkData will return undefined for all link data objects.
+        * .getFromKeyForLinkData will return undefined for all link data objects.
         */
-        linkFromKeyProperty: any;
+        linkFromKeyProperty: PropertyAccessor;
 
-        /**Gets or sets the name of the data property that returns the optional parameter naming a "port" element on the node that the link data is connected from, or a function that takes a link data object and returns that string.*/
-        linkFromPortIdProperty: any;
+        /**
+        * Gets or sets the name of the data property that returns the optional parameter naming a "port" element on the node that the link data is connected from,
+        * or a function that takes a link data object and returns that string.
+        * The default value is the empty string indicating that one cannot distinguish
+        * different logical connection points for any links.
+        * The name must not be null.
+        */
+        linkFromPortIdProperty: PropertyAccessor;
 
-        /**Gets or sets the name of the data property that returns an array of keys of node data that are labels on that link data, or a function that takes a link data object and returns such an array; the default value is the empty string: ''.*/
-        linkLabelKeysProperty: any;
+        /**
+        * Gets or sets the name of the data property that returns
+        * an array of keys of node data that are labels on that link data,
+        * or a function that takes a link data object and returns such an array;
+        * the default value is the empty string: ''.
+        * The name must not be null.
+        * If the value is an empty string,
+        * .getLabelKeysForLinkData will return an empty array for all link data objects.
+        * You will need to set this property in order to support nodes as link labels.
+        */
+        linkLabelKeysProperty: PropertyAccessor;
 
-        /**Gets or sets the name of the data property that returns the key of the node data that the link data is going to, or a function that takes a link data object and returns that key; the default value is the name 'to'.*/
-        linkToKeyProperty: any;
+        /**
+        * Gets or sets the name of the data property that returns
+        * the key of the node data that the link data is going to,
+        * or a function that takes a link data object and returns that key;
+        * the default value is the name 'to'.
+        * The name must not be null.
+        */
+        linkToKeyProperty: PropertyAccessor;
 
-        /**Gets or sets the name of the data property that returns the optional parameter naming a "port" element on the node that the link data is connected to, or a function that takes a link data object and returns that string.*/
-        linkToPortIdProperty: any;
+        /**
+        * Gets or sets the name of the data property that returns
+        * the optional parameter naming a "port" element on the node that the link data is connected to,
+        * or a function that takes a link data object and returns that string.
+        * The default value is the empty string indicating that one cannot distinguish
+        * different logical connection points for any links.
+        * The name must not be null.
+        */
+        linkToPortIdProperty: PropertyAccessor;
 
-        /**Gets or sets the name of the property on node data that specifies the string or number key of the group data that "owns" that node data, or a function that takes a node data object and returns that group key.*/
-        nodeGroupKeyProperty: any;
+        /**
+        * Gets or sets the name of the property on node data that specifies
+        * the string or number key of the group data that "owns" that node data,
+        * or a function that takes a node data object and returns that group key.
+        * the default value is the name 'group'.
+        * The value must not be null.
+        */
+        nodeGroupKeyProperty: PropertyAccessor;
 
-        /**Gets or sets the name of the boolean property on node data that indicates whether the data should be represented as a group of nodes and links or as a simple node, or a function that takes a node data object and returns true or false; the default value is the name 'isGroup'.*/
-        nodeIsGroupProperty: any;
-
-        /**Gets or sets the name of the boolean property on node data that indicates whether the data should be represented as a node acting as a label on a link instead of being a regular node, or a function that takes a node data object and returns true or false; the default value is the empty string: ''.*/
-        nodeIsLinkLabelProperty: any;
+        /**
+        * Gets or sets the name of the boolean property on node data that indicates
+        * whether the data should be represented as a group of nodes and links or
+        * as a simple node,
+        * or a function that takes a node data object and returns true or false;
+        * the default value is the name 'isGroup'.
+        * The value must not be null.
+        */
+        nodeIsGroupProperty: PropertyAccessor;
 
         /**
         * Adds a node key value that identifies a node data acting as a new label node on the given link data.
-        * This method only works if #linkLabelKeysProperty has been set to something other than an empty string.
+        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
         * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {number|string} key a number or string that is the key of the new label node.
+        * @param {string|number} key a number or string that is the key of the new label node.
         */
-        addLabelKeyForLinkData(linkdata: Object, key: any);
+        addLabelKeyForLinkData(linkdata: Object, key: Key): void;
 
         /**
         * When you want to add a link to the diagram, call this method with a new data object.
-        * This will add that data to the #linkDataArray and
+        * This will add that data to the .linkDataArray and
         * notify all listeners that a new link data object has been inserted into the collection.
         * Presumably the link data object will already have its "from" and "to" node key references set,
         * but it is also possible to set them after the link data is in the model
-        * by calling #setFromKeyForLinkData and #setToKeyForLinkData.
-        * This operation does nothing if the link data is already part of this model's #linkDataArray.
+        * by calling .setFromKeyForLinkData and .setToKeyForLinkData.
+        * This operation does nothing if the link data is already part of this model's .linkDataArray.
         * @param {Object} linkdata a JavaScript object representing a link.
         */
-        addLinkData(linkdata: Object);
+        addLinkData(linkdata: Object): void;
+
+        /**
+        * Add to this model all of the link data held in an Array or in an Iterable of link data objects.
+        * @param {Iterable<Object>|Array<Object>} coll a collection of link data objects to add to the .linkDataArray
+        */
+        addLinkDataCollection(coll: Iterable<Object> | Array<Object>): void;
 
         /**
         * Decide if a given link data is in this model.
@@ -4340,11 +4916,13 @@ declare module go {
         containsLinkData(linkdata: Object): boolean;
 
         /**
-        * Gets or sets a function that makes a copy of a link data object.
-        * You may need to set this property in order to ensure that a copied Link is bound
-        * to data that does not share certain data structures between the original link data and the copied link data.
-        * The value may be null in order to cause #copyLinkData to make a shallow copy of a JavaScript Object.
-        * The default value is null.
+        * Make a copy of a link data object.
+        * This uses the value of .copyLinkDataFunction to actually perform the copy,
+        * unless it is null, in which case this method just makes a shallow copy of the JavaScript Object.
+        * This does not modify the model -- the returned data object is not added to this model.
+        * This assumes that the data's constructor can be called with no arguments.
+        * This also makes sure there is no reference to either the "from" or the "to" node of the original data.
+        * @param {Object} linkdata a JavaScript object representing a link.
         */
         copyLinkData(linkdata: Object): Object;
 
@@ -4360,7 +4938,7 @@ declare module go {
         * from which this link is connected.
         * @param {Object} linkdata a JavaScript object representing a link.
         */
-        getFromKeyForLinkData(linkdata: Object): any;
+        getFromKeyForLinkData(linkdata: Object): Key;
 
         /**
         * From a link data retrieve a value identifying the port object of the node
@@ -4373,21 +4951,21 @@ declare module go {
         * If there is a container group for the given node data, return the group's key.
         * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
         */
-        getGroupKeyForNodeData(nodedata: Object): any;
+        getGroupKeyForNodeData(nodedata: Object): Key;
 
         /**
         * Gets an Array of node key values that identify node data acting as labels on the given link data.
-        * This method only works if #linkLabelKeysProperty has been set to something other than an empty string.
+        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
         * @param {Object} linkdata a JavaScript object representing a link.
         */
-        getLabelKeysForLinkData(linkdata: Object): Array<any>;
+        getLabelKeysForLinkData(linkdata: Object): Array<Key>;
 
         /**
         * From a link data retrieve a value uniquely identifying the node data
         * to which this link is connected.
         * @param {Object} linkdata a JavaScript object representing a link.
         */
-        getToKeyForLinkData(linkdata: Object): any;
+        getToKeyForLinkData(linkdata: Object): Key;
 
         /**
         * From a link data retrieve a value identifying the port object of the node
@@ -4404,55 +4982,52 @@ declare module go {
         */
         isGroupForNodeData(nodedata: Object): boolean;
 
-        /**
-        * See if the given node data should act as a label on a link, in order to support
-        * the appearance and behavior of having links connected to links.
-        * This value must not change as long as the node data is part of the model.
-        * At the current time there is no <code>setIsLinkLabelForNodeData</code> method.
-        * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        */
-        isLinkLabelForNodeData(nodedata: Object): boolean;
-
         /**
         * Removes a node key value that identifies a node data acting as a former label node on the given link data.
         * Removing a reference to a node data from the collection of link label keys
         * does not automatically remove any node data from the model.
-        * This method only works if #linkLabelKeysProperty has been set to something other than an empty string.
+        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
         * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {number|string} key a number or string that is the key of the label node being removed from the link.
+        * @param {string|number} key a number or string that is the key of the label node being removed from the link.
         */
-        removeLabelKeyForLinkData(linkdata: Object, key: any);
+        removeLabelKeyForLinkData(linkdata: Object, key: Key): void;
 
         /**
         * When you want to remove a link from the diagram, call this method with an existing link data object.
-        * This will remove that data from the #linkDataArray and
+        * This will remove that data from the .linkDataArray and
         * notify all listeners that a link data object has been removed from the collection.
         * Removing a link data from a model does not automatically remove
         * any associated label node data from the model.
-        * This operation does nothing if the link data is not present in the #linkDataArray.
+        * This operation does nothing if the link data is not present in the .linkDataArray.
         * @param {Object} linkdata a JavaScript object representing a link.
         */
-        removeLinkData(linkdata: Object);
+        removeLinkData(linkdata: Object): void;
+
+        /**
+        * Remove from this model all of the link data held in an Array or in an Iterable of link data objects.
+        * @param {Iterable<Object>|Array<Object>} coll a collection of link data objects to remove from the .linkDataArray
+        */
+        removeLinkDataCollection(coll: Iterable<Object> | Array<Object>): void;
 
         /**
         * Change the category of a given link data, a string naming the link template
         * that the Diagram should use to represent the link data.
         * Changing the link template for a link data will cause the existing Link
-        * to be removed from the Diagram} and replaced with a new Link
+        * to be removed from the Diagram and be replaced with a new Link
         * created by copying the new link template and applying any data-bindings.
         * @param {Object} linkdata a JavaScript object representing a link.
         * @param {string} cat Must not be null.
         */
-        setCategoryForLinkData(linkdata: Object, cat: string);
+        setCategoryForLinkData(linkdata: Object, cat: string): void;
 
         /**
         * Change the node key that the given link data references as the
         * source of the link.
         * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {number|string|undefined} key This may be undefined if
+        * @param {string|number|undefined} key This may be undefined if
         * the link should no longer come from any node.
         */
-        setFromKeyForLinkData(linkdata: Object, key: any);
+        setFromKeyForLinkData(linkdata: Object, key: Key): void;
 
         /**
         * Change the information that the given link data uses to identify the
@@ -4461,31 +5036,31 @@ declare module go {
         * @param {string} portname This may be the empty string if
         * the link should no longer be associated with any particular "port".
         */
-        setFromPortIdForLinkData(linkdata: Object, portname: string);
+        setFromPortIdForLinkData(linkdata: Object, portname: string): void;
 
         /**
         * Change the container group for the given node data, given a key for the new group.
         * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        * @param {number|string|undefined} key This may be undefined if there should be no containing group data.
+        * @param {string|number|undefined} key This may be undefined if there should be no containing group data.
         */
-        setGroupKeyForNodeData(nodedata: Object, key: any);
+        setGroupKeyForNodeData(nodedata: Object, key: Key): void;
 
         /**
         * Replaces an Array of node key values that identify node data acting as labels on the given link data.
-        * This method only works if #linkLabelKeysProperty has been set to something other than an empty string.
+        * This method only works if .linkLabelKeysProperty has been set to something other than an empty string.
         * @param {Object} linkdata a JavaScript object representing a link.
         * @param arr an Array of node keys; an empty Array if the property was not present.
         */
-        setLabelKeysForLinkData(linkdata: Object, arr: Array<any>);
+        setLabelKeysForLinkData(linkdata: Object, arr: Array<Key>): void;
 
         /**
         * Change the node key that the given link data references as the
         * destination of the link.
         * @param {Object} linkdata a JavaScript object representing a link.
-        * @param {number|string|undefined} key This may be undefined if
+        * @param {string|number|undefined} key This may be undefined if
         * the link should no longer go to any node.
         */
-        setToKeyForLinkData(linkdata: Object, key: any);
+        setToKeyForLinkData(linkdata: Object, key: Key): void;
 
         /**
         * Change the information that the given link data uses to identify the
@@ -4494,7 +5069,7 @@ declare module go {
         * @param {string} portname This may be the empty string if
         * the link should no longer be associated with any particular "port".
         */
-        setToPortIdForLinkData(linkdata: Object, portname: string);
+        setToPortIdForLinkData(linkdata: Object, portname: string): void;
     }
 
     /*
@@ -4505,76 +5080,95 @@ declare module go {
     class Model {
         /**
         * You probably don't want to call this constructor, because this class does not support links (relationships between nodes) or groups (nodes and links and subgraphs as nodes): instead, create instances of a subclass such as GraphLinksModel or TreeModel.
-        * @param {Array=} nodedataarray an optional Array containing JavaScript objects to be represented by Parts.
+        * @param {Array<Object>=} nodedataarray an optional Array containing JavaScript objects to be represented by Parts.
         */
         constructor(nodedataarray?: Array<Object>);
 
-        /**Gets or sets a function that makes a copy of a node data object.*/
+        /**Gets or sets whether the default behavior for copyNodeData makes copies of property values that are Arrays.*/
+        copiesArrays: boolean;
+
+        /**Gets or sets whether the default behavior for copyNodeData when copying Arrays also copies array items that are Objects.*/
+        copiesArrayObjects: boolean;
+
+        /**Gets or sets a function that makes a copy of a node data object; the default value is null, resulting in the standard behavior which is to make a shallow copy of the object.*/
         copyNodeDataFunction: (obj: Object, model: Model) => Object;
 
-        /**Gets or sets the name of the format of the diagram data.*/
+        /**Gets or sets the name of the format of the diagram data; the default value is the empty string.*/
         dataFormat: string;
 
-        /**Gets or sets whether this model may be modified, such as adding nodes.*/
+        /**Gets or sets whether this model may be modified, such as adding nodes; by default this value is false.*/
         isReadOnly: boolean;
 
-        /**Gets or sets a function that returns a unique id number or string for a node data object.*/
-        makeUniqueKeyFunction: (model: Model, obj:Object) => any;
+        /**Gets or sets a function that returns a unique id number or string for a node data object; the default value is null.*/
+        makeUniqueKeyFunction: (model: Model, obj: Object) => Key;
 
-        /**Gets or sets the name of this model.*/
+        /**Gets a JavaScript Object that can hold programmer-defined property values for the model as a whole, rather than just for one node or one link; by default this is an object with no properties.*/
+        modelData: any;
+
+        /**Gets or sets the name of this model; the initial name is an empty string.*/
         name: string;
 
-        /**Gets or sets the name of the node data property that returns a string describing that data's category, or a function that takes a node data object and returns the category name; the default value is the name 'category'.*/
-        nodeCategoryProperty: any;
+        /**Gets or sets the name of the node data property that returns a string naming that data's category, or a function that takes a node data object and returns the category name; the default value is the name 'category'.*/
+        nodeCategoryProperty: PropertyAccessor;
 
-        /**Gets or sets the array of node data objects that correspond to Nodes, Groups, or non-Link Parts in the Diagram.*/
+        /**Gets or sets the array of node data objects that correspond to Nodes, Groups, or non-Link Parts in the Diagram; the initial value is an empty Array.*/
         nodeDataArray: Array<Object>;
 
         /**Gets or sets the name of the data property that returns a unique id number or string for each node data object, or a function taking a node data object and returning the key value; the default value is the name 'key'.*/
-        nodeKeyProperty: any;
+        nodeKeyProperty: PropertyAccessor;
 
-        /**Gets or sets whether ChangedEvents are not recorded by the UndoManager.*/
+        /**Gets or sets whether ChangedEvents are not recorded by the UndoManager; the initial and normal value is false.*/
         skipsUndoManager: boolean;
 
-        /**Gets or sets the UndoManager for this Model.*/
+        /**Gets or sets the UndoManager for this Model; the default UndoManager has its UndoManager.isEnabled property set to false.*/
         undoManager: UndoManager;
 
         /**
-        * Add an item at the end of a data array that may be data bound by a Panel as its Panel#itemArray,
+        * Add an item at the end of a data array that may be data bound by a Panel as its Panel.itemArray,
         * in a manner that can be undone/redone and that automatically updates any bindings.
-        * This also calls #raiseChangedEvent to notify all listeners about the ChangedEvent#Insert.
-        * If you want to add a new node or part to the diagram, call #addNodeData.
-        * @param {Array} arr an Array that is the value of some Panel's Panel#itemArray.
+        * This also calls .raiseChangedEvent to notify all listeners about the ChangedEvent.Insert.
+        * If you want to add a new node or part to the diagram, call .addNodeData.
+        * @param {Array<*>} arr an Array that is the value of some Panel's Panel.itemArray.
         * @param {*} val the new value to be pushed onto the array.
         */
-        addArrayItem(arr: any[], val: any);
+        addArrayItem(arr: Array<any>, val: any): void;
 
         /**
         * Register an event handler that is called when there is a ChangedEvent.
         * This registration does not raise a ChangedEvent.
         * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
         */
-        addChangedListener(listener: (e: ChangedEvent)=>void);
+        addChangedListener(listener: (e: ChangedEvent) => void ): void;
 
         /**
         * When you want to add a node or group to the diagram,
         * call this method with a new data object.
-        * This will add that data to the #nodeDataArray and
+        * This will add that data to the .nodeDataArray and
         * notify all listeners that a new node data object has been inserted into the collection.
-        * To remove a node from the diagram, you can remove its data object by calling #removeNodeData.
-        * To add or remove an object or value from an item array, call #insertArrayItem or #removeArrayItem.
+        * To remove a node from the diagram, you can remove its data object by calling .removeNodeData.
+        * To add or remove an object or value from an item array, call .insertArrayItem or .removeArrayItem.
         * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
         */
-        addNodeData(nodedata: Object);
+        addNodeData(nodedata: Object): void;
+
+        /**
+        * Add to this model all of the node data held in an Array or in an Iterable of node data objects.
+        * @param {Iterable<Object>|Array<Object>} coll a collection of node data objects to add to the .nodeDataArray
+        */
+        addNodeDataCollection(coll: Iterable<Object> | Array<Object>): void;
 
         /**
         * Clear out all references to any model data.
+        * This also clears out the UndoManager, so this operation is not undoable.
+        * This method is called by Diagram.clear; it does not notify any Diagrams or other listeners.
+        * Instead of calling this method, you may prefer to set .nodeDataArray to an empty JavaScript Array.
+        * If this model is a GraphLinksModel, you would also want to set GraphLinksModel.linkDataArray to a separate empty JavaScript Array.
         */
-        clear();
+        clear(): void;
 
         /**
         * Commit the changes of the current transaction.
-        * This just calls UndoManager#commitTransaction.
+        * This just calls UndoManager.commitTransaction.
         * @param {string} tname a descriptive name for the transaction.
         */
         commitTransaction(tname: string): boolean;
@@ -4587,7 +5181,7 @@ declare module go {
 
         /**
         * Make a copy of a node data object.
-        * This uses the value of #copyNodeDataFunction to actually perform the copy,
+        * This uses the value of .copyNodeDataFunction to actually perform the copy,
         * unless it is null, in which case this method just makes a shallow copy of the JavaScript Object.
         * This does not modify the model -- the returned data object is not added to this model.
         * This assumes that the data's constructor can be called with no arguments.
@@ -4600,14 +5194,17 @@ declare module go {
         * that uses the given value as its unique key.
         * @param {*} key a string or a number.
         */
-        findNodeDataForKey(key: any): Object;
+        findNodeDataForKey(key: Key): any;
 
         /**
-        * This static method parses a string in JSON format and constructs, initializes, and returns a model.
-        * @param {string|Object} s a String in JSON format containing all of the persistent properties of the model, or an Object already read from JSON text.
+        * This static function parses a string in JSON format and constructs, initializes, and returns a model.
+        * Note that properties with values that are functions are not written out by .toJson,
+        * so reading in such a model will require constructing such a model, initializing its functional property values,
+        * and explicitly passing it in as the second argument.
+        * @param {string} s a String in JSON format containing all of the persistent properties of the model, or an Object already read from JSON text.
         * @param {model=} model an optional model to be modified; if not supplied, it constructs and returns a new model whose name is specified by the "class" property.
         */
-        static fromJson(s: any, model?: Model): Model;
+        static fromJson(s: string | Object, model?: Model): Model;
 
         /**
         * Find the category of a given node data, a string naming the node template
@@ -4619,41 +5216,42 @@ declare module go {
 
         /**
         * Given a node data object return its unique key: a number or a string.
-        * It is possible to change the key for a node data object by calling #setKeyForNodeData.
+        * This returns undefined if there is no key value.
+        * It is possible to change the key for a node data object by calling .setKeyForNodeData.
         * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
         */
-        getKeyForNodeData(nodedata: Object): any;
+        getKeyForNodeData(nodedata: Object): Key;
 
         /**
-        * Add an item to a data array that may be data bound by a Panel as its Panel#itemArray,
+        * Add an item to a data array that may be data bound by a Panel as its Panel.itemArray,
         * given a new data value and the index at which to insert the new value, in a manner that can be undone/redone and that automatically updates any bindings.
-        * This also calls #raiseChangedEvent to notify all listeners about the ChangedEvent#Insert.
-        * If you want to add a new node or part to the diagram, call #addNodeData.
-        * @param {Array} arr an Array that is the value of some Panel's Panel#itemArray.
+        * This also calls .raiseChangedEvent to notify all listeners about the ChangedEvent.Insert.
+        * If you want to add a new node or part to the diagram, call .addNodeData.
+        * @param Array<*> arr an Array that is the value of some Panel's Panel.itemArray.
         * @param {number} idx the zero-based array index where the new value will be inserted; use -1 to push the new value on the end of the array.
         * @param {*} val the new value to be inserted into the array.
         */
-        insertArrayItem(arr: any[], idx: number, val: any);
+        insertArrayItem(arr: Array<any>, idx: number, val: any): void;
 
         /**
         * This method is called when a node data object is added to the model to make sure that
-        * #getKeyForNodeData returns a unique key value.
+        * .getKeyForNodeData returns a unique key value.
         * The key value should be unique within the set of data managed by this model:
-        * #nodeDataArray.
+        * .nodeDataArray.
         * If the key is already in use, this will assign an unused number to the
-        * #nodeKeyProperty property on the data.
+        * .nodeKeyProperty property on the data.
         * If you want to customize the way in which node data gets a unique key,
-        * you can set the #makeUniqueKeyFunction functional property.
+        * you can set the .makeUniqueKeyFunction functional property.
         * If the node data object is already in the model and you want to change its key value,
-        * call #setKeyForNodeData and give it a new unique key value.
+        * call .setKeyForNodeData and give it a new unique key value.
         * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
         */
-        makeNodeDataKeyUnique(nodedata: Object);
+        makeNodeDataKeyUnique(nodedata: Object): void;
 
         /**
         * Call this method to notify that the model or its objects have changed.
         * This constructs a ChangedEvent and calls all Changed listeners.
-        * @param {EnumValue} change specifies the general nature of the change; typically the value is ChangedEvent#Property.
+        * @param {EnumValue} change specifies the general nature of the change; typically the value is ChangedEvent.Property.
         * @param {string|function(Object):*} propertyname names the property that was modified, or a function that takes an Object and returns the property value.
         * @param {Object} obj the object that was modified, typically a GraphObject, Diagram, or a Model.
         * @param {*} oldval the previous or older value.
@@ -4661,13 +5259,13 @@ declare module go {
         * @param {*=} oldparam an optional value that helps describe the older value.
         * @param {*=} newparam an optional value that helps describe the newer value.
         */
-        raiseChangedEvent(change: EnumValue, propertyname: any, obj: Object, oldval: any, newval: any, oldparam?: any, newparam?: any);
+        raiseChangedEvent(change: EnumValue, propertyname: PropertyAccessor, obj: Object, oldval: any, newval: any, oldparam?: any, newparam?: any): void;
 
         /**
         * Call this method to notify about a data property having changed value.
         * This constructs a ChangedEvent and calls all Changed listeners.
         * You should call this method only if the property value actually changed.
-        * This method is called by #setDataProperty.
+        * This method is called by .setDataProperty.
         * @param {Object} data the data object whose property changed value.
         * @param {string|function(Object):*} propertyname the name of the property, or a function that takes an Object and returns the property value.
         * @param {*} oldval the previous or old value for the property.
@@ -4675,46 +5273,53 @@ declare module go {
         * @param {*=} oldparam an optional value additionally describing the old value.
         * @param {*=} newparam an optional value additionally describing the new value.
         */
-        raiseDataChanged(data: Object, propertyname: any, oldval: any, newval: any, oldparam?: any, newparam?: any);
+        raiseDataChanged(data: Object, propertyname: PropertyAccessor, oldval: any, newval: any, oldparam?: any, newparam?: any): void;
 
         /**
-        * Remove an item from a data array that may be data bound by a Panel as its Panel#itemArray,
+        * Remove an item from a data array that may be data bound by a Panel as its Panel.itemArray,
         * given the index at which to remove a data value, in a manner that can be undone/redone and that automatically updates any bindings.
-        * This also calls #raiseChangedEvent to notify all listeners about the ChangedEvent#Remove.
-        * If you want to remove a node from the diagram, call #removeNodeData.
+        * This also calls .raiseChangedEvent to notify all listeners about the ChangedEvent.Remove.
+        * If you want to remove a node from the diagram, call .removeNodeData.
         * Note that there is no version of this method that takes an item value instead of an index into the array.
         * Because item arrays may hold any JavaScript value, including numbers and strings, there may be duplicate entries with that value in the array.
         * To avoid ambiguity, removing an item from an array requires an index.
-        * @param {Array} arr an Array that is the value of some Panel's Panel#itemArray.
+        * @param Array<*> arr an Array that is the value of some Panel's Panel.itemArray.
         * @param {number=} idx the zero-based array index of the data item to be removed from the array;
         *   if not supplied it will remove the last item of the array.
         */
-        removeArrayItem(arr: any[], idx?: number);
+        removeArrayItem(arr: Array<any>, idx?: number): void;
 
         /**
         * Unregister an event handler listener.
         * This deregistration does not raise a ChangedEvent.
         * @param {function(ChangedEvent)} listener a function that takes a ChangedEvent as its argument.
         */
-        removeChangedListener(listener: (e:ChangedEvent) => void);
+        removeChangedListener(listener: (e: ChangedEvent) => void ): void;
 
         /**
         * When you want to remove a node or group from the diagram,
         * call this method with an existing data object.
-        * This will remove that data from the #nodeDataArray and
+        * This will remove that data from the .nodeDataArray and
         * notify all listeners that a node data object has been removed from the collection.
         * Removing a node data from a model does not automatically remove
         * any connected link data from the model.
         * Removing a node data that represents a group does not automatically remove
         * any member node data or link data from the model.
-        * To add a node to the diagram, you can add its data object by calling #addNodeData.
-        * To add or remove an object or value from an item array, call #insertArrayItem or #removeArrayItem.
+        * To add a node to the diagram, you can add its data object by calling .addNodeData.
+        * To add or remove an object or value from an item array, call .insertArrayItem or .removeArrayItem.
         * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
         */
-        removeNodeData(nodedata: Object);
+        removeNodeData(nodedata: Object): void;
+
+        /**
+        * Remove from this model all of the node data held in an Array or in an Iterable of node data objects.
+        * @param {Iterable<Object>|Array<Object>} coll a collection of node data objects to remove from the .nodeDataArray
+        */
+        removeNodeDataCollection(coll: Iterable<Object> | Array<Object>): void;
 
         /**
         * Rollback the current transaction, undoing any recorded changes.
+        * This just calls UndoManager.rollbackTransaction.
         */
         rollbackTransaction(): boolean;
 
@@ -4728,32 +5333,30 @@ declare module go {
         * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
         * @param {string} cat Must not be null.
         */
-        setCategoryForNodeData(nodedata: Object, cat: string);
+        setCategoryForNodeData(nodedata: Object, cat: string): void;
 
         /**
-        * @ignore
         * Change the value of some property of a node data, a link data, or an item data, given a string naming the property
         * and the new value, in a manner that can be undone/redone and that automatically updates any bindings.
-        * This override handles link data as well as node data.
         * This gets the old value of the property; if the value is the same as the new value, no side-effects occur.
-        * @param {Object} data a JavaScript object representing a node, group, or non-link.
+        * @param {Object} data a JavaScript object representing a Node, Link, Group, simple Part, or item in a Panel.itemArray.
         * @param {string} propname a string that is not null or the empty string.
         * @param {*} val the new value for the property.
         */
-        setDataProperty(data: Object, propname: string, val: any);
+        setDataProperty(data: Object, propname: string, val: any): void;
 
         /**
         * Change the unique key of a given node data that is already in this model.
         * The new key value must be unique -- i.e. not in use by another node data object.
-        * You can call #findNodeDataForKey to check if a proposed new key is already in use.
+        * You can call .findNodeDataForKey to check if a proposed new key is already in use.
         * This operation will check all data objects in the model and replace all references
         * using the old key value with the new one.
         * If this is called on a node data object that is not (yet) in this model,
         * this unconditionally modifies the property to the new key value.
         * @param {Object} nodedata a JavaScript object representing a node, group, or non-link.
-        * @param {number|string|undefined} key
+        * @param {string|number|undefined} key
         */
-        setKeyForNodeData(nodedata: Object, key: any);
+        setKeyForNodeData(nodedata: Object, key: Key): void;
 
         /**
         * Begin a transaction, where the changes are held by a Transaction object in the UndoManager.
@@ -4764,11 +5367,18 @@ declare module go {
 
         /**
         * Generate a string representation of the persistent data in this model, in JSON format.
-        * Object properties whose names start with "_" are not written out.
+        * Object properties that are not enumerable or whose names start with "_" are not written out.
         * Functions are not able to be written in JSON format, so any properties that have function values
         * will not be saved in the JSON string.
         * There must not be any circular references within the model data.
         * Any sharing of object references will be lost in the written JSON.
+        * Most object classes cannot be serialized into JSON without special knowledge and processing at both ends.
+        * The .toJson and Model.fromJson methods automatically do such processing for numbers that are NaN
+        * and for objects that are of class Point, Size, Rect, Margin, Spot,
+        * Brush (but not for brush patterns), and for Geometry.
+        * However, we recommend that you use Binding converters (static functions named "parse" and "stringify")
+        * to represent Points, Sizes, Rects, Margins, Spots, and Geometries as string values in your data, rather than as Objects.
+        * This makes the JSON text smaller and simpler and easier to read.
         * @param {string=} classname The optional name of the model class to use in the output;
         *     for the standard models, this is their class name prefixed with "go.".
         */
@@ -4776,28 +5386,28 @@ declare module go {
 
         /**
         * Find a Part corresponding to the given data and
-        * call its Panel#updateTargetBindings method, in each Diagram
+        * call its Panel.updateTargetBindings method, in each Diagram
         * that uses this Model.
         * @param {Object} data The data object in this model that was modified.
         * @param {string=} srcpropname If not present or the empty string,
         *   update all bindings on the target Part or item Panel;
         *   otherwise update only those bindings using this source property name.
         */
-        updateTargetBindings(data: Object, srcpropname?: string);
+        updateTargetBindings(data: Object, srcpropname?: string): void;
     }
 
     /**
     * A Transaction holds a list of ChangedEvents collected during a transaction,
-    * as the value of the read-only #changes} property.
+    * as the value of the read-only .changes property.
     */
     class Transaction {
         /**
-        * Construct an object holding an empty list of ChangedEvents and no #name.
+        * Construct an object holding an empty list of ChangedEvents and no .name.
         */
         constructor();
 
-        /**Gets the list of ChangedEvents.*/
-        changes: List;
+        /**This read-only property returns the list of ChangedEvents.*/
+        changes: List<ChangedEvent>;
 
         /**Gets or sets whether we can add more ChangedEvents to this list of changes.*/
         isComplete: boolean;
@@ -4806,29 +5416,29 @@ declare module go {
         name: string;
 
         /**
-        * This predicate returns true if you can call #redo, namely when #isComplete is true.
+        * This predicate returns true if you can call .redo, namely when .isComplete is true.
         */
         canRedo(): boolean;
 
         /**
-        * This predicate returns true if you can call #undo, namely when #isComplete is true.
+        * This predicate returns true if you can call .undo, namely when .isComplete is true.
         */
         canUndo(): boolean;
 
         /**
         * Clear all of the saved changes.
         */
-        clear();
+        clear(): void;
 
         /**
-        * Re-perform these changes after an #undo.
+        * Re-perform these changes after an .undo.
         */
-        redo();
+        redo(): void;
 
         /**
         * Undo all of the changes, in reverse order.
         */
-        undo();
+        undo(): void;
     }
 
     /**
@@ -4838,22 +5448,34 @@ declare module go {
     */
     class TreeModel extends Model {
         /**
-        * This constructs an empty TreeModel unless one provides arguments as the initial data array values for the Model#nodeDataArray property.
-        * @param {Array=} nodedataarray an optional Array containing JavaScript objects to be represented by Nodes.
+        * This constructs an empty TreeModel unless one provides arguments as the initial data array values for the Model.nodeDataArray property.
+        * @param {Array<Object>=} nodedataarray an optional Array containing JavaScript objects to be represented by Nodes.
         */
         constructor(nodedataarray?: Array<Object>);
 
-        /**Gets or sets the name of the property on node data that specifies the string or number key of the node data that acts as the "parent" for this "child" node data, or a function that takes a node data object and returns that parent key; the default value is the name 'parent'.*/
-        nodeParentKeyProperty: any;
+        /**
+        * Gets or sets the name of the property on node data that specifies
+        * the string or number key of the node data that acts as the "parent" for this "child" node data,
+        * or a function that takes a node data object and returns that parent key;
+        * the default value is the name 'parent'.
+        * The value must not be null nor an empty string.
+        */
+        nodeParentKeyProperty: PropertyAccessor;
 
-        /**Gets or sets the name of the data property that returns a string describing that node data's parent link's category, or a function that takes a node data object and returns its parent link's category string; the default value is the name 'parentLinkCategory'.*/
-        parentLinkCategoryProperty: any;
+        /**
+        * Gets or sets the name of the data property that returns a string describing that node data's parent link's category,
+        * or a function that takes a node data object and returns its parent link's category string;
+        * the default value is the name 'parentLinkCategory'.
+        * This is used by the diagram to distinguish between different kinds of links.
+        * The name must not be null.
+        */
+        parentLinkCategoryProperty: PropertyAccessor;
 
         /**
         * If there is a parent node for the given node data, return the parent's key.
         * @param {Object} nodedata a JavaScript object representing a node.
         */
-        getParentKeyForNodeData(nodedata: Object): any;
+        getParentKeyForNodeData(nodedata: Object): Key;
 
         /**
         * Find the category for the parent link of a given child node data, a string naming the link template
@@ -4865,26 +5487,25 @@ declare module go {
         /**
         * Change the parent node for the given node data, given a key for the new parent, or undefined if there should be no parent.
         * @param {Object} nodedata a JavaScript object representing a node.
-        * @param {number|string|undefined} key This may be undefined if there should be no parent node data.
+        * @param {string|number|undefined} key This may be undefined if there should be no parent node data.
         */
-        setParentKeyForNodeData(nodedata: Object, key: any);
+        setParentKeyForNodeData(nodedata: Object, key: Key): void;
 
         /**
         * Change the category for the parent link of a given child node data, a string naming the link template
         * that the Diagram should use to represent the link.
-        *
         * Changing the link template will cause any existing Link
         * to be removed from the Diagram and replaced with a new Link
         * created by copying the new link template and applying any data-bindings.
         * @param {Object} childdata a JavaScript object representing a node data.
         * @param {string} cat Must not be null.
         */
-        setParentLinkCategoryForNodeData(childdata: Object, cat: string);
+        setParentLinkCategoryForNodeData(childdata: Object, cat: string): void;
     }
 
     /**
     * A Transaction holds a list of ChangedEvents collected during a transaction,
-    * as the value of the read-only #changes} property.
+    * as the value of the read-only .changes property.
     */
     class UndoManager {
         /**
@@ -4892,95 +5513,95 @@ declare module go {
         */
         constructor();
 
-        /**Gets the current Transaction for recording additional model change events.*/
+        /**This read-only property returns the current Transaction for recording additional model change events.*/
         currentTransaction: Transaction;
 
-        /**Gets the whole history, a list of all of the Transactions, each representing a transaction with some number of ChangedEvents.*/
-        history: List;
+        /**This read-only property returns the whole history, a list of all of the Transactions, each representing a transaction with some number of ChangedEvents.*/
+        history: List<Transaction>;
 
-        /**Gets the index into #history for the current undoable Transaction.*/
+        /**This read-only property returns the index into .history for the current undoable Transaction.*/
         hisotryIndex: number;
 
         /**Gets or sets whether this UndoManager records any changes.*/
         isEnabled: boolean;
 
-        /**This property is true after the first call to #startTransaction and before a corresponding call to #commitTransaction or #rollbackTransaction.*/
+        /**This property is true after the first call to .startTransaction and before a corresponding call to .commitTransaction or .rollbackTransaction.*/
         isInTransaction: boolean;
 
-        /**This property is true during a call to #undo or #redo.*/
+        /**This property is true during a call to .undo or .redo.*/
         isUndoingRedoing: boolean;
 
         /**Gets or sets the maximum number of transactions that this undo manager will remember.*/
         maxHistoryLength: number;
 
-        /**Gets an iterator for all of the Models that this UndoManager is handling.*/
-        models: Iterator;
+        /**This read-only property returns an iterator for all of the Models that this UndoManager is handling.*/
+        models: Iterator<Model>;
 
-        /**Gets a stack of ongoing transaction names.*/
-        nestedTransactionNames: List;
+        /**This read-only property returns a stack of ongoing transaction names.*/
+        nestedTransactionNames: List<string>;
 
-        /**Gets the current transaction level.*/
+        /**This read-only property returns the current transaction level.*/
         transactionLevel: number;
 
-        /**Gets the Transaction in the #history to be redone next.*/
+        /**This read-only property returns the Transaction in the .history to be redone next.*/
         transactionToRedo: Transaction;
 
-        /**Gets the Transaction in the #history to be undone next.*/
+        /**This read-only property returns the Transaction in the .history to be undone next.*/
         transactionToUndo: Transaction;
 
         /**
         * Make sure this UndoManager knows about a Model for which it may receive ChangedEvents when the given Model is changed.
         * @param {Model} model
         */
-        addModel(model: Model);
+        addModel(model: Model): void;
 
         /**
-        * This predicate returns true if you can call #redo.
+        * This predicate returns true if you can call .redo.
         */
         canRedo(): boolean;
 
         /**
-        * This predicate returns true if you can call #undo.
+        * This predicate returns true if you can call .undo.
         */
         canUndo(): boolean;
 
         /**
         * Clear all of the Transactions and clear all other state, including any ongoing transaction without rolling back.
         */
-        clear();
+        clear(): void;
 
         /**
-        * Commit the current transaction started by a call to #startTransaction.
-        * For convenience, this method is called by Model#commitTransaction and Diagram#commitTransaction.
+        * Commit the current transaction started by a call to .startTransaction.
+        * For convenience, this method is called by Model.commitTransaction and Diagram.commitTransaction.
         * If this call stops a top-level transaction,
-        * we mark the #currentTransaction as complete (Transaction#isComplete),
-        * we add the Transaction to the #history list,
+        * we mark the .currentTransaction as complete (Transaction.isComplete),
+        * we add the Transaction to the .history list,
         * and we return true.
         * Committing a transaction when there have been some undos without corresponding
         * redos will throw away the Transactions holding changes that happened
         * after the current state, before adding the new Transaction to the
-        * #history list.
+        * .history list.
         * @param {string} tname a short string describing the transaction.
         */
         commitTransaction(tname: string): boolean;
 
         /**
-        * Maybe record a ChangedEvent in the #currentTransaction.
-        * This calls #skipsEvent to see if this should ignore the change.
-        * If #skipsEvent returns false, this creates a copy of the ChangedEvent
-        * and adds it to the #currentTransaction.
-        * If there is no #currentTransaction, this first creates and remembers it.
+        * Maybe record a ChangedEvent in the .currentTransaction.
+        * This calls .skipsEvent to see if this should ignore the change.
+        * If .skipsEvent returns false, this creates a copy of the ChangedEvent
+        * and adds it to the .currentTransaction.
+        * If there is no .currentTransaction, this first creates and remembers it.
         * This method always ignores all changes while performing
-        * an #undo or #redo.
-        * This method is also a no-op if #isEnabled is false.
+        * an .undo or .redo.
+        * This method is also a no-op if .isEnabled is false.
         * @param {ChangedEvent} e a ChangedEvent.
         */
-        handleChanged(e: ChangedEvent);
+        handleChanged(e: ChangedEvent): void;
 
         /**
-        * Re-perform this object change after an #undo.
+        * Re-perform this object change after an .undo.
         */
-        redo();
+        redo(): void;
 
         /**
         * Inform this UndoManager that it will no longer be receiving ChangedEvents
@@ -4991,34 +5612,34 @@ declare module go {
         * you should be careful that there are no ChangedEvents referring to that model in any Transactions.
         * @param {Model} model A Model that this UndoManager should no longer manage.
         */
-        removeModel(model: Model);
+        removeModel(model: Model): void;
 
         /**
-        * Rollback the current transaction started by a call to #startTransaction, undoing any changes.
+        * Rollback the current transaction started by a call to .startTransaction, undoing any changes.
         */
         rollbackTransaction(): boolean;
 
         /**
-        * This predicate is called by #handleChanged to decide if a ChangedEvent
+        * This predicate is called by .handleChanged to decide if a ChangedEvent
         * is not interesting enough to be remembered.
-        * Transactional events (of change type ChangedEvent#Transaction) are always skipped.
-        * Changed events for GraphObjects that are in Layer#isTemporary layers are also skipped.
-        * Sometimes changed events do not even get to #handleChanged because
-        * Model#skipsUndoManager or Diagram#skipsUndoManager is true.
-        * @param {ChangedEvent} e the ChangedEvent received by #handleChanged.
+        * Transactional events (of change type ChangedEvent.Transaction) are always skipped.
+        * Changed events for GraphObjects that are in Layer.isTemporary layers are also skipped.
+        * Sometimes changed events do not even get to .handleChanged because
+        * Model.skipsUndoManager or Diagram.skipsUndoManager is true.
+        * @param {ChangedEvent} e the ChangedEvent received by .handleChanged.
         */
         skipsEvent(e: ChangedEvent): boolean;
 
         /**
         * Begin a transaction, where the changes are held by a Transaction object
-        * as the value of #currentTransaction.
-        * You must call either #commitTransaction or #rollbackTransaction afterwards.
-        * For convenience, this method is called by Model#startTransaction and Diagram#startTransaction.
+        * as the value of .currentTransaction.
+        * You must call either .commitTransaction or .rollbackTransaction afterwards.
+        * For convenience, this method is called by Model.startTransaction and Diagram.startTransaction.
         * Transactions can be nested.
         * Starting or ending a nested transaction will return false.
         * Nested transactions will share the same Transaction list of ChangedEvents.
-        * Starting a transaction will not necessarily cause #currentTransaction to be non-null.
-        * A Transaction object is usually only created by #handleChanged when a ChangedEvent first occurs.
+        * Starting a transaction will not necessarily cause .currentTransaction to be non-null.
+        * A Transaction object is usually only created by .handleChanged when a ChangedEvent first occurs.
         * @param {string=} tname a short string describing the transaction.
         */
         startTransaction(tname?: string): boolean;
@@ -5026,7 +5647,9 @@ declare module go {
         /**
         * Reverse the effects of this object change.
         */
-        undo();
+        undo(): void;
+
+        checksTransactionLevel: boolean;  // undocumented
     }
 
 
@@ -5038,20 +5661,20 @@ declare module go {
      */
     class CircularLayout extends Layout {
         /**
-        * Constructs a CircularLayout with no Layout#network and with no owning Layout#diagram.
+        * Constructs a CircularLayout with no Layout.network and with no owning Layout.diagram.
         */
         constructor();
 
         /**Returns the coordinates of the center of the laid-out ellipse.*/
         actualCenter: Point;
 
-        /**Gets the effective spacing that may have been calculated by the layout.*/
+        /**This read-only property returns the effective spacing that may have been calculated by the layout.*/
         actualSpacing: number;
 
-        /**Gets the effective X radius that may have been calculated by the layout.*/
+        /**This read-only property returns the effective X radius that may have been calculated by the layout.*/
         actualXRadius: number;
 
-        /**Gets the effective Y radius that may have been calculated by the layout.*/
+        /**This read-only property returns the effective Y radius that may have been calculated by the layout.*/
         actualYRadius: number;
 
         /**Gets or sets how the nodes are spaced.*/
@@ -5060,7 +5683,7 @@ declare module go {
         /**Gets or sets the ratio of the arrangement's height to its width (1 for a circle, >1 for a vertically elongated ellipse).*/
         aspectRatio: number;
 
-        /**Gets or sets the comparer which sorts the data when #sorting is set to CircularLayout#Ascending or CircularLayout#Descending.*/
+        /**Gets or sets the comparer which sorts the data when .sorting is set to CircularLayout.Ascending or CircularLayout.Descending.*/
         comparer: (a: CircularVertex, b: CircularVertex) => number;
 
         /**Gets or sets whether the nodes are arranged clockwise or counterclockwise.*/
@@ -5075,7 +5698,7 @@ declare module go {
         /**Gets or sets if and how the nodes are sorted.*/
         sorting: EnumValue;
 
-        /**Gets or sets the distance between nodes (if #radius is NaN) or the minimum distance between nodes (if #radius is a number).*/
+        /**Gets or sets the distance between nodes (if .radius is NaN) or the minimum distance between nodes (if .radius is a number).*/
         spacing: number;
 
         /**Gets or sets the angle (in degrees, clockwise from the positive side of the X axis) of the first element.*/
@@ -5087,17 +5710,17 @@ declare module go {
         /**
         * Position each Node according to the Vertex position, and then position the Links.
         */
-        commitLayout();
+        commitLayout(): void;
 
         /**
         * Commit the position and routing of all edge links.
         */
-        commitLinks();
+        commitLinks(): void;
 
         /**
         * Commit the position of all vertex nodes.
         */
-        commitNodes();
+        commitNodes(): void;
 
         /**
         * Create a new LayoutNetwork of CircularVertexes and CircularEdges.
@@ -5106,55 +5729,53 @@ declare module go {
 
         /**
         * Assign the positions of the vertexes in the network.
-        * @param {Diagram|Group|Iterable} coll A Diagram or a Group or a collection of Parts.
+        * @param {Diagram | Group | Iterable<Part>} coll A Diagram or a Group or a collection of Parts.
         */
-        doLayout(coll: Diagram);
-        doLayout(coll: Group);
-        doLayout(coll: Iterable);
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
 
-        /**Nodes are sorted using the #comparer, in ascending order; This value is used for CircularLayout#sorting.*/
+        /**Nodes are sorted using the .comparer, in ascending order; This value is used for CircularLayout.sorting.*/
         static Ascending: EnumValue;
 
-        /**The ring is filled by alternating sides; the second node is counterclockwise from the first node; This value is used for CircularLayout#direction.*/
+        /**The ring is filled by alternating sides; the second node is counterclockwise from the first node; This value is used for CircularLayout.direction.*/
         static BidirectionalLeft: EnumValue;
 
-        /**The ring is filled by alternating sides; the second node is clockwise from the first node; This value is used for CircularLayout#direction.*/
+        /**The ring is filled by alternating sides; the second node is clockwise from the first node; This value is used for CircularLayout.direction.*/
         static BidirectionalRight: EnumValue;
 
-        /**The effective diameter is either the width or height of the node, whichever is larger; This will cause circular nodes to touch when CircularLayout#spacing is 0; This is ideal when the nodes are circular.*/
+        /**The effective diameter is either the width or height of the node, whichever is larger; This will cause circular nodes to touch when CircularLayout.spacing is 0; This is ideal when the nodes are circular.*/
         static Circular: EnumValue;
 
-        /**Rings are filled clockwise; This value is used for CircularLayout#direction.*/
+        /**Rings are filled clockwise; This value is used for CircularLayout.direction.*/
         static Clockwise: EnumValue;
 
-        /**The angular distance between the nodes is constant; This value is used for CircularLayout#arrangement.*/
+        /**The angular distance between the nodes is constant; This value is used for CircularLayout.arrangement.*/
         static ConstantAngle: EnumValue;
 
-        /**The distance between the centers of the nodes is constant; This value is used for CircularLayout#arrangement.*/
+        /**The distance between the centers of the nodes is constant; This value is used for CircularLayout.arrangement.*/
         static ConstantDistance: EnumValue;
 
-        /**The spacing between the idealized boundaries of the nodes is constant; This value is used for CircularLayout#arrangement.*/
+        /**The spacing between the idealized boundaries of the nodes is constant; This value is used for CircularLayout.arrangement.*/
         static ConstantSpacing: EnumValue;
 
-        /**Rings are filled counterclockwise; This value is used for CircularLayout#direction.*/
+        /**Rings are filled counterclockwise; This value is used for CircularLayout.direction.*/
         static Counterclockwise: EnumValue;
 
-        /**Nodes are sorted using the #comparer, in reverse ascending (descending) order; This value is used for CircularLayout#sorting.*/
+        /**Nodes are sorted using the .comparer, in reverse ascending (descending) order; This value is used for CircularLayout.sorting.*/
         static Descending: EnumValue;
 
-        /**Nodes are arranged in the order given; This value is used for CircularLayout#sorting.*/
+        /**Nodes are arranged in the order given; This value is used for CircularLayout.sorting.*/
         static Forwards: EnumValue;
 
-        /**Nodes are ordered to reduce link crossings; This value is used for CircularLayout#sorting.*/
+        /**Nodes are ordered to reduce link crossings; This value is used for CircularLayout.sorting.*/
         static Optimized: EnumValue;
 
-        /**The vertices are arranged as close together as possible considering the CircularLayout#spacing, assuming the nodes are rectangular; This value is used for CircularLayout#arrangement.*/
+        /**The vertices are arranged as close together as possible considering the CircularLayout.spacing, assuming the nodes are rectangular; This value is used for CircularLayout.arrangement.*/
         static Packed: EnumValue;
 
-        /**The effective diameter is sqrt(width^2+height^2); The corners of square nodes will touch at 45 degrees when CircularLayout#spacing is 0; This value is used for CircularLayout#nodeDiameterFormula.*/
+        /**The effective diameter is sqrt(width^2+height^2); The corners of square nodes will touch at 45 degrees when CircularLayout.spacing is 0; This value is used for CircularLayout.nodeDiameterFormula.*/
         static Pythagorean: EnumValue;
 
-        /**Nodes are arranged in the reverse of the order given; This value is used for CircularLayout#sorting.*/
+        /**Nodes are arranged in the reverse of the order given; This value is used for CircularLayout.sorting.*/
         static Reverse: EnumValue;
     }
 
@@ -5182,38 +5803,38 @@ declare module go {
     */
     class ForceDirectedLayout extends Layout {
         /**
-        * Constructs a ForceDirectedLayout with no Layout#network and with no owning Layout#diagram.
+        * Constructs a ForceDirectedLayout with no Layout.network and with no owning Layout.diagram.
         */
         constructor();
 
         /**Gets or sets the space between which the layout will position the connected graphs that together compose the network.*/
         arrangementSpacing: Size;
 
-        /**Gets or sets whether #commitNodes should move all of the nodes so that the nodes all fit with the top-left corner at the Layout#arrangementOrigin.*/
+        /**Gets or sets whether .commitNodes should move all of the nodes so that the nodes all fit with the top-left corner at the Layout.arrangementOrigin.*/
         arrangesToOrigin: boolean;
 
-        /**Gets or sets whether this layout should find all Nodes whose category is "Comment" and whose anchors are nodes represented in the network, and add ForceDirectedVertexes representing those balloon comments as nodes in the network.*/
+        /**Gets or sets whether to call .addComments.*/
         comments: boolean;
 
-        /**Gets the current iteration count, valid during a call to #doLayout.*/
+        /**This read-only property returns the current iteration count, valid during a call to .doLayout.*/
         currentIteration: number;
 
-        /**Gets or sets the default value computed by #electricalCharge.*/
+        /**Gets or sets the default value computed by .electricalCharge.*/
         defaultCommentElectricalCharge: number;
 
-        /**Gets or sets the default value computed by #springLength.*/
+        /**Gets or sets the default value computed by .springLength.*/
         defaultCommentSpringLength: number;
 
-        /**Gets or sets the default value computed by #electricalCharge.*/
+        /**Gets or sets the default value computed by .electricalCharge.*/
         defaultElectricalCharge: number;
 
-        /**Gets or sets the default value computed by #gravitationalMass.*/
+        /**Gets or sets the default value computed by .gravitationalMass.*/
         defaultGravitationalMass: number;
 
-        /**Gets or sets the default value computed by #springLength.*/
+        /**Gets or sets the default value computed by .springLength.*/
         defaultSpringLength: number;
 
-        /**Gets or sets the default value computed by #springStiffness.*/
+        /**Gets or sets the default value computed by .springStiffness.*/
         defaultSpringStiffness: number;
 
         /**Gets or sets approximately how far a node must move in order for the iterations to continue.*/
@@ -5225,23 +5846,32 @@ declare module go {
         /**Gets or sets the maximum number of iterations to perform when doing the force-directed auto layout.*/
         maxIterations: number;
 
-        /**Gets or sets whether the fromSpot and the toSpot of every Link should be set to Spot#Default.*/
+        /**Gets or sets a random number generator with a random() method; set to null in order to use and reset an internal repeatable pseudo-random number generator.*/
+        randomNumberGenerator: { random: () => number };
+
+        /**Gets or sets whether the fromSpot and the toSpot of every Link should be set to Spot.Default.*/
         setsPortSpots: boolean;
 
+        /**
+        * Find associated objects to be positioned along with the vertex.
+        * @param {LayoutVertex} v
+        */
+        addComments(v: LayoutVertex): void;
+
         /**
         * Position the Nodes according to the Vertex positions.
         */
-        commitLayout();
+        commitLayout(): void;
 
         /**
         * Commit the position and routing of all edge links.
         */
-        commitLinks();
+        commitLinks(): void;
 
         /**
         * Commit the position of all vertex nodes.
         */
-        commitNodes();
+        commitNodes(): void;
 
         /**
         * Create a new LayoutNetwork of ForceDirectedVertexes and ForceDirectedEdges.
@@ -5250,16 +5880,14 @@ declare module go {
 
         /**
         * Assign the positions of the vertexes in the network.
-        * @param {Diagram|Group|Iterable} coll A Diagram or a Group or a collection of Parts.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
         */
-        doLayout(coll: Diagram);
-        doLayout(coll: Group);
-        doLayout(coll: Iterable);
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
 
         /**
         * Returns the charge of the vertex,
-        * the value of ForceDirectedVertex#charge if it's a number,
-        * or else the value of #defaultElectricalCharge.
+        * the value of ForceDirectedVertex.charge if it's a number,
+        * or else the value of .defaultElectricalCharge.
         * @param {ForceDirectedVertex} v
         */
         electricalCharge(v: ForceDirectedVertex): number;
@@ -5310,8 +5938,8 @@ declare module go {
 
         /**
         * Returns the mass of the vertex,
-        * the value of ForceDirectedVertex#mass if it's a number,
-        * or else the value of #defaultGravitationalMass.
+        * the value of ForceDirectedVertex.mass if it's a number,
+        * or else the value of .defaultGravitationalMass.
         * @param {ForceDirectedVertex} v
         */
         gravitationalMass(v: ForceDirectedVertex): number;
@@ -5319,11 +5947,18 @@ declare module go {
         /**
         * This predicate returns true if the vertex should not be moved
         * by the layout algorithm but still have an effect on nearby and connected vertexes.
-        * The default implementation returns ForceDirectedVertex#isFixed.
+        * The default implementation returns ForceDirectedVertex.isFixed.
         * @param {ForceDirectedVertex} v
         */
         isFixed(v: ForceDirectedVertex): boolean;
 
+        /**
+        * Maybe move a vertex that isFixed.
+        * This is called each iteration on each such vertex.
+        * By default this does nothing.
+        */
+        moveFixedVertex(v: ForceDirectedVertex): void;
+
         /**
         * Returns the length of the spring representing an edge.
         * The two vertexes connected by the edge E are acted upon by a force of magnitude
@@ -5381,7 +6016,7 @@ declare module go {
         */
         constructor();
 
-        /**Gets or sets whether the Part#location or the position should be used to arrange each part.*/
+        /**Gets or sets whether the Part.location or the position should be used to arrange each part.*/
         alignment: EnumValue;
 
         /**Gets or sets how to arrange the parts.*/
@@ -5391,7 +6026,7 @@ declare module go {
         cellSize: Size;
 
         /**Gets or sets the comparison function used to sort the parts.*/
-        comparer: (a:Part, b:Part) => number;
+        comparer: (a: Part, b: Part) => number;
 
         /**Gets or sets what order to place the parts.*/
         sorting: EnumValue;
@@ -5407,34 +6042,32 @@ declare module go {
 
         /**
         * Assign the positions of the parts, ignoring any links.
-        * @param {Diagram|Group|Iterable} coll A Diagram or a Group or a collection of Parts.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
         */
-        doLayout(coll: Diagram);
-        doLayout(coll: Group);
-        doLayout(coll: Iterable);
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
 
-        /**Lay out each child according to the sort order given by GridLayout#comparer; This value is used for GridLayout#sorting.*/
+        /**Lay out each child according to the sort order given by GridLayout.comparer; This value is used for GridLayout.sorting.*/
         static Ascending: EnumValue;
 
-        /**Lay out each child in reverse sort order given by GridLayout#comparer; This value is used for GridLayout#sorting.*/
+        /**Lay out each child in reverse sort order given by GridLayout.comparer; This value is used for GridLayout.sorting.*/
         static Descending: EnumValue;
 
-        /**Lay out each child in the order in which they were found; This value is used for GridLayout#sorting.*/
+        /**Lay out each child in the order in which they were found; This value is used for GridLayout.sorting.*/
         static Forward: EnumValue;
 
-        /**Fill each row from left to right; This value is used for GridLayout#arrangement.*/
+        /**Fill each row from left to right; This value is used for GridLayout.arrangement.*/
         static LeftToRight: EnumValue;
 
-        /**Position the part's Part#location at a grid point; This value is used for GridLayout#alignment.*/
+        /**Position the part's Part.location at a grid point; This value is used for GridLayout.alignment.*/
         static Location: EnumValue;
 
-        /**Position the top-left corner of each part at a grid point; This value is used for GridLayout#alignment.*/
+        /**Position the top-left corner of each part at a grid point; This value is used for GridLayout.alignment.*/
         static Position: EnumValue;
 
-        /**Lay out each child in reverse order from which they were found; This value is used for GridLayout#sorting.*/
+        /**Lay out each child in reverse order from which they were found; This value is used for GridLayout.sorting.*/
         static Reverse: EnumValue;
 
-        /**Fill each row from right to left; This value is used for GridLayout#arrangement.*/
+        /**Fill each row from right to left; This value is used for GridLayout.arrangement.*/
         static RightToLeft: EnumValue;
     }
 
@@ -5447,7 +6080,7 @@ declare module go {
     */
     class LayeredDigraphLayout extends Layout {
         /**
-        * Constructs a LayeredDigraphLayout with no Layout#network and with no owning Layout#diagram.
+        * Constructs a LayeredDigraphLayout with no Layout.network and with no owning Layout.diagram.
         */
         constructor();
 
@@ -5475,46 +6108,54 @@ declare module go {
         /**Gets or sets the size of each layer.*/
         layerSpacing: number;
 
-        /**Gets the largest column value.*/
+        /**This read-only property returns the largest column value.*/
         maxColumn: number;
 
-        /**Gets the largest index value.*/
+        /**This read-only property returns the largest index value.*/
         maxIndex: number;
 
-        /**Gets the larges index layer.*/
+        /**This read-only property returns the larges index layer.*/
         maxIndexLayer: number;
 
-        /**Gets the largest layer value.*/
+        /**This read-only property returns the largest layer value.*/
         maxLayer: number;
 
-        /**Gets the smallest index layer.*/
+        /**This read-only property returns the smallest index layer.*/
         minIndexLayer: number;
 
-        /**Gets or sets the options used by the straighten and pack function, The default value is LayeredDigraphLayout#PackAll.*/
+        /**Gets or sets the options used by the straighten and pack function, The default value is LayeredDigraphLayout.PackAll.*/
         packOption: number;
 
-        /**Gets or sets whether the FromSpot and ToSpot of each link should be set to values appropriate for the given value of LayeredDigraphLayout#direction.*/
+        /**Gets or sets whether the FromSpot and ToSpot of each link should be set to values appropriate for the given value of LayeredDigraphLayout.direction.*/
         setsPortSpots: boolean;
 
         /**
         * Assigns every vertex in the input network to a layer.
         */
-        assignLayers();
+        assignLayers(): void;
+
+        /**
+        * This overridable method is called by commitLayout
+        * to support custom arrangement of bands or labels across each layout layer.
+        * @param Array<*> layerRects an Array of Rects with the bounds of each of the "layers"
+        * @param {Point} offset the position of the top-left corner of the banded area relative to the coordinates given by the layerRects
+        */
+        commitLayers(layerRects: Array<Rect>, offset: Point): void;
 
         /**
         * Updates the physical location of "real" nodes and links to reflect the layout.
         */
-        commitLayout();
+        commitLayout(): void;
 
         /**
         * Routes the links.
         */
-        commitLinks();
+        commitLinks(): void;
 
         /**
         * Lays out the nodes.
         */
-        commitNodes();
+        commitNodes(): void;
 
         /**
         * Create a new LayoutNetwork of LayeredDigraphVertexes and LayeredDigraphEdges.
@@ -5523,59 +6164,60 @@ declare module go {
 
         /**
         * Assign the positions of the vertexes in the network.
-        * @param {Diagram|Group|Iterable} coll A Diagram or a Group or a collection of Parts.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
         */
-        doLayout(coll: Diagram);
-        doLayout(coll: Group);
-        doLayout(coll: Iterable);
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
 
-        /**The faster, less aggressive, crossing reduction algorithm; a valid value for LayeredDigraphLayout#aggressiveOption.*/
+        /**The faster, less aggressive, crossing reduction algorithm; a valid value for LayeredDigraphLayout.aggressiveOption.*/
         static AggressiveLess: EnumValue;
 
-        /**The slower, more aggressive, crossing reduction algorithm, a valid value for LayeredDigraphLayout#aggressiveOption.*/
+        /**The slower, more aggressive, crossing reduction algorithm, a valid value for LayeredDigraphLayout.aggressiveOption.*/
         static AggressiveMore: EnumValue;
 
-        /**The fastest, but poorest, crossing reduction algorithm; a valid value for LayeredDigraphLayout#aggressiveOption.*/
+        /**The fastest, but poorest, crossing reduction algorithm; a valid value for LayeredDigraphLayout.aggressiveOption.*/
         static AggressiveNone: EnumValue;
 
-        /**Remove cycles using depth first cycle removal; a valid value of LayeredDigraphLayout#cycleRemoveOption.*/
+        /**Remove cycles using depth first cycle removal; a valid value of LayeredDigraphLayout.cycleRemoveOption.*/
         static CycleDepthFirst: EnumValue;
 
-        /**Remove cycles using greedy cycle removal; a valid value of LayeredDigraphLayout#cycleRemoveOption.*/
+        /**Remove cycles using greedy cycle removal; a valid value of LayeredDigraphLayout.cycleRemoveOption.*/
         static CycleGreedy: EnumValue;
 
-        /**Initialize using depth first in initialization; a valid value for LayeredDigraphLayout#initializeOption.*/
+        /**Initialize using depth first in initialization; a valid value for LayeredDigraphLayout.initializeOption.*/
         static InitDepthFirstIn: EnumValue;
 
-        /**Initialize using depth first out initialization; a valid value for LayeredDigraphLayout#initializeOption.*/
+        /**Initialize using depth first out initialization; a valid value for LayeredDigraphLayout.initializeOption.*/
         static InitDepthFirstOut: EnumValue;
 
-        /**Initialize using naive initialization; a valid value for LayeredDigraphLayout#initializeOption.*/
+        /**Initialize using naive initialization; a valid value for LayeredDigraphLayout.initializeOption.*/
         static InitNaive: EnumValue;
 
-        /**Assign layers using longest path sink layering; a valid value for LayeredDigraphLayout#layeringOption.*/
+        /**Assign layers using longest path sink layering; a valid value for LayeredDigraphLayout.layeringOption.*/
         static LayerLongestPathSink: EnumValue;
 
-        /**Assign layers using longest path source layering; a valid value for LayeredDigraphLayout#layeringOption.*/
+        /**Assign layers using longest path source layering; a valid value for LayeredDigraphLayout.layeringOption.*/
         static LayerLongestPathSource: EnumValue;
 
-        /**Assign layers using optimal link length layering; A valid value for LayeredDigraphLayout#layeringOption.*/
+        /**Assign layers using optimal link length layering; A valid value for LayeredDigraphLayout.layeringOption.*/
         static LayerOptimalLinkLength: EnumValue;
 
-        /**Enable all options for the LayeredDigraphLayout#packOption property; See also LayeredDigraphLayout#PackExpand, LayeredDigraphLayout#PackStraighten, and LayeredDigraphLayout#PackMedian.*/
+        /**Enable all options for the LayeredDigraphLayout.packOption property; See also LayeredDigraphLayout.PackExpand, LayeredDigraphLayout.PackStraighten, and LayeredDigraphLayout.PackMedian.*/
         static PackAll: number;
 
-        /**This option gives more chances for the packing algorithm to improve the network, but is very expensive in time for large networks; a valid value for LayeredDigraphLayout#packOption.*/
+        /**This option gives more chances for the packing algorithm to improve the network, but is very expensive in time for large networks; a valid value for LayeredDigraphLayout.packOption.*/
         static PackExpand: number;
 
-        /**This option tries to have the packing algorithm center groups of nodes based on their relationships with nodes in other layers, a valid value for LayeredDigraphLayout#packOption.*/
+        /**This option tries to have the packing algorithm center groups of nodes based on their relationships with nodes in other layers, a valid value for LayeredDigraphLayout.packOption.*/
         static PackMedian: number;
 
-        /**Does minimal work in packing the nodes; a valid value for LayeredDigraphLayout#packOption.*/
+        /**Does minimal work in packing the nodes; a valid value for LayeredDigraphLayout.packOption.*/
         static PackNone: number;
 
-        /**This option tries to have the packing algorithm straighten many of the links that cross layers, a valid value for LayeredDigraphLayout#packOption.*/
+        /**This option tries to have the packing algorithm straighten many of the links that cross layers, a valid value for LayeredDigraphLayout.packOption.*/
         static PackStraighten: number;
+
+        protected nodeMinLayerSpace(v: LayeredDigraphVertex, tl: boolean): number;  // undocumented
+        protected nodeMinColumnSpace(v: LayeredDigraphVertex, tl: boolean): number;  // undocumented
     }
 
     /** This holds LayeredDigraphLayout-specific information about Link s.*/
@@ -5638,16 +6280,16 @@ declare module go {
         /**Gets or sets the top-left point for where the graph should be positioned when laid out.*/
         arrangementOrigin: Point;
 
-        /**Gets the Diagram that owns this layout, if it is the value of Diagram#layout.*/
+        /**This read-only property returns the Diagram that owns this layout, if it is the value of Diagram.layout.*/
         diagram: Diagram;
 
-        /**Gets the Group that uses this layout, if it is the value of a group's Group#layout.*/
+        /**This read-only property returns the Group that uses this layout, if it is the value of a group's Group.layout.*/
         group: Group;
 
         /**Gets or sets whether this layout is performed on an initial layout.*/
         isInitial: boolean;
 
-        /**Gets or sets whether this layout can be invalidated by #invalidateLayout.*/
+        /**Gets or sets whether this layout can be invalidated by .invalidateLayout.*/
         isOngoing: boolean;
 
         /**Gets or sets whether this layout be performed in real-time, before the end of a transaction.*/
@@ -5659,7 +6301,7 @@ declare module go {
         /**Gets or sets whether this layout needs to be performed again.*/
         isValidLayout: boolean;
 
-        /**Gets or sets whether this layout depends on the Diagram#viewportBounds's size.*/
+        /**Gets or sets whether this layout depends on the Diagram.viewportBounds's size.*/
         isViewportSized: boolean;
 
         /**Gets or sets the LayoutNetwork used by this Layout, if any.*/
@@ -5668,7 +6310,7 @@ declare module go {
         /**
         * When using a LayoutNetwork, commit changes to the diagram by setting Node positions and by routing the Links.
         */
-        commitLayout();
+        commitLayout(): void;
 
         /**
         * Creates a copy of this Layout and returns it.
@@ -5681,30 +6323,29 @@ declare module go {
         createNetwork(): LayoutNetwork;
 
         /**
-        * Position all of the nodes that do not have an assigned Part#location in the manner of a simple rectangular array.
-        * @param {Diagram|Group|Iterable} coll A Diagram or a Group or a collection of Parts.
+        * Position all of the nodes that do not have an assigned Part.location in the manner of a simple rectangular array.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
         */
-        doLayout(coll: Diagram);
-        doLayout(coll: Group);
-        doLayout(coll: Iterable);
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
 
         /**
-        * If #isOngoing is true and if an initial layout has not yet been performed, set the #isValidLayout property to false, and ask to perform another layout in the near future.
+        * If .isOngoing is true and if an initial layout has not yet been performed, set the .isValidLayout property to false, and ask to perform another layout in the near future.
         */
-        invalidateLayout();
+        invalidateLayout(): void;
 
         /**
         * Create and initialize a LayoutNetwork with the given nodes and links.
-        * @param {Diagram|Group|Iterable} coll A Diagram or a Group or a collection of Parts.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
         */
-        makeNetwork(coll: Diagram): LayoutNetwork;
-        makeNetwork(coll: Group): LayoutNetwork;
-        makeNetwork(coll: Iterable): LayoutNetwork;
+        makeNetwork(coll: (Diagram | Group | Iterable<Part>)): LayoutNetwork;
 
         /**
         * When using a LayoutNetwork, update the "physical" node positionings and link routings.
         */
-        updateParts();
+        updateParts(): void;
+
+        protected cloneProtected(copy: Layout): void;  // undocumented
+        collectParts(coll: Iterable<Part>): void;  // undocumented
     }
 
     /**
@@ -5719,19 +6360,19 @@ declare module go {
         constructor();
 
         /**Gets a collection of all of the LayoutEdges in this network.*/
-        edges: Set;
+        edges: Set<LayoutEdge>;
 
-        /**Gets the Layout that uses this network of LayoutVertexes and LayoutEdges.*/
+        /**This read-only property returns the Layout that uses this network of LayoutVertexes and LayoutEdges.*/
         layout: Layout;
 
         /**Gets a collection of all of the LayoutVertexes in this network.*/
-        vertexes: Set;
+        vertexes: Set<LayoutVertex>;
 
         /**
         * Adds a LayoutEdge to the network.
         * @param {LayoutEdge} edge
         */
-        addEdge(edge: LayoutEdge);
+        addEdge(edge: LayoutEdge): void;
 
         /**
         * This convenience method makes sure there is a LayoutEdge in this network corresponding to a Link.
@@ -5748,16 +6389,19 @@ declare module go {
 
         /**
         * Creates a network of LayoutVertexes and LayoutEdges corresponding to the given Nodes and Links.
-        * @param {Iterable} parts A collection of Nodes or Links.
-        * @param {boolean=} toplevelonly whether to skip Parts in the given collection that are contained by Groups.
+        * @param {Iterable<Part>} parts A collection of Nodes or Links.
+        * @param {boolean=} toplevelonly whether to skip Parts in the given collection that are contained by Groups; default is false.
+        * @param {function(Part):boolean|null=} pred optional predicate to apply to each Part --
+        *        if it returns false do not include Vertex or Edge in the network for that Part;
+        *        default ignores link label nodes or links connecting with them
         */
-        addParts(parts: Iterable, toplevelonly?: boolean);
+        addParts(parts: Iterable<Part>, toplevelonly?: boolean, pred?: (part: Part) => boolean): void;
 
         /**
         * Adds a LayoutVertex to the network.
         * @param {LayoutVertex} vertex
         */
-        addVertex(vertex: LayoutVertex);
+        addVertex(vertex: LayoutVertex): void;
 
         /**
         * Allocate a new instance of LayoutEdge.
@@ -5772,41 +6416,41 @@ declare module go {
         /**
         * Deletes all vertexes and edges that have no Part associated with them.
         */
-        deleteArtificialVertexes();
+        deleteArtificialVertexes(): void;
 
         /**
         * Removes a LayoutEdge from the network.
         * @param {LayoutEdge} edge
         */
-        deleteEdge(edge: LayoutEdge);
+        deleteEdge(edge: LayoutEdge): void;
 
         /**
         * This convenience method deletes from this network any LayoutEdge corresponding to a Link.
         * @param {Link} link
         */
-        deleteLink(link: Link);
+        deleteLink(link: Link): void;
 
         /**
         * This convenience method deletes any LayoutVertex corresponding to a Node.
         * @param {Node} node
         */
-        deleteNode(node: Node);
+        deleteNode(node: Node): void;
 
         /**
         * Deletes all LayoutEdges whose "to vertex" and "from vertex" are the same vertex.
         */
-        deleteSelfEdges();
+        deleteSelfEdges(): void;
 
         /**
         * Removes a LayoutVertex from the network.
         * @param {LayoutVertex} vertex
         */
-        deleteVertex(vertex: LayoutVertex);
+        deleteVertex(vertex: LayoutVertex): void;
 
         /**
         * Retrieve all of the Nodes and Links from the LayoutVertexes and LayoutEdges that are in this network.
         */
-        findAllParts(): Set;
+        findAllParts(): Set<Part>;
 
         /**
         * Returns the LayoutEdge that was constructed for the Link.
@@ -5832,12 +6476,12 @@ declare module go {
         * Reverses the direction of a LayoutEdge in the network.
         * @param {LayoutEdge} edge
         */
-        reverseEdge(edge: LayoutEdge);
+        reverseEdge(edge: LayoutEdge): void;
 
         /**
         * Modify this network by splitting it up into separate subnetworks, each of which has all of its vertexes connected to each other, but not to any vertexes in any other subnetworks.
         */
-        splitIntoSubNetworks(): List;
+        splitIntoSubNetworks(): List<LayoutNetwork>;
     }
 
     /** An edge represents a link in a LayoutNetwork. It holds layout-specific data for the link. */
@@ -5862,13 +6506,15 @@ declare module go {
         /**
         * Commits the route of this edge to the corresponding Link, if any.
         */
-        commit();
+        commit(): void;
 
         /**
         * Returns the edge's vertex at the other of this edge from the given vertex.
         * @param {LayoutVertex} v
         */
-        getOtherVertex(v: LayoutVertex);
+        getOtherVertex(v: LayoutVertex): void;
+
+        data: any;  // undocumented
     }
 
     /** A vertex represents a node in a LayoutNetwork. It holds layout-specific data for the node. */
@@ -5888,18 +6534,18 @@ declare module go {
         centerY: number;
 
         /**Gets an iterator for all of the edges that go out of this vertex.*/
-        destinationEdges: Iterator;
+        destinationEdges: Iterator<LayoutEdge>;
 
         /**Gets an iterator for all of the vertexes that are connected with edges going out of this vertex.*/
-        destinationVertexes: Iterator;
+        destinationVertexes: Iterator<LayoutVertex>;
 
         /**Gets an iterator for all of the edges that are connected with this vertex in either direction.*/
-        edges: Iterator;
+        edges: Iterator<LayoutEdge>;
 
-        /**Gets the total number of edges that are connected with this vertex in either direction.*/
+        /**This read-only property returns the total number of edges that are connected with this vertex in either direction.*/
         edgesCount: number;
 
-        /**Gets or sets the offset of the #centerX and #centerY from the #bounds position.*/
+        /**Gets or sets the offset of the .centerX and .centerY from the .bounds position.*/
         focus: Point;
 
         /**Gets or sets the relative X position of the "center" point, the focus.*/
@@ -5918,13 +6564,13 @@ declare module go {
         node: Node;
 
         /**Gets an iterator for all of the edges that come into this vertex.*/
-        sourceEdges: Iterator;
+        sourceEdges: Iterator<LayoutEdge>;
 
         /**Gets an iterator for all of the vertexes that are connected with edges coming into this vertex.*/
-        sourceVertexes: Iterator;
+        sourceVertexes: Iterator<LayoutVertex>;
 
         /**Gets an iterator for all of the vertexes that are connected in either direction with this vertex.*/
-        vertexes: Iterator;
+        vertexes: Iterator<LayoutVertex>;
 
         /**Gets or sets the width of this vertex.*/
         width: number;
@@ -5939,44 +6585,46 @@ declare module go {
         * Adds a LayoutEdge to the list of successors (the edge will be going out from this vertex).
         * @param {LayoutEdge} edge
         */
-        addDestinationEdge(edge: LayoutEdge);
+        addDestinationEdge(edge: LayoutEdge): void;
 
         /**
         * Adds a LayoutEdge to the list of predecessors (the edge will be coming into this vertex).
         * @param {LayoutEdge} edge
         */
-        addSourceEdge(edge: LayoutEdge);
+        addSourceEdge(edge: LayoutEdge): void;
 
         /**
-        * Moves the Node corresponding to this vertex so that its position is at the current #bounds point.
+        * Moves the Node corresponding to this vertex so that its position is at the current .bounds point.
         */
-        commit();
+        commit(): void;
 
         /**
         * Deletes a LayoutEdge from the list of successors (the edge was going out from this vertex).
         * @param {LayoutEdge} edge
         */
-        deleteDestinationEdge(edge: LayoutEdge);
+        deleteDestinationEdge(edge: LayoutEdge): void;
 
         /**
         * Deletes a LayoutEdge from the list of predecessors (the edge was coming into this vertex).
         * @param {LayoutEdge} edge
         */
-        deleteSourceEdge(edge: LayoutEdge);
+        deleteSourceEdge(edge: LayoutEdge): void;
 
         /**
-        * This static method is used to compare the Part#text values of the #nodes of the argument LayoutVertexes.
+        * This static function is used to compare the Part.text values of the .nodes of the argument LayoutVertexes.
         * @param {LayoutVertex} m
         * @param {LayoutVertex} n
         */
         static smartComparer(m: LayoutVertex, n: LayoutVertex): number;
 
         /**
-        * This static method is used to compare the Part#text values of the #nodes of the argument LayoutVertexes.
+        * This static function is used to compare the Part.text values of the .nodes of the argument LayoutVertexes.
         * @param {LayoutVertex} m
         * @param {LayoutVertex} n
         */
         static standardComparer(m: LayoutVertex, n: LayoutVertex): number;
+
+        data: any;  // undocumented
     }
 
     /**
@@ -5984,7 +6632,7 @@ declare module go {
     */
     class TreeLayout extends Layout {
         /**
-        * Constructs a TreeLayout with no Layout#network and with no owning Layout#diagram.
+        * Constructs a TreeLayout with no Layout.network and with no owning Layout.diagram.
         */
         constructor();
 
@@ -6000,7 +6648,7 @@ declare module go {
         /**Gets or sets a limit on how broad a tree should be.*/
         alternateBreadthLimit: number;
 
-        /**Gets or sets the spot that children nodes' ports get as their ToSpot The default value is Spot#Default.*/
+        /**Gets or sets the spot that children nodes' ports get as their ToSpot The default value is Spot.Default.*/
         alternateChildPortSpot: Spot;
 
         /**Gets or sets the distance between a node and its comments.*/
@@ -6013,9 +6661,9 @@ declare module go {
         alternateCompaction: EnumValue;
 
         /**Gets or sets the default comparison function used for sorting.*/
-        alternateComparer: (a:TreeVertex, b:TreeVertex) => number;
+        alternateComparer: (a: TreeVertex, b: TreeVertex) => number;
 
-        /**Gets or sets the object holding the default values for alternate layer TreeVertexes, used when the #treeStyle is #StyleAlternating or #StyleLastParents.*/
+        /**Gets or sets the object holding the default values for alternate layer TreeVertexes, used when the .treeStyle is .StyleAlternating or .StyleLastParents.*/
         alternateDefaults: TreeVertex;
 
         /**Gets or sets the distance between a parent node and its children.*/
@@ -6027,7 +6675,7 @@ declare module go {
         /**Gets or sets the default indentation of the first child.*/
         alternateNodeIndent: number;
 
-        /**Gets or sets the fraction of this node's breadth is added to #nodeIndent to determine any spacing at the start of the children.*/
+        /**Gets or sets the fraction of this node's breadth is added to .nodeIndent to determine any spacing at the start of the children.*/
         alternateNodeIndentPastParent: number;
 
         /**Gets or sets the distance between child nodes.*/
@@ -6036,7 +6684,7 @@ declare module go {
         /**Gets or sets the spot that this node's port gets as its FromSpot.*/
         alternatePortSpot: Spot;
 
-        /**Gets or sets the default indentation of the first child of each row, if the #alignment is not a "Center" alignment.*/
+        /**Gets or sets the default indentation of the first child of each row, if the .alignment is not a "Center" alignment.*/
         alternateRowIndent: number;
 
         /**Gets or sets the distance between rows of children.*/
@@ -6054,10 +6702,10 @@ declare module go {
         /**Gets or sets the default direction for tree growth.*/
         angle: number;
 
-        /**Gets or sets how #arrangeTrees should lay out the separate trees.*/
+        /**Gets or sets how .arrangeTrees should lay out the separate trees.*/
         arrangement: EnumValue;
 
-        /**Gets or sets the space between which #arrangeTrees will position the trees.*/
+        /**Gets or sets the space between which .arrangeTrees will position the trees.*/
         arrangementSpacing: Size;
 
         /**Gets or sets a limit on how broad a tree should be.*/
@@ -6075,8 +6723,11 @@ declare module go {
         /**Gets or sets how closely to pack the child nodes of a subtree.*/
         compaction: EnumValue;
 
+        /**Gets or sets whether to call .addComments.*/
+        comments: boolean;
+
         /**Gets or sets the default comparison function used for sorting.*/
-        comparer: (a:TreeVertex, b:TreeVertex) => number;
+        comparer: (a: TreeVertex, b: TreeVertex) => number;
 
         /**Gets or sets the distance between a parent node and its children.*/
         layerSpacing: number;
@@ -6084,10 +6735,13 @@ declare module go {
         /**Gets or sets the fraction of the node's depth for which the children's layer starts overlapped with the parent's layer.*/
         layerSpacingParentOverlap: number;
 
+        /**Gets or sets the manner in which the nodes are aligned in layers.*/
+        layerStyle: EnumValue;
+
         /**Gets or sets the default indentation of the first child.*/
         nodeIndent: number;
 
-        /**Gets or sets the fraction of this node's breadth is added to #nodeIndent to determine any spacing at the start of the children.*/
+        /**Gets or sets the fraction of this node's breadth is added to .nodeIndent to determine any spacing at the start of the children.*/
         nodeIndentPastParent: number;
 
         /**Gets or sets the distance between child nodes.*/
@@ -6103,9 +6757,9 @@ declare module go {
         rootDefaults: TreeVertex;
 
         /**Gets or sets the collection of root vertexes.*/
-        roots: Set;
+        roots: Set<TreeVertex|Node>;
 
-        /**Gets or sets the default indentation of the first child of each row, if the #alignment is not a "Center" alignment.*/
+        /**Gets or sets the default indentation of the first child of each row, if the .alignment is not a "Center" alignment.*/
         rowIndent: number;
 
         /**Gets or sets the distance between rows of children.*/
@@ -6127,33 +6781,41 @@ declare module go {
         * Find associated objects to be positioned along with the TreeVertex.
         * @param {LayoutVertex} v
         */
-        addComments(v: LayoutVertex);
+        addComments(v: LayoutVertex): void;
 
         /**
         * Position each separate tree.
         */
-        arrangeTrees();
+        arrangeTrees(): void;
 
         /**
         * Assign final property values for a TreeVertex.
         * @param {LayoutVertex} v
         */
-        assignTreeVertexValues(v: LayoutVertex);
+        assignTreeVertexValues(v: LayoutVertex): void;
+
+        /**
+        * This overridable method is called by commitLayout if layerStyle is LayerUniform
+        * to support custom arrangement of bands or labels across each layout layer.
+        * @param Array<*> layerRects an Array of Rects with the bounds of each of the "layers"
+        * @param {Point} offset the position of the top-left corner of the banded area relative to the coordinates given by the layerRects
+        */
+        commitLayers(layerRects: Array<Rect>, offset: Point): void;
 
         /**
         * Set the fromSpot and toSpot for each Vertex, position each Node according to the Vertex position, and then position the Links.
         */
-        commitLayout();
+        commitLayout(): void;
 
         /**
         * Commit the position and routing of all edge links.
         */
-        commitLinks();
+        commitLinks(): void;
 
         /**
         * Commit the position of all vertex nodes.
         */
-        commitNodes();
+        commitNodes(): void;
 
         /**
         * Create a new LayoutNetwork of TreeVertexes and TreeEdges.
@@ -6162,94 +6824,101 @@ declare module go {
 
         /**
         * Assign the positions of the vertexes in the network.
-        * @param {Diagram|Group|Iterable} coll A Diagram or a Group or a collection of Parts.
+        * @param {(Diagram | Group | Iterable<Part>)} coll A Diagram or a Group or a collection of Parts.
         */
-        doLayout(coll: Diagram);
-        doLayout(coll: Group);
-        doLayout(coll: Iterable);
+        doLayout(coll: (Diagram | Group | Iterable<Part>)): void;
 
         /**
         * Assign initial property values for a TreeVertex.
         * @param {LayoutVertex} v
         */
-        initializeTreeVertexValues(v: LayoutVertex);
+        initializeTreeVertexValues(v: LayoutVertex): void;
 
         /**
-        * Position and TreeVertex#comments around the vertex.
+        * Position and TreeVertex.comments around the vertex.
         * @param {LayoutVertex} v
         */
-        layoutComments(v: LayoutVertex);
+        layoutComments(v: LayoutVertex): void;
 
-        /**The children are positioned in a bus, only on the bottom or right side of the parent; This value is used for TreeLayout#alignment or TreeLayout#alternateAlignment.*/
+        /**The children are positioned in a bus, only on the bottom or right side of the parent; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
         static AlignmentBottomRightBus: EnumValue;
 
         /**The children are positioned in a bus on both sides of an "aisle" where the links to them go, with the last odd child (if any) placed at the end of the aisle in the middle.*/
         static AlignmentBus: EnumValue;
 
-        /**Like TreeLayout#AlignmentBus with the children arranged on both sides of an "aisle" with any last odd child placed at the end of the aisle, but the children get an TreeVertex#angle that depends on which side of the aisle they were placed.*/
+        /**Like TreeLayout.AlignmentBus with the children arranged on both sides of an "aisle" with any last odd child placed at the end of the aisle, but the children get an TreeVertex.angle that depends on which side of the aisle they were placed.*/
         static AlignmentBusBranching: EnumValue;
 
-        /**The parent is centered at the middle of the range of its immediate child nodes; This value is used for TreeLayout#alignment or TreeLayout#alternateAlignment.*/
+        /**The parent is centered at the middle of the range of its immediate child nodes; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
         static AlignmentCenterChildren: EnumValue;
 
-        /**The parent is centered at the middle of the range of its child subtrees; This value is used for TreeLayout#alignment or TreeLayout#alternateAlignment.*/
+        /**The parent is centered at the middle of the range of its child subtrees; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
         static AlignmentCenterSubtrees: EnumValue;
 
-        /**The parent is positioned near the last of its children; This value is used for TreeLayout#alignment or TreeLayout#alternateAlignment.*/
+        /**The parent is positioned near the last of its children; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
         static AlignmentEnd: EnumValue;
 
-        /**The parent is positioned near the first of its children; This value is used for TreeLayout#alignment or TreeLayout#alternateAlignment.*/
+        /**The parent is positioned near the first of its children; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
         static AlignmentStart: EnumValue;
 
-        /**The children are positioned in a bus, only on the top or left side of the parent; This value is used for TreeLayout#alignment or TreeLayout#alternateAlignment.*/
+        /**The children are positioned in a bus, only on the top or left side of the parent; This value is used for TreeLayout.alignment or TreeLayout.alternateAlignment.*/
         static AlignmentTopLeftBus: EnumValue;
 
-        /**Do not move each root node, but position all of their descendants relative to their root; This value is used for TreeLayout#arrangement.*/
+        /**Do not move each root node, but position all of their descendants relative to their root; This value is used for TreeLayout.arrangement.*/
         static ArrangementFixedRoots: EnumValue;
 
-        /**Position each tree in a non-overlapping fashion by increasing X coordinates, starting at the Layout#arrangementOrigin; This value is used for TreeLayout#arrangement.*/
+        /**Position each tree in a non-overlapping fashion by increasing X coordinates, starting at the Layout.arrangementOrigin; This value is used for TreeLayout.arrangement.*/
         static ArrangementHorizontal: EnumValue;
 
-        /**Position each tree in a non-overlapping fashion by increasing Y coordinates, starting at the Layout#arrangementOrigin; This value is used for TreeLayout#arrangement.*/
+        /**Position each tree in a non-overlapping fashion by increasing Y coordinates, starting at the Layout.arrangementOrigin; This value is used for TreeLayout.arrangement.*/
         static ArrangementVertical: EnumValue;
 
-        /**A simple fitting of subtrees; This value is used for TreeLayout#compaction or TreeLayout#alternateCompaction.*/
+        /**A simple fitting of subtrees; This value is used for TreeLayout.compaction or TreeLayout.alternateCompaction.*/
         static CompactionBlock: EnumValue;
 
-        /**Only simple placement of children next to each other, as determined by their subtree breadth; This value is used for TreeLayout#compaction or TreeLayout#alternateCompaction.*/
+        /**Only simple placement of children next to each other, as determined by their subtree breadth; This value is used for TreeLayout.compaction or TreeLayout.alternateCompaction.*/
         static CompactionNone: EnumValue;
 
-        /**This value for TreeLayout#path causes the value of Diagram#isTreePathToChildren to effectively choose either TreeLayout#PathDestination (if true) or TreeLayout#PathSource (if false).*/
+        /**This default value for TreeLayout.layerStyle causes each node takes up only the depth that it needs.*/
+        static LayerIndividual: EnumValue;
+
+        /**This value for TreeLayout.layerStyle causes all of the children of a parent node take up the same amount of depth -- this typically causes all cousins to be aligned.*/
+        static LayerSiblings: EnumValue;
+
+        /**This value for TreeLayout.layerStyle causes all nodes with the same TreeVertex.level throughout the tree take up the same amount of depth.*/
+        static LayerUniform: EnumValue;
+
+        /**This value for TreeLayout.path causes the value of Diagram.isTreePathToChildren to effectively choose either TreeLayout.PathDestination (if true) or TreeLayout.PathSource (if false).*/
         static PathDefault: EnumValue;
 
-        /**The children of a TreeVertex are its LayoutVertex#destinationVertexes, the collection of connected LayoutEdge#toVertexes; This value is used for TreeLayout#path.*/
+        /**The children of a TreeVertex are its LayoutVertex.destinationVertexes, the collection of connected LayoutEdge.toVertexes; This value is used for TreeLayout.path.*/
         static PathDestination: EnumValue;
 
-        /**The children of a TreeVertex are its LayoutVertex#sourceVertexes, the collection of connected LayoutEdge#fromVertexes; This value is used for TreeLayout#path.*/
+        /**The children of a TreeVertex are its LayoutVertex.sourceVertexes, the collection of connected LayoutEdge.fromVertexes; This value is used for TreeLayout.path.*/
         static PathSource: EnumValue;
 
-        /**Lay out each child according to the sort order given by TreeVertex#comparer; This value is used for TreeLayout#sorting or TreeLayout#alternateSorting.*/
+        /**Lay out each child according to the sort order given by TreeVertex.comparer; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
         static SortingAscending: EnumValue;
 
-        /**Lay out each child in reverse sort order given by TreeVertex#comparer; This value is used for TreeLayout#sorting or TreeLayout#alternateSorting.*/
+        /**Lay out each child in reverse sort order given by TreeVertex.comparer; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
         static SortingDescending: EnumValue;
 
-        /**Lay out each child in the order in which they were found; This value is used for TreeLayout#sorting or TreeLayout#alternateSorting.*/
+        /**Lay out each child in the order in which they were found; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
         static SortingForwards: EnumValue;
 
-        /**Lay out each child in reverse order from which they were found; This value is used for TreeLayout#sorting or TreeLayout#alternateSorting.*/
+        /**Lay out each child in reverse order from which they were found; This value is used for TreeLayout.sorting or TreeLayout.alternateSorting.*/
         static SortingReverse: EnumValue;
 
-        /**Alternate layers of the tree have different properties, typically including the angle; This value is used for TreeLayout#treeStyle.*/
+        /**Alternate layers of the tree have different properties, typically including the angle; This value is used for TreeLayout.treeStyle.*/
         static StyleAlternating: EnumValue;
 
-        /**Just like the standard layered tree style, except that the nodes with children but no grandchildren have alternate properties; This value is used for TreeLayout#treeStyle.*/
+        /**Just like the standard layered tree style, except that the nodes with children but no grandchildren have alternate properties; This value is used for TreeLayout.treeStyle.*/
         static StyleLastParents: EnumValue;
 
-        /**The normal tree style, where all of the children of each TreeVertex are lined up horizontally or vertically; This value is used for TreeLayout#treeStyle.*/
+        /**The normal tree style, where all of the children of each TreeVertex are lined up horizontally or vertically; This value is used for TreeLayout.treeStyle.*/
         static StyleLayered: EnumValue;
 
-        /**All of the nodes get the alternate properties, except the root node gets the default properties; This value is used for TreeLayout#treeStyle.*/
+        /**All of the nodes get the alternate properties, except the root node gets the default properties; This value is used for TreeLayout.treeStyle.*/
         static StyleRootOnly: EnumValue;
     }
 
@@ -6263,7 +6932,7 @@ declare module go {
         /**
         * Commits the position of the Link and routes it.
         */
-        commit();
+        commit(): void;
     }
 
     /** This holds TreeLayout-specific information about Nodes.*/
@@ -6279,20 +6948,20 @@ declare module go {
         /**Gets or sets how broad a node and its descendants should be.*/
         breadthLimit: number;
 
-        /**Gets or sets the spot that children nodes' ports get as their ToSpot, if #setsChildPortSpot is true and the node has only a single port.*/
+        /**Gets or sets the spot that children nodes' ports get as their ToSpot, if .setsChildPortSpot is true and the node has only a single port.*/
         childPortSpot: Spot;
 
         /**Gets or sets the logical children for this node.*/
-        children: any[];
+        children: Array<TreeVertex>;
 
-        /**Gets the number of immediate children this node has.*/
+        /**This read-only property returns the number of immediate children this node has.*/
         childrenCount: number;
 
         /**Gets or sets the space to leave between the node and the comments.*/
         commentMargin: number;
 
         /**Gets or sets an array of Nodes that will be positioned near this node.*/
-        comments: any[];
+        comments: Array<Node>;
 
         /**Gets or sets the space to leave between consecutive comments.*/
         commentSpacing: number;
@@ -6306,7 +6975,7 @@ declare module go {
         /**Gets or sets the number of descendants this node has.*/
         descendantCount: number;
 
-        /**Gets or sets whether this node has been initialized as part of TreeLayout#doLayout when building the tree structures.*/
+        /**Gets or sets whether this node has been initialized as part of TreeLayout.doLayout when building the tree structures.*/
         initialized: boolean;
 
         /**Gets or sets the distance between this node and its children.*/
@@ -6336,7 +7005,7 @@ declare module go {
         /**Gets or sets the logical parent for this node.*/
         parent: TreeVertex;
 
-        /**Gets or sets the spot that this node's port gets as its FromSpot, if #setsPortSpot is true and the node has only a single port.*/
+        /**Gets or sets the spot that this node's port gets as its FromSpot, if .setsPortSpot is true and the node has only a single port.*/
         portSpot: Spot;
 
         /**Gets or sets the position of this node relative to its parent node.*/
@@ -6367,56 +7036,56 @@ declare module go {
         * Copy inherited properties from another TreeVertex to this one.
         * @param {TreeVertex} copy
         */
-        copyInheritedPropertiesFrom(copy: TreeVertex);
+        copyInheritedPropertiesFrom(copy: TreeVertex): void;
     }
 
 
     /**
     * The ActionTool is responsible for handling and dispatching mouse events on GraphObjects
-    * that have GraphObject#isActionable set to true.
+    * that have GraphObject.isActionable set to true.
     * This is how one implements "controls", such as buttons or sliders or knobs, as GraphObjects
     * that can be inside Parts without interfering with the standard tool behaviors.
     */
     class ActionTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#actionTool.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.actionTool.
         */
         constructor();
 
         /**
-        * This tool can run when there is a mouse-down on an object with GraphObject#isActionable true or if the object is within a Panel that "isActionable".
+        * This tool can run when there is a mouse-down on an object with GraphObject.isActionable true or if the object is within a Panel that "isActionable".
         */
         canStart(): boolean;
 
         /**
-        * Call the GraphObject#actionCancel event if defined on the current object.
+        * Call the GraphObject.actionCancel event if defined on the current object.
         */
-        doCancel();
+        doCancel(): void;
 
         /**
-        * If there is a GraphObject found with GraphObject#isActionable set to true, call that object's GraphObject#actionDown event, if it exists.
+        * If there is a GraphObject found with GraphObject.isActionable set to true, call that object's GraphObject.actionDown event, if it exists.
         */
-        doMouseDown();
+        doMouseDown(): void;
 
         /**
-        * If this tool is active call GraphObject#actionMove, if it exists, on the active object.
+        * If this tool is active call GraphObject.actionMove, if it exists, on the active object.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
-        * Calls the GraphObject#actionUp event if defined, then effectively calls Tool#standardMouseClick to perform the normal click behaviors, and then stops this tool.
+        * Calls the GraphObject.actionUp event if defined, then effectively calls Tool.standardMouseClick to perform the normal click behaviors, and then stops this tool.
         */
-        doMouseUp();
+        doMouseUp(): void;
     }
 
     /**
     * The ClickCreatingTool lets the user create a node by clicking where they want the new node to be.
     * By default a double-click is required to start this tool;
-    * set #isDoubleClick to false if you want a single-click to create a node.
+    * set .isDoubleClick to false if you want a single-click to create a node.
     */
     class ClickCreatingTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#clickCreatingTool, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.clickCreatingTool, which you can modify.
         */
         constructor();
 
@@ -6427,17 +7096,17 @@ declare module go {
         isDoubleClick: boolean;
 
         /**
-        * This tool can run when the diagram is not read-only and supports creating new nodes, and when there has been a click (or double-click if #isDoubleClick is true) in the background of the diagram (not on a Part), and #archetypeNodeData is an object that can be copied and added to the model.
+        * This tool can run when the diagram is not read-only and supports creating new nodes, and when there has been a click (or double-click if .isDoubleClick is true) in the background of the diagram (not on a Part), and .archetypeNodeData is an object that can be copied and added to the model.
         */
         canStart(): boolean;
 
         /**
-        * Upon a click, call #insertPart and stop this tool.
+        * Upon a click, call .insertPart and stop this tool.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
-        * Create a node by adding a copy of the #archetypeNodeData object to the diagram's model, assign its Part#location to be the given point, and select the new part.
+        * Create a node by adding a copy of the .archetypeNodeData object to the diagram's model, assign its Part.location to be the given point, and select the new part.
         * @param {Point} loc a Point in document coordinates.
         */
         insertPart(loc: Point): Part;
@@ -6445,13 +7114,13 @@ declare module go {
 
     /**
     * The ClickSelectingTool selects and deselects Parts when there is a click.
-    * It does this by calling Tool#standardMouseSelect.
+    * It does this by calling Tool.standardMouseSelect.
     * It is also responsible for handling and dispatching click events on GraphObjects
-    * by calling Tool#standardMouseClick.
+    * by calling Tool.standardMouseClick.
     */
     class ClickSelectingTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#clickSelectingTool.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.clickSelectingTool.
         */
         constructor();
 
@@ -6461,9 +7130,9 @@ declare module go {
         canStart(): boolean;
 
         /**
-        * Upon a click, this calls Tool#standardMouseSelect to change the Diagram#selection collection, then calls Tool#standardMouseClick to perform the normal click behaviors, and then stops this tool.
+        * Upon a click, this calls Tool.standardMouseSelect to change the Diagram.selection collection, then calls Tool.standardMouseClick to perform the normal click behaviors, and then stops this tool.
         */
-        doMouseUp();
+        doMouseUp(): void;
     }
 
     /**
@@ -6472,150 +7141,169 @@ declare module go {
     */
     class ContextMenuTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#contextMenuTool, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.contextMenuTool, which you can modify.
         */
         constructor();
 
-        /**Gets the currently showing context menu, or null if there is none.*/
+        /**Gets or sets the currently showing context menu, or null if there is none.*/
         currentContextMenu: Adornment;
 
-        /**Gets the original mouse-down point in document coordinates.*/
+        /**Gets or sets the GraphObject found at the mouse point that has a context menu.*/
+        currentObject: GraphObject;
+
+        /**This read-only property returns the original mouse-down point in document coordinates.*/
         mouseDownPoint: Point;
 
         /**
-        * Return true if it's a mouse right click that hasn't moved Tool#isBeyondDragSize and that is on a GraphObject with a GraphObject#contextMenu.
+        * Return true if it's a mouse right click that hasn't moved Tool.isBeyondDragSize and that is on a GraphObject with a GraphObject.contextMenu.
         */
         canStart(): boolean;
 
         /**
         * Do nothing, activation is special and relies on doMouseUp
         */
-        doActivate();
+        doActivate(): void;
 
         /**
         * Handle mouse-enter, mouse-over, and mouse-leave events.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
-        * If there is something found by #findObjectWithContextMenu, call #showContextMenu with that object's GraphObject#contextMenu or Diagram#contextMenu.
+        * If there is something found by .findObjectWithContextMenu, call .showContextMenu with that object's GraphObject.contextMenu or Diagram.contextMenu.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
-        * Find a GraphObject at the current mouse point with a GraphObject#contextMenu, or return the Diagram if there is a Diagram#contextMenu.
+        * Find a GraphObject at the current mouse point with a GraphObject.contextMenu, or return the Diagram if there is a Diagram.contextMenu.
         */
-        findObjectWithContextMenu(): any;
+        findObjectWithContextMenu(): GraphObject | Diagram;
 
         /**
         * Hide any context menu.
         */
-        hideContextMenu();
+        hideContextMenu(): void;
 
         /**
         * Hide the default context menu.
         */
-        hideDefaultContextMenu();
+        hideDefaultContextMenu(): void;
 
         /**
-        * This is called by #showContextMenu to position the context menu within the viewport.
+        * This is called by .showContextMenu to position the context menu within the viewport.
         * @param {Adornment} contextmenu
         * @param {GraphObject} obj
         */
-        positionContextMenu(contextmenu: Adornment, obj: GraphObject);
+        positionContextMenu(contextmenu: Adornment, obj: GraphObject): void;
 
         /**
         * Show an Adornment as a context menu.
         * @param {Adornment} contextmenu
         * @param {GraphObject} obj
         */
-        showContextMenu(contextmenu: Adornment, obj: GraphObject);
+        showContextMenu(contextmenu: Adornment, obj: GraphObject): void;
 
         /**
         * Show a series of HTML elements acting as a context menu.
         */
-        showDefaultContextMenu();
+        showDefaultContextMenu(): void;
+    }
+
+    /**
+    * This helper structure for DraggingTool holds the original location Point.
+    */
+    interface DraggingInfo {  // undocumented
+        point: Point;
     }
 
     /**
     * The DraggingTool is used to move or copy selected parts with the mouse.
-    * Dragging the selection moves parts for which Part#canMove is true.
+    * Dragging the selection moves parts for which Part.canMove is true.
     * If the user holds down the Control key, this tool will make a copy of the parts being dragged,
-    * for those parts for which Part#canCopy is true.
+    * for those parts for which Part.canCopy is true.
     */
     class DraggingTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#draggingTool, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.draggingTool, which you can modify.
         */
         constructor();
 
-        /**Gets the collection of Parts that this tool has copied.*/
-        copiedParts: Map;
+        /**This read-only property returns the collection of Parts that this tool has copied.*/
+        copiedParts: Map<Part,DraggingInfo>;
 
         /**Gets or sets whether for a copying operation the extended selection is copied or only the selected parts.*/
         copiesEffectiveCollection: boolean;
 
-        /**Gets the Part found at the mouse point.*/
+        /**This read-only property returns the Part found at the mouse point.*/
         currentPart: Part;
 
         /**On touch gestures only, this property gets or sets the time in milliseconds for which the mouse must be stationary before this tool can be started.*/
         delay: number;
 
-        /**Gets the collection of Parts being dragged.*/
-        draggedParts: Map;
+        /**This read-only property returns the collection of Parts being dragged.*/
+        draggedParts: Map<Part,DraggingInfo>;
+
+        /**Gets or sets whether the user can drag a single Link, disconnecting it from its connected nodes and possibly connecting it to valid ports when the link is dropped.*/
+        dragsLink: boolean;
 
         /**Gets or sets whether moving or copying a node also includes all of the node's tree children and their descendants, along with the links to those additional nodes.*/
         dragsTree: boolean;
 
-        /**Gets or sets the size of the grid cell used when snapping during a drag if the value of #isGridSnapEnabled is true.*/
+        /**Gets or sets the size of the grid cell used when snapping during a drag if the value of .isGridSnapEnabled is true.*/
         gridSnapCellSize: Size;
 
-        /**Gets or sets the Spot that specifies what point in the grid cell dragged parts snap to, if the value of #isGridSnapEnabled is true.*/
+        /**Gets or sets the Spot that specifies what point in the grid cell dragged parts snap to, if the value of .isGridSnapEnabled is true.*/
         gridSnapCellSpot: Spot;
 
-        /**Gets or sets the snapping grid's origin point, in document coordinates, if the value of #isGridSnapEnabled is true.*/
+        /**Gets or sets the snapping grid's origin point, in document coordinates, if the value of .isGridSnapEnabled is true.*/
         gridSnapOrigin: Point;
 
+        /**Gets or sets whether for any internal copying operation is permitted by control-drag-and-drop.*/
+        isCopyEnabled: boolean;
+
         /**Gets or sets whether the DraggingTool snaps objects to grid points.*/
         isGridSnapEnabled: boolean;
 
         /**Gets or sets whether the DraggingTool snaps objects to grid points during the drag.*/
         isGridSnapRealtime: boolean;
 
+        /**Gets or sets the mouse point from which parts start to move.*/
+        startPoint: Point;
+
         /**
-        * This tool can run if the diagram allows selection and moves/copies/dragging-out, if the mouse has moved far enough away to be a drag and not a click, and if #findDraggablePart has found a selectable part at the mouse-down point.
+        * This tool can run if the diagram allows selection and moves/copies/dragging-out, if the mouse has moved far enough away to be a drag and not a click, and if .findDraggablePart has found a selectable part at the mouse-down point.
         */
         canStart(): boolean;
 
         /**
         * Find the actual collection of nodes and links to be moved or copied, given an initial collection.
-        * @param {Iterable} parts A Set or List of Parts.
+        * @param {Iterable<Part>} parts A Set or List of Parts.
         */
-        computeEffectiveCollection(parts: Iterable): Map;
+        computeEffectiveCollection(parts: Iterable<Part>): Map<Part,DraggingInfo>;
 
         /**
-        * This method computes the new location for a Node or simple Part, given a new desired location and an optional Map of dragged parts, taking any grid-snapping into consideration, any Part#dragComputation function, and any Part#minLocation and Part#maxLocation.
+        * This method computes the new location for a Node or simple Part, given a new desired location and an optional Map of dragged parts, taking any grid-snapping into consideration, any Part.dragComputation function, and any Part.minLocation and Part.maxLocation.
         * @param {Part} n
         * @param {Point} newloc
         * @param {Map=} draggedparts  an optional Map mapping Parts to JavaScript Objects that have a "point" property remembering the original location of that Part.
         * @param {Point=} result  an optional Point that is modified and returned
         */
-        computeMove(n: Part, newloc: Point, draggedparts?: Map, result?: Point): Point;
+        computeMove(n: Part, newloc: Point, draggedparts?: Map<Part,DraggingInfo>, result?: Point): Point;
 
         /**
         * Start the dragging operation.
         */
-        doActivate();
+        doActivate(): void;
 
         /**
         * Abort any dragging operation.
         */
-        doCancel();
+        doCancel(): void;
 
         /**
         * Stop the dragging operation by stopping the transaction and cleaning up any temporary state.
         */
-        doDeactivate();
+        doDeactivate(): void;
 
         /**
         * Perform any additional side-effects during a drag, whether an internal move or copy or an external drag, that may affect the existing non-moved object(s).
@@ -6623,10 +7311,10 @@ declare module go {
         * @param {GraphObject} obj the GraphObject at the point,
         * excluding what is being dragged or temporary objects;
         * the argument may be null if the drag is occurring in the background of the diagram.
-        * Use GraphObject#part to get the Node or Part at the root of
+        * Use GraphObject.part to get the Node or Part at the root of
         * the visual tree of the stationary object.
         */
-        doDragOver(pt: Point, obj: GraphObject);
+        doDragOver(pt: Point, obj: GraphObject): void;
 
         /**
         * Perform any additional side-effects after a drop, whether an internal move or copy or an external drop, that may affect the existing non-moved object(s).
@@ -6634,30 +7322,30 @@ declare module go {
         * @param {GraphObject} obj the GraphObject where the drop occurred,
         * excluding what was dropped or temporary objects;
         * the argument may be null if the drop occurred in the background of the diagram.
-        * Use GraphObject#part to get the Node or Part at the root of
+        * Use GraphObject.part to get the Node or Part at the root of
         * the visual tree of the stationary object.
         */
-        doDropOnto(pt: Point, obj: GraphObject);
+        doDropOnto(pt: Point, obj: GraphObject): void;
 
         /**
         * Handle switching between copying and moving modes as the Control key is pressed or released.
         */
-        doKeyDown();
+        doKeyDown(): void;
 
         /**
         * Handle switching between copying and moving modes as the Control key is pressed or released.
         */
-        doKeyUp();
+        doKeyUp(): void;
 
         /**
-        * Move the #draggedParts (or if copying, the #copiedParts) to follow the current mouse point.
+        * Move the .draggedParts (or if copying, the .copiedParts) to follow the current mouse point.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
         * On a mouse-up finish moving or copying the effective selection.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
         * Return the selectable and movable/copyable Part at the mouse-down point.
@@ -6678,41 +7366,41 @@ declare module go {
         Move a collection of Parts by a given offset.
         * @param {Map} parts  a Map mapping Parts to JavaScript Objects that have a "point" property remembering the original location of that Part.
         * @param {Point} offset
-        * @param {boolean} check  Whether to check Part#canMove on each part.
+        * @param {boolean} check  Whether to check Part.canMove on each part.
         */
-        moveParts(parts: Map, offset: Point, check: boolean);
+        moveParts(parts: Map<Part,DraggingInfo>, offset: Point, check: boolean): void;
 
         /**
         * This override prevents the Control modifier unselecting an already selected part.
         */
-        standardMouseSelect();
+        standardMouseSelect(): void;
     }
 
     /**
     * The DragSelectingTool lets the user select multiple parts with a rectangular area.
-    * There is a temporary part, the #box,
+    * There is a temporary part, the .box,
     * that shows the current area encompassed between the mouse-down
     * point and the current mouse point.
-    * The default drag selection box is a magenta rectangle.
-    * You can change the #box to customize its appearance -- see its documentation for an example.
+    * The default drag selection box is a blue rectangle.
+    * You can change the .box to customize its appearance -- see its documentation for an example.
     */
     class DragSelectingTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#dragSelectingTool, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.dragSelectingTool, which you can modify.
         */
         constructor();
 
-        /**Gets or sets the Part used as the "rubber-band selection box" that is stretched to follow the mouse, as feedback for what area will be passed to #selectInRect upon a mouse-up.*/
+        /**Gets or sets the Part used as the "rubber-band selection box" that is stretched to follow the mouse, as feedback for what area will be passed to .selectInRect upon a mouse-up.*/
         box: Part;
 
         /**Gets or sets the time in milliseconds for which the mouse must be stationary before this tool can be started.*/
         delay: number;
 
-        /**Gets or sets whether a selectable Part may be only partly or must be completely enclosed by the rectangle given to #selectInRect.*/
+        /**Gets or sets whether a selectable Part may be only partly or must be completely enclosed by the rectangle given to .selectInRect.*/
         isPartialInclusion: boolean;
 
         /**
-        * This tool can run when the diagram allows selection, there has been delay of at least #delay milliseconds after the mouse-down before a mouse-move, there has been a mouse-drag far enough away not to be a click, and there is no selectable part at the mouse-down point.
+        * This tool can run when the diagram allows selection, there has been delay of at least .delay milliseconds after the mouse-down before a mouse-move, there has been a mouse-drag far enough away not to be a click, and there is no selectable part at the mouse-down point.
         */
         canStart(): boolean;
 
@@ -6722,30 +7410,30 @@ declare module go {
         computeBoxBounds(): Rect;
 
         /**
-        * Capture the mouse and show the #box.
+        * Capture the mouse and show the .box.
         */
-        doActivate();
+        doActivate(): void;
 
         /**
-        * Release the mouse and remove any #box.
+        * Release the mouse and remove any .box.
         */
-        doDeactivate();
+        doDeactivate(): void;
 
         /**
-        * Update the #box's position and size according to the value of #computeBoxBounds.
+        * Update the .box's position and size according to the value of .computeBoxBounds.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
-        * Call #selectInRect with the value of a call to #computeBoxBounds.
+        * Call .selectInRect with the value of a call to .computeBoxBounds.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
         * This method is called to select some parts within the area of a given rectangle.
         *@param {Rect} r
         */
-        selectInRect(r: Rect);
+        selectInRect(r: Rect): void;
     }
 
     /**
@@ -6760,22 +7448,25 @@ declare module go {
         /**Gets whether the linking operation is in the forwards direction, connecting from the "From" port to the "To" port.*/
         isForwards: boolean;
 
+        /**Gets or sets whether it is valid to have partly or completely unconnected links.*/
+        isUnconnectedLinkValid: boolean;
+
         /**Gets or sets a predicate that determines whether or not a new link between two ports would be valid.*/
         linkValidation: (fromNode: Node, fromPort: GraphObject, toNode: Node, toPort: GraphObject, link: Link) => boolean;
 
-        /**Gets or sets the original Node from which the new link is being drawn or from which the #originalLink was connected when being relinked.*/
+        /**Gets or sets the original Node from which the new link is being drawn or from which the .originalLink was connected when being relinked.*/
         originalFromNode: Node;
 
-        /**Gets or sets the GraphObject that is the port in the #originalFromNode.*/
+        /**Gets or sets the GraphObject that is the port in the .originalFromNode.*/
         originalFromPort: GraphObject;
 
         /**Gets or sets the original Link being reconnected by the RelinkingTool.*/
         originalLink: Link;
 
-        /**Gets or sets the original Node to which the new link is being drawn or to which the #originalLink was connected when being relinked.*/
+        /**Gets or sets the original Node to which the new link is being drawn or to which the .originalLink was connected when being relinked.*/
         originalToNode: Node;
 
-        /**Gets or sets the GraphObject that is the port in the #originalToNode.*/
+        /**Gets or sets the GraphObject that is the port in the .originalToNode.*/
         originalToPort: GraphObject;
 
         /**Gets or sets the distance at which link snapping occurs.*/
@@ -6787,19 +7478,19 @@ declare module go {
         /**Gets or sets a proposed GraphObject port for connecting a link.*/
         targetPort: GraphObject;
 
-        /**Gets or sets the temporary Node at the "from" end of the #temporaryLink while the user is drawing or reconnecting a link.*/
+        /**Gets or sets the temporary Node at the "from" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
         temporaryFromNode: Node;
 
-        /**Gets or sets the GraphObject that is the port at the "from" end of the #temporaryLink while the user is drawing or reconnecting a link.*/
+        /**Gets or sets the GraphObject that is the port at the "from" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
         temporaryFromPort: GraphObject;
 
         /**Gets or sets the temporary Link that is shown while the user is drawing or reconnecting a link.*/
         temporaryLink: Link;
 
-        /**Gets or sets the temporary Node at the "to" end of the #temporaryLink while the user is drawing or reconnecting a link.*/
+        /**Gets or sets the temporary Node at the "to" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
         temporaryToNode: Node;
 
-        /**Gets or sets the GraphObject that is the port at the "to" end of the #temporaryLink while the user is drawing or reconnecting a link.*/
+        /**Gets or sets the GraphObject that is the port at the "to" end of the .temporaryLink while the user is drawing or reconnecting a link.*/
         temporaryToPort: GraphObject;
 
         /**
@@ -6810,12 +7501,12 @@ declare module go {
         * @param {GraphObject} tempport
         * @param {boolean} toend
         */
-        copyPortProperties(realnode: Node, realport: GraphObject, tempnode: Node, tempport: GraphObject, toend: boolean);
+        copyPortProperties(realnode: Node, realport: GraphObject, tempnode: Node, tempport: GraphObject, toend: boolean): void;
 
         /**
         * Mouse movement results in a temporary node moving to where a valid target port is located, or to where the mouse is if there is no valid target port nearby.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
         * Find a port with which the user could complete a valid link.
@@ -6837,13 +7528,24 @@ declare module go {
         */
         isLinked(fromport: GraphObject, toport: GraphObject): boolean;
 
+        /**
+        * Checks whether a proposed link would be valid according to Diagram.validCycle.
+        * This does not distinguish between different ports on a node, so this method does not need to take port arguments.
+        * This is called by isValidLink.
+        * @param {Node} from
+        * @param {Node} to
+        * @param {Link} ignore may be null; this is useful during relinking to ignore the originalLink
+        * @return {boolean}
+        */
+        isValidCycle(from: Node, to: Node, ignore: Link): boolean;
+
         /**
         * This predicate is true if it is permissible to connect a link from a given node/port.
         * @param {Node} fromnode
         * @param {GraphObject} fromport
-        * False if the node is in a Layer that does not Layer#allowLink.
-        * False if the port's GraphObject#fromLinkable is either false or null.
-        * False if the number of links connected to the port would exceed the port's GraphObject#fromMaxLinks.
+        * False if the node is in a Layer that does not Layer.allowLink.
+        * False if the port's GraphObject.fromLinkable is either false or null.
+        * False if the number of links connected to the port would exceed the port's GraphObject.fromMaxLinks.
         * Otherwise true.
         */
         isValidFrom(fromnode: Node, fromport: GraphObject): boolean;
@@ -6854,14 +7556,14 @@ declare module go {
         * @param {GraphObject} fromport the "from" GraphObject port.
         * @param {Node} tonode the "to" Node.
         * @param {GraphObject} toport the "to" GraphObject port.
-        * False if #isValidFrom is false for the "from" node/port.
-        * False if #isValidTo is false for the "to" node/port.
-        * False if #isInSameNode is true unless GraphObject#fromLinkableSelfNode
-        * and GraphObject#toLinkableSelfNode are true for the two ports.
-        * False if #isLinked is true unless GraphObject#fromLinkableDuplicates
-        * and GraphObject#toLinkableDuplicates are true for the two ports.
+        * False if .isValidFrom is false for the "from" node/port.
+        * False if .isValidTo is false for the "to" node/port.
+        * False if .isInSameNode is true unless GraphObject.fromLinkableSelfNode
+        * and GraphObject.toLinkableSelfNode are true for the two ports.
+        * False if .isLinked is true unless GraphObject.fromLinkableDuplicates
+        * and GraphObject.toLinkableDuplicates are true for the two ports.
         * False if trying to link to the link's own label node(s).
-        * If #linkValidation is a predicate and if it returns false, this predicate returns false.
+        * If .linkValidation is a predicate and if it returns false, this predicate returns false.
         * Otherwise this predicate is true.
         */
         isValidLink(fromnode: Node, fromport: GraphObject, tonode: Node, toport: GraphObject): boolean;
@@ -6870,9 +7572,9 @@ declare module go {
         * This predicate is true if it is permissible to connect a link to a given node/port.
         * @param {Node} tonode
         * @param {GraphObject} toport
-        * False if the node is in a Layer that does not Layer#allowLink.
-        * False if the port's GraphObject#toLinkable is either false or null.
-        * False if the number of links connected from the port would exceed the port's GraphObject#toMaxLinks.
+        * False if the node is in a Layer that does not Layer.allowLink.
+        * False if the port's GraphObject.toLinkable is either false or null.
+        * False if the number of links connected from the port would exceed the port's GraphObject.toMaxLinks.
         * Otherwise true.
         */
         isValidTo(tonode: Node, toport: GraphObject): boolean;
@@ -6883,7 +7585,7 @@ declare module go {
         * @param {GraphObject} tempport
         * @param {boolean} toend
         */
-        setNoTargetPortProperties(tempnode: Node, tempport: GraphObject, toend: boolean);
+        setNoTargetPortProperties(tempnode: Node, tempport: GraphObject, toend: boolean): void;
     }
 
     /**
@@ -6894,41 +7596,41 @@ declare module go {
     */
     class LinkingTool extends LinkingBaseTool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#linkingTool, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.linkingTool, which you can modify.
         */
         constructor();
 
-        /**Gets or sets an optional node data object representing a link label, that is copied by #insertLink and added to the GraphLinksModel when creating a new Link.*/
+        /**Gets or sets an optional node data object representing a link label, that is copied by .insertLink and added to the GraphLinksModel when creating a new Link.*/
         archetypeLabelNodeData: Object;
 
-        /**Gets or sets a data object that is copied by #insertLink and added to the GraphLinksModel when creating a new Link.*/
+        /**Gets or sets a data object that is copied by .insertLink and added to the GraphLinksModel when creating a new Link.*/
         archetypeLinkData: Object;
 
         /**Gets or sets the direction in which new links may be drawn.*/
         direction: EnumValue;
 
-        /**Gets or sets the GraphObject at which #findLinkablePort should start its search.*/
+        /**Gets or sets the GraphObject at which .findLinkablePort should start its search.*/
         startObject: GraphObject;
 
         /**
-        * This tool can run when the diagram allows linking, the model is modifiable, the left-button mouse drag has moved far enough away to not be a click, and when #findLinkablePort has returned a valid port.
+        * This tool can run when the diagram allows linking, the model is modifiable, the left-button mouse drag has moved far enough away to not be a click, and when .findLinkablePort has returned a valid port.
         */
         canStart(): boolean;
 
         /**
         * Start the linking operation.
         */
-        doActivate();
+        doActivate(): void;
 
         /**
         * Finishing the linking operation stops the transaction, releases the mouse, and resets the cursor.
         */
-        doDeactivate();
+        doDeactivate(): void;
 
         /**
-        * A mouse-up ends the linking operation; if there is a valid #targetPort nearby, this adds a new Link by calling #insertLink.
+        * A mouse-up ends the linking operation; if there is a valid .targetPort nearby, this adds a new Link by calling .insertLink.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
         * Return the GraphObject at the mouse-down point, if it is part of a node and if it is valid to link with it.
@@ -6936,7 +7638,7 @@ declare module go {
         findLinkablePort(): GraphObject;
 
         /**
-        * Make a copy of the #archetypeLinkData, set its node and port properties, and add it to the model.
+        * Make a copy of the .archetypeLinkData, set its node and port properties, and add it to the model.
         * @param {Node} fromnode
         * @param {GraphObject} fromport
         * @param {Node} tonode
@@ -6944,13 +7646,13 @@ declare module go {
         */
         insertLink(fromnode: Node, fromport: GraphObject, tonode: Node, toport: GraphObject): Link;
 
-        /**This value for LinkingTool#direction indicates that users may draw new links backwards only.*/
+        /**This value for LinkingTool.direction indicates that users may draw new links backwards only.*/
         static BackwardsOnly: EnumValue;
 
-        /**This value for LinkingTool#direction indicates that users may draw new links in either direction.*/
+        /**This value for LinkingTool.direction indicates that users may draw new links in either direction.*/
         static Either: EnumValue;
 
-        /**This value for LinkingTool#direction indicates that users may draw new links forwards only.*/
+        /**This value for LinkingTool.direction indicates that users may draw new links forwards only.*/
         static ForwardsOnly: EnumValue;
     }
 
@@ -6963,14 +7665,14 @@ declare module go {
     */
     class LinkReshapingTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#linkReshapingTool, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.linkReshapingTool, which you can modify.
         */
         constructor();
 
-        /**Gets the Link that is being routed manually.*/
+        /**This read-only property returns the Link that is being routed manually.*/
         adornedLink: Link;
 
-        /**Gets the GraphObject that is the tool handle being dragged by the user.*/
+        /**This read-only property returns the GraphObject that is the tool handle being dragged by the user.*/
         handle: GraphObject;
 
         /**Gets or sets a small GraphObject that is copied as a reshape handle at each movable point in the selected link's route.*/
@@ -6979,11 +7681,11 @@ declare module go {
         /**Gets or sets a small GraphObject that is copied as a resegment handle at each mid point in the selected Link's route.*/
         midHandleArchetype: GraphObject;
 
-        /**Gets the Point that was the original location of the handle that is being dragged to reshape the Link.*/
+        /**This read-only property returns the Point that was the original location of the handle that is being dragged to reshape the Link.*/
         originalPoint: Point;
 
-        /**Gets the List of Points that was the original route of the Link that is being reshaped.*/
-        originalPoints: List;
+        /**This read-only property returns the List of Points that was the original route of the Link that is being reshaped.*/
+        originalPoints: List<Point>;
 
         /**
         * This tool may run when there is a mouse-down event on a reshape handle.
@@ -6991,47 +7693,60 @@ declare module go {
         canStart(): boolean;
 
         /**
-        * This is called by #doMouseMove and #doMouseUp to limit the input point before calling #reshape.
+        * This is called by .doMouseMove and .doMouseUp to limit the input point before calling .reshape.
         * @param {Point} p
         */
         computeReshape(p: Point): Point;
 
         /**
-        * Start reshaping, if #findToolHandleAt finds a reshape handle at the mouse down point.
+        * Start reshaping, if .findToolHandleAt finds a reshape handle at the mouse down point.
         */
-        doActivate();
+        doActivate(): void;
 
         /**
         * Restore the link route to be the original points and stop this tool.
         */
-        doCancel();
+        doCancel(): void;
 
         /**
         * This stops the current reshaping operation with the link route shaped the way it is.
         */
-        doDeactivate();
+        doDeactivate(): void;
 
         /**
-        * Call #reshape with a new point determined by the mouse to change the route of the #adornedLink.
+        * Call .reshape with a new point determined by the mouse to change the route of the .adornedLink.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
-        * Reshape the route with a point based on the most recent mouse point by calling #reshape, and then raise a "LinkReshaped" DiagramEvent before stopping this tool.
+        * Reshape the route with a point based on the most recent mouse point by calling .reshape, and then raise a "LinkReshaped" DiagramEvent before stopping this tool.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
-        * Change the route of the #adornedLink by moving the point corresponding to the current #handle to be at the given Point.
+        * Get the permitted reshaping behavior for a particular reshape handle.
+        * @param {GraphObject} obj a reshape handle in the "LinkReshaping" Adornment.
+        */
+        getReshapingBehavior(obj: GraphObject): EnumValue;
+
+        /**
+        * Set the permitted reshaping behavior for a particular reshape handle.
+        * @param {GraphObject} obj a reshape handle in the "LinkReshaping" Adornment.
+        * @param {EnumValue} behavior one of LinkReshapingTool.All, .Vertical, .Horizontal, or .None
+        */
+        setReshapingBehavior(obj: GraphObject, behavior: EnumValue): void;
+
+        /**
+        * Change the route of the .adornedLink by moving the point corresponding to the current .handle to be at the given Point.
         * @param {Point} newPoint
         */
-        reshape(newPoint: Point);
+        reshape(newPoint: Point): void;
 
         /**
-        * Show an Adornment with reshape handles at each of the interesting points of the link's route, if the link is selected and visible and if Part#canReshape is true.
+        * Show an Adornment with reshape handles at each of the interesting points of the link's route, if the link is selected and visible and if Part.canReshape is true.
         * @param {Part} part
         */
-        updateAdornments(part: Part);
+        updateAdornments(part: Part): void;
 
         /**Allow dragging in any direction.*/
         static All: EnumValue;
@@ -7048,18 +7763,18 @@ declare module go {
 
     /**
     * The PanningTool supports manual panning, where the user can shift the
-    * Diagram#position by dragging the mouse.
+    * Diagram.position by dragging the mouse.
     */
     class PanningTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#panningTool.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.panningTool.
         */
         constructor();
 
         /**Gets or sets whether panning actions will allow events to bubble instead of panning in the diagram.*/
         bubbles: boolean;
 
-        /**Gets the Point that was the original value of Diagram#position when the panning operation started.*/
+        /**This read-only property returns the Point that was the original value of Diagram.position when the panning operation started.*/
         originalPosition: Point;
 
         /**
@@ -7068,45 +7783,45 @@ declare module go {
         canStart(): boolean;
 
         /**
-        * Capture the mouse, change the diagram cursor, and remember the Diagram#position.
+        * Capture the mouse, change the diagram cursor, and remember the Diagram.position.
         */
-        doActivate();
+        doActivate(): void;
 
         /**
-        * Restore the Diagram#position to what it was when this tool activated.
+        * Restore the Diagram.position to what it was when this tool activated.
         */
-        doCancel();
+        doCancel(): void;
 
         /**
         * Release the mouse and restore the default diagram cursor.
         */
-        doDeactivate();
+        doDeactivate(): void;
 
         /**
-        * Modify the Diagram#position according to how much the mouse has moved.
+        * Modify the Diagram.position according to how much the mouse has moved.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
-        * Modify the Diagram#position according to how much the mouse has moved.
+        * Modify the Diagram.position according to how much the mouse has moved.
         */
-        doMouseUp();
+        doMouseUp(): void;
     }
 
     /**
     * The RelinkingTool allows the user to reconnect an existing Link
-    * if the Link#relinkableTo and/or Link#relinkableFrom properties are true.
+    * if the Link.relinkableTo and/or Link.relinkableFrom properties are true.
     */
     class RelinkingTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#relinkingTool, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.relinkingTool, which you can modify.
         */
         constructor();
 
         /**Gets or sets a small GraphObject that is copied as a relinking handle for the selected link path at the "from" end of the link.*/
         fromHandleArchetype: GraphObject;
 
-        /**Gets the GraphObject that is the tool handle being dragged by the user.*/
+        /**This read-only property returns the GraphObject that is the tool handle being dragged by the user.*/
         handle: GraphObject;
 
         /**Gets or sets a small GraphObject that is copied as a relinking handle for the selected link path at the "to" end of the link.*/
@@ -7117,20 +7832,27 @@ declare module go {
         */
         canStart(): boolean;
 
+        /**
+        * Make a temporary link look and act like the real Link being relinked.
+        * @param {Link} reallink
+        * @param {Link} templink
+        */
+        copyLinkProperties(reallink: Link, templink: Link): void;
+
         /**
         * Start the relinking operation.
         */
-        doActivate();
+        doActivate(): void;
 
         /**
         * Finishing the linking operation stops the transaction, releases the mouse, and resets the cursor.
         */
-        doDeactivate();
+        doDeactivate(): void;
 
         /**
-        * A mouse-up ends the relinking operation; if there is a valid #targetPort nearby, this modifies the old link to connect with the target port.
+        * A mouse-up ends the relinking operation; if there is a valid .targetPort nearby, this modifies the old link to connect with the target port.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
         * Modify an existing Link to connect to a new node and port.
@@ -7145,7 +7867,7 @@ declare module go {
         * Show an Adornment for each end of the Link that the user may reconnect.
         * @param {Part} part
         */
-        updateAdornments(part: Part);
+        updateAdornments(part: Part): void;
     }
 
     /**
@@ -7155,17 +7877,17 @@ declare module go {
     */
     class ResizingTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#resizingTool, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.resizingTool, which you can modify.
         */
         constructor();
 
-        /**Gets the GraphObject that is being resized.*/
+        /**This read-only property returns the GraphObject that is being resized.*/
         adornedObject: GraphObject;
 
         /**Gets or sets the width and height multiples with which the user must resize.*/
         cellSize: Size;
 
-        /**Gets the GraphObject that is the tool handle being dragged by the user.*/
+        /**This read-only property returns the GraphObject that is the tool handle being dragged by the user.*/
         handle: GraphObject;
 
         /**Gets or sets a small GraphObject that is copied as a resizing handle for the selected part.*/
@@ -7180,10 +7902,10 @@ declare module go {
         /**Gets or sets the minimum size to which the user can resize.*/
         minSize: Size;
 
-        /**Gets the Size that was the original value of the GraphObject#desiredSize of the element that is being resized.*/
+        /**This read-only property returns the Size that was the original value of the GraphObject.desiredSize of the element that is being resized.*/
         originalDesiredSize: Size;
 
-        /**Gets the Point that was the original value of the Part#location of the Part that is being resized.*/
+        /**This read-only property returns the Point that was the original value of the Part.location of the Part that is being resized.*/
         originalLocation: Point;
 
         /**
@@ -7197,12 +7919,12 @@ declare module go {
         computeCellSize(): Size;
 
         /**
-        * The effective maximum resizing size is the minimum of the #maxSize and the #adornedObject's GraphObject#maxSize.
+        * The effective maximum resizing size is the minimum of the .maxSize and the .adornedObject's GraphObject.maxSize.
         */
         computeMaxSize(): Size;
 
         /**
-        * The effective minimum resizing size is the maximum of #minSize and the #adornedObject's GraphObject#minSize.
+        * The effective minimum resizing size is the maximum of .minSize and the .adornedObject's GraphObject.minSize.
         */
         computeMinSize(): Size;
 
@@ -7210,64 +7932,64 @@ declare module go {
         * Given a Spot in the original bounds of the object being resized and a new Point, compute the new Rect.
         * @param {Point} newPoint a Point in local coordinates.
         * @param {Spot} spot the alignment spot of the handle being dragged.
-        * @param {Size} min the result of the call to #computeMinSize.
-        * @param {Size} max the result of the call to #computeMaxSize.
-        * @param {Size} cell the result of the call to #computeCellSize.
-        * @param {boolean} reshape true if the new size may change the aspect ratio from that of the natural bounds of the #adornedObject.
+        * @param {Size} min the result of the call to .computeMinSize.
+        * @param {Size} max the result of the call to .computeMaxSize.
+        * @param {Size} cell the result of the call to .computeCellSize.
+        * @param {boolean} reshape true if the new size may change the aspect ratio from that of the natural bounds of the .adornedObject.
         */
         computeResize(newPoint: Point, spot: Spot, min: Size, max: Size, cell: Size, reshape: boolean): Rect;
 
         /**
         * Capture the mouse, remember the object's original bounds, and start a transaction.\
         */
-        doActivate();
+        doActivate(): void;
 
         /**
         * Restore the original GraphObject's size.
         */
-        doCancel();
+        doCancel(): void;
 
         /**
         * Stop the current transaction and release the mouse.
         */
-        doDeactivate();
+        doDeactivate(): void;
 
         /**
-        * Call #resize with a new size determined by the current mouse point.
+        * Call .resize with a new size determined by the current mouse point.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
-        * Call #resize with the final bounds based on the most recent mouse point, commit the transaction, and raise the "PartResized" DiagramEvent.
+        * Call .resize with the final bounds based on the most recent mouse point, commit the transaction, and raise the "PartResized" DiagramEvent.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
-        * Change the size of the selected part's Part#resizeObject to have the given bounds.
+        * Change the size of the selected part's Part.resizeObject to have the given bounds.
         * @param {Rect} newr
         */
-        rezise(newr: Rect);
+        resize(newr: Rect): void;
 
         /**
-        * Show an Adornment with the resize handles at points along the edge of the bounds of the selected Part's Part#resizeObject.
+        * Show an Adornment with the resize handles at points along the edge of the bounds of the selected Part's Part.resizeObject.
         * @param {Part} part
         */
-        updateAdornments(part: Part);
+        updateAdornments(part: Part): void;
     }
 
     /**
-    * The RotatingTool is used to interactively change the GraphObject#angle of a GraphObject.
-    * This tool allows the user to rotate the Part#rotateObject of the selected Part.
+    * The RotatingTool is used to interactively change the GraphObject.angle of a GraphObject.
+    * This tool allows the user to rotate the Part.rotateObject of the selected Part.
     * Normally this works with Parts or Nodes; it does not make sense for Links.
-    * The Part must be Part#rotatable, which is false by default.
+    * The Part must be Part.rotatable, which is false by default.
     */
     class RotatingTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#rotatingTool, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.rotatingTool, which you can modify.
         */
         constructor();
 
-        /**Gets the GraphObject that is being rotated.*/
+        /**This read-only property returns the GraphObject that is being rotated.*/
         adornedObject: GraphObject;
 
         /**Gets or sets a small GraphObject that is copied as a rotation handle for the selected part.*/
@@ -7276,7 +7998,7 @@ declare module go {
         /**Gets or sets a small GraphObject that is copied as a rotation handle for the selected part.*/
         handleArchetype: GraphObject;
 
-        /**Gets the angle that was the original value of the GraphObject#angle of the GraphObject that is being rotated.*/
+        /**This read-only property returns the angle that was the original value of the GraphObject.angle of the GraphObject that is being rotated.*/
         originalAngle: number;
 
         /**Gets or sets the the closeness to a desired angle at which the angle is "snapped to".*/
@@ -7297,51 +8019,51 @@ declare module go {
         computeRotate(newPoint: Point): number;
 
         /**
-        * Capture the mouse, remember the original GraphObject#angle, and start a transaction.
+        * Capture the mouse, remember the original GraphObject.angle, and start a transaction.
         */
-        doActivate();
+        doActivate(): void;
 
         /**
-        * Restore the original GraphObject#angle of the adorned object.
+        * Restore the original GraphObject.angle of the adorned object.
         */
-        doCancel();
+        doCancel(): void;
 
         /**
         * Stop the current transaction and release the mouse.
         */
-        doDeactivate();
+        doDeactivate(): void;
 
         /**
-        * Call #rotate with a new angle determined by the current mouse point.
+        * Call .rotate with a new angle determined by the current mouse point.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
-        * Call #rotate with an angle based on the most recent mouse point, commit the transaction, and raise the "PartRotated" DiagramEvent.
+        * Call .rotate with an angle based on the most recent mouse point, commit the transaction, and raise the "PartRotated" DiagramEvent.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
-        * Change the angle of the selected part's Part#rotateObject.
+        * Change the angle of the selected part's Part.rotateObject.
         * @param {number} newangle
         */
-        rotate(newangle: number);
+        rotate(newangle: number): void;
 
         /**
-        * Show an Adornment with a rotate handle at a point to the side of the adorned object if the part is selected and visible and if Part#canRotate() is true.
+        * Show an Adornment with a rotate handle at a point to the side of the adorned object if the part is selected and visible and if Part.canRotate() is true.
         * @param {Part} part
         */
-        updateAdornments(part: Part);
+        updateAdornments(part: Part): void;
     }
 
     /**
     * The TextEditingTool is used to let the user interactively edit text in place.
     * You do not normally need to create an instance of this tool
-    * because one already exists as the ToolManager#clickSelectingTool.
+    * because one already exists as the ToolManager.clickSelectingTool.
     */
     class TextEditingTool extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the ToolManager#textEditingTool, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the ToolManager.textEditingTool, which you can modify.
         */
         constructor();
 
@@ -7362,48 +8084,48 @@ declare module go {
 
         /**
         * Finish editing by trying to accept the new text.
-        * @param {EnumValue} reason The reason must be either TextEditingTool#LostFocus,
-        * TextEditingTool#MouseDown, TextEditingTool#Tab, or TextEditingTool#Enter.
+        * @param {EnumValue} reason The reason must be either TextEditingTool.LostFocus,
+        * TextEditingTool.MouseDown, TextEditingTool.Tab, or TextEditingTool.Enter.
         */
-        acceptText(reason: EnumValue);
+        acceptText(reason: EnumValue): void;
 
         /**
-        * This may run when there is a mouse-click on a TextBlock for which the TextBlock#editable property is true in a Part that Part#isSelected.
+        * This may run when there is a mouse-click on a TextBlock for which the TextBlock.editable property is true in a Part that Part.isSelected.
         */
         canStart(): boolean;
 
         /**
         * Start editing the text for a TextBlock.
         */
-        doActivate();
+        doActivate(): void;
 
         /**
         * Abort any text editing operation.
         */
-        doCancel();
+        doCancel(): void;
 
         /**
         * Release the mouse.
         */
-        doDeactivate();
+        doDeactivate(): void;
 
         /**
-        * A click (mouse up) calls TextEditingTool#doActivate if this tool is not already active and if TextEditingTool#canStart returns true.
+        * A click (mouse up) calls TextEditingTool.doActivate if this tool is not already active and if TextEditingTool.canStart returns true.
         */
-        doMouseDown();
+        doMouseDown(): void;
 
         /**
-        * A click (mouse up) calls TextEditingTool#doActivate if this tool is not already active and if TextEditingTool#canStart returns true.
+        * A click (mouse up) calls TextEditingTool.doActivate if this tool is not already active and if TextEditingTool.canStart returns true.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
-        * This calls TextEditingTool#doActivate if there is a TextBlock supplied.
+        * This calls TextEditingTool.doActivate if there is a TextBlock supplied.
         */
-        doStart();
+        doStart(): void;
 
         /**
-        * This predicate checks any TextBlock#textValidation predicate and this tool's #textValidation predicate to make sure the TextBlock#text property may be set to the new string.
+        * This predicate checks any TextBlock.textValidation predicate and this tool's .textValidation predicate to make sure the TextBlock.text property may be set to the new string.
         * @param {TextBlock} textblock the TextBlock that is being edited.
         * @param {string} oldstr the previous string value.
         * @param {string} newstr the proposed new string value.
@@ -7419,10 +8141,10 @@ declare module go {
         /**The user has clicked somewhere else in the diagram.*/
         static MouseDown: EnumValue;
 
-        /**A single click on a TextBlock with TextBlock#editable property set to true will start in-place editing.*/
+        /**A single click on a TextBlock with TextBlock.editable property set to true will start in-place editing.*/
         static SingleClick: EnumValue;
 
-        /**A single click on a TextBlock with TextBlock#editable property set to true will start in-place editing, but only if the Part that the TextBlock is in is already selected.*/
+        /**A single click on a TextBlock with TextBlock.editable property set to true will start in-place editing, but only if the Part that the TextBlock is in is already selected.*/
         static SingleClickSelected: EnumValue;
 
         /**The user has typed TAB.*/
@@ -7431,7 +8153,7 @@ declare module go {
 
     /**
     * Tools handle mouse events and keyboard events.
-    * The currently running tool, Diagram#currentTool, receives all input events from the Diagram.
+    * The currently running tool, Diagram.currentTool, receives all input events from the Diagram.
     */
     class Tool {
         /**
@@ -7439,7 +8161,7 @@ declare module go {
         */
         constructor();
 
-        /**Gets the Diagram that owns this tool and for which this tool is handling input events.*/
+        /**This read-only property returns the Diagram that owns this tool and for which this tool is handling input events.*/
         diagram: Diagram;
 
         /**Gets or sets whether this tool is started and is actively doing something.*/
@@ -7451,13 +8173,13 @@ declare module go {
         /**Gets or sets the name of this tool.*/
         name: string;
 
-        /**Gets or sets the name of the transaction to be committed by #stopTransaction; if null, the transaction will be rolled back.*/
+        /**Gets or sets the name of the transaction to be committed by .stopTransaction; if null, the transaction will be rolled back.*/
         transactionResult: string;
 
         /**
         * This is called to cancel any running "WaitAfter" timer.
         */
-        cancelWaitAfter();
+        cancelWaitAfter(): void;
 
         /**
         * This predicate is used by the ToolManager to decide if this tool can be started mode-lessly by mouse and touch events.
@@ -7465,76 +8187,81 @@ declare module go {
         canStart(): boolean;
 
         /**
-        * This method is called by the diagram after setting Diagram#currentTool, to make the new tool active.
+        * This predicate determines whether or not to allow pinch zooming from a multi-touch event.
         */
-        doActivate();
+        canStartMultiTouch(): boolean;
+
+        /**
+        * This method is called by the diagram after setting Diagram.currentTool, to make the new tool active.
+        */
+        doActivate(): void;
 
         /**
         * The diagram will call this method when the user wishes to cancel the current tool's operation.
         */
-        doCancel();
+        doCancel(): void;
 
         /**
-        * This method is called by the diagram on the old tool when Diagram#currentTool is set to a new tool.
+        * This method is called by the diagram on the old tool when Diagram.currentTool is set to a new tool.
         */
-        doDeactivate();
+        doDeactivate(): void;
 
         /**
         * The diagram will call this method upon a key down event.
         */
-        doKeyDown();
+        doKeyDown(): void;
 
         /**
         * The diagram will call this method upon a key up event.
         */
-        doKeyUp();
+        doKeyUp(): void;
 
         /**
         * The diagram will call this method upon a mouse down event.
         */
-        doMouseDown();
+        doMouseDown(): void;
 
         /**
         * The diagram will call this method upon a mouse move event.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
         * The diagram will call this method upon a mouse up event.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
         * The diagram will call this method as the mouse wheel is rotated.
         */
-        doMouseWheel();
+        doMouseWheel(): void;
 
         /**
         * This method is called by the diagram when this tool becomes the current tool; you should not call this method.
         */
-        doStart();
+        doStart(): void;
 
         /**
         * This method is called by the diagram when this tool stops being the current tool; you should not call this method.
         */
-        doStop();
+        doStop(): void;
 
         /**
-        * This is called a certain delay after a call to #standardWaitAfter if there has not been any call to #cancelWaitAfter.
+        * This is called a certain delay after a call to .standardWaitAfter if there has not been any call to .cancelWaitAfter.
         */
-        doWaitAfter();
+        doWaitAfter(): void;
 
         /**
         * This convenience function finds the front-most GraphObject that is at a given point and that is part of an Adornment that is of a given category.
         * @param {Point} p a Point in document coordinates.
-        * @param {string} category the required Part#category of the Adornment.
+        * @param {string} category the required Part.category of the Adornment.
         */
         findToolHandleAt(p: Point, category: string): GraphObject;
 
         /**
         * Return true when the last mouse point is far enough away from the first mouse down point to constitute a drag operation instead of just a potential click.
-        * @param {Point=} first Point in view coordinates, defaults to Diagram#firstInput's InputEvent#viewPoint.
-        * @param {Point=} last Point in view coordinates, defaults to Diagram#lastInput's InputEvent#viewPoint.
+        * @param {Point=} first Point in view coordinates, defaults to Diagram.firstInput's InputEvent.viewPoint.
+        * @param {Point=} last Point in view coordinates, defaults to Diagram.lastInput's InputEvent.viewPoint.
         */
         isBeyondDragSize(first?: Point, last?: Point): boolean;
 
@@ -7544,42 +8271,52 @@ declare module go {
         * function to find target objects.
         * @param {function(GraphObject):boolean | null=} pred An optional custom predicate
         */
-        standardMouseClick(navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean);
+        standardMouseClick(navig?: (obj: GraphObject) => GraphObject, pred?: (obj: GraphObject) => boolean): void;
 
         /**
         * Implement the standard behavior for mouse enter, over, and leave events, where the mouse is moving but no button is pressed.
         */
-        standardMouseOver();
+        standardMouseOver(): void;
 
         /**
         * Implement the standard behavior for selecting parts with the mouse, depending on the control and shift modifier keys.
         */
-        standardMouseSelect();
+        standardMouseSelect(): void;
 
         /**
         * Implement the standard behavior for mouse wheel events.
         */
-        standardMouseWheel();
+        standardMouseWheel(): void;
 
         /**
-        * This is called to start a new timer to call #doWaitAfter after a given delay.
+        * Initiates pinch-zooming on multi-touch devices.
+        */
+        standardPinchZoomStart(): void;
+
+        /**
+        * Continues pinch-zooming (started by standardPinchZoomStart) on multi-touch devices.
+        */
+        standardPinchZoomMove(): void;
+
+        /**
+        * This is called to start a new timer to call .doWaitAfter after a given delay.
         * @param {number} delay in milliseconds
         */
-        standardWaitAfter(delay: number);
+        standardWaitAfter(delay: number): void;
 
         /**
-        * Call Diagram#startTransaction with the given transaction name.
+        * Call Diagram.startTransaction with the given transaction name.
         * @param {string=} tname a description of the transaction
         */
         startTransaction(tname?: string): boolean;
 
         /**
-        * If the Diagram#currentTool is this tool, stop this tool and start the Diagram#defaultTool by making it be the new current tool.
+        * If the Diagram.currentTool is this tool, stop this tool and start the Diagram.defaultTool by making it be the new current tool.
         */
-        stopTool();
+        stopTool(): void;
 
         /**
-        * If #transactionResult is null, call Diagram#rollbackTransaction, otherwise call Diagram#commitTransaction.
+        * If .transactionResult is null, call Diagram.rollbackTransaction, otherwise call Diagram.commitTransaction.
         */
         stopTransaction(): boolean;
 
@@ -7587,7 +8324,7 @@ declare module go {
         * The diagram asks each tool to update any adornments the tool might use for a given part.
         * @param {Part} part
         */
-        updateAdornments(part: Part);
+        updateAdornments(part: Part): void;
     }
 
     /**
@@ -7596,29 +8333,29 @@ declare module go {
     */
     class ToolManager extends Tool {
         /**
-        * You do not normally need to create an instance of this tool because one already exists as the Diagram#toolManager, which you can modify.
+        * You do not normally need to create an instance of this tool because one already exists as the Diagram.toolManager, which you can modify.
         */
         constructor();
 
-        /**Gets or sets the mode-less ActionTool, normally one of the #mouseDownTools.*/
+        /**Gets or sets the mode-less ActionTool, normally one of the .mouseDownTools.*/
         actionTool: ActionTool;
 
-        /**Gets or sets the mode-less ClickCreatingTool, normally one of the #mouseUpTools.*/
+        /**Gets or sets the mode-less ClickCreatingTool, normally one of the .mouseUpTools.*/
         clickCreatingTool: ClickCreatingTool;
 
-        /**Gets or sets the mode-less ClickSelectingTool, normally one of the #mouseUpTools.*/
+        /**Gets or sets the mode-less ClickSelectingTool, normally one of the .mouseUpTools.*/
         clickSelectingTool: ClickSelectingTool;
 
-        /**Gets or sets the mode-less ContextMenuTool, normally one of the #mouseUpTools.*/
+        /**Gets or sets the mode-less ContextMenuTool, normally one of the .mouseUpTools.*/
         contextMenuTool: ContextMenuTool;
 
-        /**Gets the currently showing tooltip, or null if there is none.*/
+        /**This read-only property returns the currently showing tooltip, or null if there is none.*/
         currentToolTip: Adornment;
 
-        /**Gets or sets the mode-less DraggingTool, normally one of the #mouseMoveTools.*/
+        /**Gets or sets the mode-less DraggingTool, normally one of the .mouseMoveTools.*/
         draggingTool: DraggingTool;
 
-        /**Gets or sets the mode-less DragSelectingTool, normally one of the #mouseMoveTools.*/
+        /**Gets or sets the mode-less DragSelectingTool, normally one of the .mouseMoveTools.*/
         dragSelectingTool: DragSelectingTool;
 
         /**Gets or sets the distance in view coordinates within which a mouse down-and-up is considered a click and beyond which a mouse movement is considered a drag.*/
@@ -7630,83 +8367,83 @@ declare module go {
         /**Gets or sets the time between when the mouse stops moving and a hover event, in milliseconds.*/
         hoverDelay: number;
 
-        /**Gets or sets the mode-less LinkingTool, normally one of the #mouseMoveTools.*/
+        /**Gets or sets the mode-less LinkingTool, normally one of the .mouseMoveTools.*/
         linkingTool: LinkingTool;
 
-        /**Gets or sets the mode-less LinkReshapingTool, normally one of the #mouseDownTools.*/
+        /**Gets or sets the mode-less LinkReshapingTool, normally one of the .mouseDownTools.*/
         linkReshapingTool: LinkReshapingTool;
 
-        /**Gets the list of Tools that might be started upon a mouse-down event.*/
-        mouseDownTools: List;
+        /**This read-only property returns the list of Tools that might be started upon a mouse-down event.*/
+        mouseDownTools: List<Tool>;
 
-        /**Gets the list of Tools that might be started upon a mouse-move event.*/
-        mouseMoveTools: List;
+        /**This read-only property returns the list of Tools that might be started upon a mouse-move event.*/
+        mouseMoveTools: List<Tool>;
 
-        /**Gets the list of Tools that might be started upon a mouse-up event.*/
-        mouseUpTools: List;
+        /**This read-only property returns the list of Tools that might be started upon a mouse-up event.*/
+        mouseUpTools: List<Tool>;
 
         /**Gets or sets the ToolManager's mouse wheel behavior.*/
         mouseWheelBehavior: EnumValue;
 
-        /**Gets or sets the mode-less PanningTool, normally one of the #mouseMoveTools.*/
+        /**Gets or sets the mode-less PanningTool, normally one of the .mouseMoveTools.*/
         panningTool: PanningTool;
 
-        /**Gets or sets the mode-less RelinkingTool, normally one of the #mouseDownTools.*/
+        /**Gets or sets the mode-less RelinkingTool, normally one of the .mouseDownTools.*/
         relinkingTool: RelinkingTool;
 
-        /**Gets or sets the mode-less ResizingTool, normally one of the #mouseDownTools.*/
+        /**Gets or sets the mode-less ResizingTool, normally one of the .mouseDownTools.*/
         resizingTool: ResizingTool;
 
-        /**Gets or sets the mode-less RotatingTool, normally one of the #mouseDownTools.*/
+        /**Gets or sets the mode-less RotatingTool, normally one of the .mouseDownTools.*/
         rotatingTool: RotatingTool;
 
-        /**Gets or sets the mode-less TextEditingTool, normally one of the #mouseUpTools.*/
+        /**Gets or sets the mode-less TextEditingTool, normally one of the .mouseUpTools.*/
         textEditingTool: TextEditingTool;
 
         /**
-        * This just calls CommandHandler#doKeyDown on the diagram's Diagram#commandHandler.
+        * This just calls CommandHandler.doKeyDown on the diagram's Diagram.commandHandler.
         */
-        doKeyDown();
+        doKeyDown(): void;
 
         /**
-        * This just calls CommandHandler#doKeyUp on the diagram's Diagram#commandHandler.
+        * This just calls CommandHandler.doKeyUp on the diagram's Diagram.commandHandler.
         */
-        doKeyUp();
+        doKeyUp(): void;
 
         /**
-        * Iterate over the #mouseDownTools list and start the first tool for which its Tool#canStart predicate returns true.
+        * Iterate over the .mouseDownTools list and start the first tool for which its Tool.canStart predicate returns true.
         */
-        doMouseDown();
+        doMouseDown(): void;
 
         /**
-        * Implement the standard behavior for mouse hover and mouse hold events, called by #doWaitAfter when the mouse has not moved for a period of time.
+        * Implement the standard behavior for mouse hover and mouse hold events, called by .doWaitAfter when the mouse has not moved for a period of time.
         */
-        doMouseHover();
+        doMouseHover(): void;
 
         /**
-        * Iterate over the #mouseMoveTools list and start the first tool for which its Tool#canStart predicate returns true.
+        * Iterate over the .mouseMoveTools list and start the first tool for which its Tool.canStart predicate returns true.
         */
-        doMouseMove();
+        doMouseMove(): void;
 
         /**
-        * Iterate over the #mouseUpTools list and start the first tool for which its Tool#canStart predicate returns true.
+        * Iterate over the .mouseUpTools list and start the first tool for which its Tool.canStart predicate returns true.
         */
-        doMouseUp();
+        doMouseUp(): void;
 
         /**
         * The diagram will call this method as the mouse wheel is rotated.
         */
-        doMouseWheel();
+        doMouseWheel(): void;
 
         /**
-        * Implement the standard behavior for tooltips, called by #doWaitAfter when the mouse has not moved for a period of time.
+        * Implement the standard behavior for tooltips, called by .doWaitAfter when the mouse has not moved for a period of time.
         */
-        doToolTip();
+        doToolTip(): void;
 
         /**
         * Implement the standard behavior for when the mouse has not moved for a period of time.
         */
-        doWaitAfter();
+        doWaitAfter(): void;
 
         /**
         * Find a mouse tool of a given name.
@@ -7717,19 +8454,19 @@ declare module go {
         /**
         * Hide any tooltip.
         */
-        hideToolTip();
+        hideToolTip(): void;
 
         /**
         * Initialize the three mouse tool lists with instances of the standard tools.
         */
-        initializeStandardTools();
+        initializeStandardTools(): void;
 
         /**
-        * This is called by #showToolTip to position the part within the viewport.
+        * This is called by .showToolTip to position the part within the viewport.
         * @param {Adornment} tooltip
         * @param {GraphObject} obj The GraphObject getting the tooltip.
         */
-        positionToolTip(tooltip: Adornment, obj: GraphObject);
+        positionToolTip(tooltip: Adornment, obj: GraphObject): void;
 
         /**
         * Replace a mouse tool of a given name with a new tool.
@@ -7744,54 +8481,81 @@ declare module go {
         * @param {Adornment} tooltip
         * @param {GraphObject} obj The GraphObject getting the tooltip; this is null if the tooltip is being shown for the diagram background.
         */
-        showToolTip(tooltip: Adornment, obj: GraphObject);
+        showToolTip(tooltip: Adornment, obj: GraphObject): void;
 
-        /**This value for #mouseWheelBehavior indicates that the mouse wheel events are ignored, although scrolling or zooming by other means may still be allowed.*/
+        /**This value for gestureBehavior indicates that the pointer/touch pinch gestures on the canvas intend to have no effect on the Diagram, but also no effect on the page.*/
+        static GestureCancel: EnumValue;
+
+        /**This value for gestureBehavior indicates that the pointer/touch pinch gestures on the canvas intend to have no effect on the Diagram, but will not be prevented, and may bubble up the page to have other effects (such as zooming the page).*/
+        static GestureNone: EnumValue;
+
+        /**This value for gestureBehavior indicates that the pointer/touch pinch gestures on the canvas intend to zoom the Diagram.*/
+        static GestureZoom: EnumValue;
+
+        /**This value for .mouseWheelBehavior indicates that the mouse wheel events are ignored, although scrolling or zooming by other means may still be allowed.*/
         static WheelNone: EnumValue;
 
-        /**This default value for #mouseWheelBehavior indicates that mouse wheel events scroll the diagram.*/
+        /**This default value for .mouseWheelBehavior indicates that mouse wheel events scroll the diagram.*/
         static WheelScroll: EnumValue;
 
-        /**This value for #mouseWheelBehavior indicates that the mouse wheel events change the scale of the diagram.*/
+        /**This value for .mouseWheelBehavior indicates that the mouse wheel events change the scale of the diagram.*/
         static WheelZoom: EnumValue;
     }
 
 
     /**
     * This interface is implemented by the List, Set, and Map
-    * classes; it provides the #iterator read-only property that returns an Iterator.
+    * classes; it provides the .iterator read-only property that returns an Iterator.
     */
-    class Iterable {
+    class Iterable<T> {
         /*This is an interface and thus does not have a constructor.*/
 
         /**Gets an Iterator that can iterate over the items in the collection.*/
-        iterator: Iterator;
+        iterator: Iterator<T>;
     }
 
     /**
     * This interface defines properties and methods for iterating over a collection;
-    * it provides the #next predicate and the #value read-only property.
+    * it provides the .next predicate and the .value read-only property.
     * Some Iterators also provide key property values along with each value.
     */
-    class Iterator extends Iterable {
+    class Iterator<T> extends Iterable<T> {
         /*This is an interface and thus does not have a constructor.*/
 
-        /**Gets the total number of items in the iterated collection.*/
+        /**This read-only property returns the total number of items in the iterated collection.*/
         count: number;
 
         /**Returns itself, which is convenient for code that expects an Iterable instead of an Iterator.*/
-        iterator: Iterator;
+        iterator: Iterator<T>;
 
-        /**Gets the current index to the item in the collection, assuming #next has just returned true.*/
-        key;
+        /**This read-only property returns the current index to the item in the collection, assuming .next has just returned true.*/
+        key: any;
 
-        /**Gets the current item in the collection, assuming #next has just returned true.*/
-        value;
+        /**This read-only property returns the current item in the collection, assuming .next has just returned true.*/
+        value: T;
+
+        /**
+        * This is true if all invocations of the given predicate on items in the collection are true.
+        * @param {(x: T) => boolean} pred
+        */
+        all(pred: (x: T) => boolean): boolean;
+
+        /**
+        * This is true if any invocation of the given predicate on items in the collection is true.
+        * @param {(x: T) => boolean} pred
+        */
+        any(pred: (x: T) => boolean): boolean;
+
+        /**
+        * Call the given function on each item in the collection.
+        * @param {(x: T) => void} func
+        */
+        each(func: (x: T) => void ): void;
 
         /**
         * Return the first item in the collection, or null if there is none.
         */
-        first(): any;
+        first(): T;
 
         /**
         * Call this method to advance the iterator to the next item in the collection.
@@ -7801,135 +8565,204 @@ declare module go {
         /**
         * Start this iterator all over again.
         */
-        reset();
+        reset(): void;
     }
 
     /**
     * An ordered iterable collection.
     * It optionally enforces the type of elements that may be added to the List.
     */
-    class List {
+    class List<T> {
         /**
         * This creates a List that checks the type of the values to be instances of a particular kind of Object.
         * @param {function(...)} type this must be a class function/constructor.
         */
-        constructor(type: new(...args: any[]) => Object);
+        constructor(type: Constructor);
         /**
         * This creates a List that may check the types of the values.
         * @param {string=} type if supplied, this must be one of: 'number', 'string', 'boolean', or 'function' for the value type.
         */
         constructor(type?: string);
 
-        /**Gets the length of the List.*/
+        /**This read-only property returns the length of the List.*/
         count: number;
 
+        /**This read-only property returns the length of the List. ES6-like synonym for count.*/
+        size: number;
+
         /**Gets an object that you can use for iterating over the List.*/
-        iterator: Iterator;
+        iterator: Iterator<T>;
 
         /**Gets an object that you can use for iterating over the List in backwards order.*/
-        iteratorBackwards: Iterator;
+        iteratorBackwards: Iterator<T>;
 
-        /**Gets the length of the List, a synonym for the #count property.*/
+        /**This read-only property returns the length of the List, a synonym for the .count property.*/
         length: number;
 
         /**
         * Adds a given value to the end of the List.
-        * @param {*} any
+        * @param {*} val
         */
-        add(val: any);
+        add(val: T): void;
 
         /**
         * Adds all of the values of a collection (either an Iterable or an Array) to the end of this List.
-        * @param {Iterable|Array} coll
+        * @param {Iterable<T>|Array<T>} coll
         */
-        addAll(coll: any): List;
+        addAll(coll: Iterable<T> | Array<T>): List<T>;
+
+        /**
+        * This is true if all invocations of the given predicate on items in the collection are true.
+        * @param {(x: T) => boolean} pred
+        */
+        all(pred: (x: T) => boolean): boolean;
+
+        /**
+        * This is true if any invocation of the given predicate on items in the collection is true.
+        * @param {(x: T) => boolean} pred
+        */
+        any(pred: (x: T) => boolean): boolean;
 
         /**
         * Clears the List.
         */
-        clear();
+        clear(): void;
 
         /**
         * Returns whether the given value is in this List.
-        * @param {*} any
+        * @param {*} val
         */
-        contains(val: any): boolean;
+        contains(val: T): boolean;
 
         /**
         * Makes a shallow copy of this List.
         */
-        copy(): List;
+        copy(): List<T>;
+
+        /**
+        * Removes a given value (if found) from the List. ES6-like synonym for remove.
+        * @param {*} val
+        */
+        delete(val: T): boolean;
+
+        /**
+        * Call the given function on each item in the collection.
+        * @param {(x: T) => void} func
+        */
+        each(func: (x: T) => void ): void;
 
         /**
         * Returns the element at the given index.
         * @param {number} i
         */
-        elt(i: number);
+        elt(i: number): T;
 
         /**
-        * Returns the first item in the collection, or null if there is none.
+        * Returns the first item in the list, or null if there is none.
         */
-        first();
+        first(): T;
+
+        /**
+        * Returns the element at the given index. ES6-like synonym for elt.
+        * @param {number} i
+        */
+        get(i: number): T;
+
+        /**
+        * Returns whether the given value is in this List. ES6-like synonym for contains.
+        * @param {*} val
+        */
+        has(val: T): boolean;
 
         /**
         * Returns the index of the given value if it is in this List.
-        * @param {*} any
+        * @param {*} val
         */
-        indexOf(val: any): number;
+        indexOf(val: T): number;
 
         /**
         * Insert a value before the index i.
         * @param {number} i
-        * @param {*} any
+        * @param {*} val
         */
-        insertAt(i: number, val: any);
+        insertAt(i: number, val: T): void;
+
+        /**
+        * Returns the last item in the list, or null if there is none.
+        */
+        last(): T;
+
+        /**
+        * Returns the last item in the list and removes it from the list, or just return null if there is none.
+        */
+        pop(): T;
+
+        /**
+        * Add an item at the end of the list -- a synonym for add.
+        */
+        push(val: T): void;
 
         /**
         * Removes a given value (if found) from the List.
-        * @param {*} any
+        * @param {*} val
         */
-        remove(val: any): boolean;
+        remove(val: T): boolean;
 
         /**
         * Removes a value at a given index from the List.
         * @param {number} i
         */
-        removeAt(i: number);
+        removeAt(i: number): void;
 
         /**
         * Removes a range of values from the List.
         * @param {number} to
         * @param {number} from
         */
-        removeRange(to: number, from: number);
+        removeRange(to: number, from: number): void;
 
         /**
         * Reverse the order of items in this List.
         */
-        reverse(): List;
+        reverse(): List<T>;
+
+        /**
+        * Set the element at the given index to a given value. ES6-like synonym for setElt.
+        * @param {number} i
+        * @param {*} val
+        */
+        set(i: number, val: T): void;
 
         /**
         * Set the element at the given index to a given value.
         * @param {number} i
         * @param {*} val
         */
-        setElt(i: number, val: any);
+        setElt(i: number, val: T): void;
 
         /**
         * Sort the List according to a comparison function.
         * @param {function(*,*):number} sortfunc the same kind of function as passed to Array.sort
         */
-        sort(sortfunc: (a: any, b: any) => number): List;
+        sort(sortfunc: (a: T, b: T) => number): List<T>;
 
         /**
         * Produces a JavaScript Array from the contents of this List.
         */
-        toArray(): any[];
+        toArray(): Array<T>;
 
         /**
         * Converts the List to a Set.
         */
-        toSet(): Set;
+        toSet(): Set<T>;
+    }
+
+    /**
+    * This is a structure used by Map to hold key-value pairs.
+    */
+    interface KeyValuePair<K,V> {  // undocumented
+        key: K;
+        value: V;
     }
 
     /**
@@ -7937,25 +8770,25 @@ declare module go {
     * same key.
     * It optionally enforces the type of the key and the type of the associated value.
     */
-    class Map {
+    class Map<K,V> {
         /**
         * This creates a Map that may check the types of the keys and/or values.
         * @param {function(...)} keytype if supplied, this must be a class function/constructor.
         * @param {function(...)} valtype if supplied, this must be a class function/constructor.
         */
-        constructor(keytype: new(...args: any[]) => Object, valtype: new(...args: any[]) => Object);
+        constructor(keytype: Constructor, valtype: Constructor);
         /**
         * This creates a Map that may check the types of the keys and/or values.
         * @param {string=} keytype if supplied, this must be one of: 'number' or 'string' for the key type.
         * @param {function(...)} valtype if supplied, this must be a class function/constructor.
         */
-        constructor(keytype: string, valtype: new(...args: any[]) => Object);
+        constructor(keytype: string, valtype: Constructor);
         /**
         * This creates a Map that may check the types of the keys and/or values.
         * @param {function(...)} keytype if supplied, this must be a class function/constructor.
         * @param {string} valtype if supplied, this must be one of: 'number', 'string', 'boolean', or 'function' for the value type.
         */
-        constructor(keytype: new(...args: any[]) => Object, valtype: string);
+        constructor(keytype: Constructor, valtype: string);
         /**
         * This creates a Map that may check the types of the keys and/or values.
         * @param {string=} keytype if supplied, this must be one of: 'number' or 'string' for the key type.
@@ -7963,161 +8796,257 @@ declare module go {
         */
         constructor(keytype?: string, valtype?: string);
 
-        /**Gets the number of associations in the Map.*/
+        /**This read-only property returns the number of associations in the Map.*/
         count: number;
 
-        /**Gets an object that you can use for iterating over the Map.*/
-        iterator: Iterator;
+        /**Gets an object that you can use for iterating over the key-value pairs of the Map.*/
+        iterator: Iterator<KeyValuePair<K,V>>;
+
+        /**Gets an object that you can use for iterating over the keys in the Map.*/
+        iteratorKeys: Iterator<K>;
+
+        /**Gets an object that you can use for iterating over the values of the Map.*/
+        iteratorValues: Iterator<V>;
+
+        /**This read-only property returns the number of associations in the Map. ES6-like synonym for count.*/
+        size: number;
 
         /**
         * Adds a key-value association to the Map, or replaces the value associated with the key if the key was already present in the map.
-        * @param {*} any
+        * @param {*} key
         * @param {*} val
         */
-        add(key: any, val: any): boolean;
+        add(key: K, val: V): boolean;
 
         /**
         * Adds all of the key-value pairs of another Map to this Map.
-        * @param {Map} map
+        * @param {Map|Array} map
         */
-        addAll(map: Map): Map;
+        addAll(map: Map<K, V> | Array<KeyValuePair<K, V>>): Map<K,V>;
+
+        /**
+        * This is true if all invocations of the given predicate on key-value pairs in the collection are true.
+        * @param {(x: Object) => boolean} pred
+        */
+        all(pred: (x: Object) => boolean): boolean;
+
+        /**
+        * This is true if any invocation of the given predicate on key-value pairs in the collection is true.
+        * @param {(x: Object) => boolean} pred
+        */
+        any(pred: (x: Object) => boolean): boolean;
 
         /**
         * Clears the Map, removing all key-value associations.
         */
-        clear();
+        clear(): void;
 
         /**
         * Returns whether the given key is in this Map.
-        * @param {*} any
+        * @param {*} key
         */
-        contains(key: any): boolean;
+        contains(key: K): boolean;
 
         /**
         * Makes a shallow copy of this Map.
         */
-        copy(): Map;
+        copy(): Map<K,V>;
+
+        /**
+        * Removes a key (if found) from the Map. ES6-like synonym for remove.
+        * @param {*} key
+        */
+        delete(key: K): boolean;
+
+        /**
+        * Call the given function on each key-value pair in the collection.
+        * @param {(x: Object) => void} func
+        */
+        each(func: (x: KeyValuePair<K,V>) => void ): void;
+
+        /**
+        * Returns the first key-value pair in the collection, or null if there is none.
+        */
+        first(): KeyValuePair<K,V>;
+
+        /**
+        * Returns the value associated with a key. ES6-like synonym for getValue.
+        * @param {*} key
+        */
+        get(key: K): V;
 
         /**
         * Returns the value associated with a key.
-        * @param {*} any
+        * @param {*} key
         */
-        getValue(key: any);
+        getValue(key: K): V;
+
+        /**
+        * Returns whether the given key is in this Map. ES6-like synonym for contains.
+        * @param {*} key
+        */
+        has(key: K): boolean;
 
         /**
         * Removes a key (if found) from the Map.
-        * @param {*} any
+        * @param {*} key
         */
-        remove(key: any): boolean;
+        remove(key: K): boolean;
+
+        /**
+        * Adds a key-value association to the Map, or replaces the value associated with the key if the key was already present in the map. ES6-like synonym for add.
+        * @param {*} key
+        * @param {*} val
+        */
+        set(key: K, val: V): boolean;
 
         /**
         * Produces a JavaScript Array of key/value pair objects from the contents of this Map.
         */
-        toArray(): any[];
+        toArray(): Array<KeyValuePair<K,V>>;
 
         /**
         * Produces a Set that provides a read-only view onto the keys of this Map.
         */
-        toKeySet(): Set;
+        toKeySet(): Set<K>;
     }
 
     /**
     * An unordered iterable collection that cannot contain two instances of the same kind of value.
     * It optionally enforces the type of elements that may be added to the Set.
     */
-    class Set {
+    class Set<T> {
         /**
         * This creates a Set that checks the type of the values.
         * @param {function(...)} type this must be a class function/constructor.
         */
-        constructor(type: new(...args: any[]) => Object);
+        constructor(type: Constructor);
         /**
         * This creates a Set that may check the types of the values.
         * @param {string=} type if supplied, this must be one of: 'number' or 'string' for the key type.
         */
         constructor(type?: string);
 
-        /**Gets the number of elements in the Set.*/
+        /**This read-only property returns the number of elements in the Set.*/
         count: number;
 
         /**Gets an object that you can use for iterating over the Set.*/
-        iterator: Iterator;
+        iterator: Iterator<T>;
+
+        /**This read-only property returns the number of elements in the Set. ES6-like synonym for count.*/
+        size: number;
 
         /**
         * Adds a given value to the Set, if not already present.
-        * @param {*} any
+        * @param {*} val
         */
-        add(val: any): boolean;
+        add(val: T): boolean;
 
         /**
         * Adds all of the values of a collection (either an Iterable or an Array) to this Set.
-        * @param {Iterable|Array} coll
+        * @param {Iterable<T>|Array<T>} coll
         */
-        addAll(coll: any): Set;
+        addAll(coll: Iterable<T> | Array<T>): Set<T>;
+
+        /**
+        * This is true if all invocations of the given predicate on items in the collection are true.
+        * @param {(x: T) => boolean} pred
+        */
+        all(pred: (x: T) => boolean): boolean;
+
+        /**
+        * This is true if any invocation of the given predicate on items in the collection is true.
+        * @param {(x: T) => boolean} pred
+        */
+        any(pred: (x: T) => boolean): boolean;
 
         /**
         * Clears the Set.
         */
-        clear();
+        clear(): void;
 
         /**
         * Returns whether the given value is in this Set.
-        * @param {*} any
+        * @param {*} val
         */
-        contains(val: any): boolean;
+        contains(val: T): boolean;
 
         /**
         * Returns true if all of the values of a given collection are in this Set.
-        * @param {Iterable} coll
+        * @param {Iterable<T>} coll
         */
-        containsAll(coll: Iterable): boolean;
+        containsAll(coll: Iterable<T>): boolean;
 
         /**
         * Returns true if any of the values of a given collection are in this Set.
-        * @param {Iterable} coll
+        * @param {Iterable<T>} coll
         */
-        containsAny(coll: Iterable): boolean;
+        containsAny(coll: Iterable<T>): boolean;
 
         /**
         * Makes a shallow copy of this Set.
         */
-        copy(): Set;
+        copy(): Set<T>;
+
+        /**
+        * Removes a value (if found) from the Set. ES6-like synonym for remove.
+        * @param {*} val
+        */
+        delete(val: T): boolean;
+
+        /**
+        * Call the given function on each item in the collection.
+        * @param {(x: T) => void} func
+        */
+        each(func: (x: T) => void): void;
 
         /**
         * Returns the first item in the collection, or null if there is none.
         */
-        first();
+        first(): T;
+
+        /**
+        * Returns whether the given value is in this Set. ES6-like synonym for contains.
+        * @param {*} val
+        */
+        has(val: T): boolean;
 
         /**
         * Removes a value (if found) from the Set.
-        * @param {*} any
+        * @param {*} val
         */
-        remove(val: any): boolean;
+        remove(val: T): boolean;
 
         /**
         * Removes all of the values of a collection from this Set.
-        * @param {Iterable} coll
+        * @param {Iterable<T>} coll
         */
-        removeAll(coll: Iterable): Set;
+        removeAll(coll: Iterable<T>): Set<T>;
+
+        /**
+        * Removes all of the values of a collection from this Set.
+        * @param {Array<T>} coll
+        */
+        removeAll(coll: Array<T>): Set<T>;
 
         /**
         * Removes from this Set all items that are not in the given collection.
-        * @param {Iterable} coll
+        * @param {Iterable<T>} coll
         */
-        retainAll(coll: Iterable): Set;
+        retainAll(coll: Iterable<T>): Set<T>;
 
         /**
         * Produces a JavaScript Array from the contents of this Set.
         */
-        toArray(): any[];
+        toArray(): Array<T>;
 
         /**
         * Converts the Set to a List.
         */
-        toList(): List;
+        toList(): List<T>;
     }
 
-    class EnumValue {
+    class EnumValue {  // undocumented
         //Rawr!
     }
 } //END go
diff --git a/googlemaps/google.maps.d.ts b/googlemaps/google.maps.d.ts
index 39b85fd239..697a910710 100644
--- a/googlemaps/google.maps.d.ts
+++ b/googlemaps/google.maps.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Maps JavaScript API 3.19
+// Type definitions for Google Maps JavaScript API 3.20
 // Project: https://developers.google.com/maps/
 // Definitions by: Folia A/S <http://www.folia.dk>, Chris Wrench <https://github.com/cgwrench>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -28,59 +28,30 @@ THE SOFTWARE.
 */
 
 declare module google.maps {
-
-    /***** MVC *****/
-    export class MVCObject {
-        constructor ();
-        addListener(eventName: string, handler: (...args: any[]) => void): MapsEventListener;
-        bindTo(key: string, target: MVCObject, targetKey?: string, noNotify?: boolean): void;
-        changed(key: string): void;
-        get(key: string): any;
-        notify(key: string): void;
-        set(key: string, value: any): void;
-        setValues(values: any): void;
-        unbind(key: string): void;
-        unbindAll(): void;
-    }
-
-    export class MVCArray extends MVCObject {
-        constructor (array?: any[]);
-        clear(): void;
-        forEach(callback: (elem: any, index: number) => void ): void;
-        getArray(): any[];
-        getAt(i: number): any;
-        getLength(): number;
-        insertAt(i: number, elem: any): void;
-        pop(): void;
-        push(elem: any): number;
-        removeAt(i: number): any;
-        setAt(i: number, elem: any): void;
-    }
-
     /***** Map *****/
     export class Map extends MVCObject {
-        constructor (mapDiv: Element, opts?: MapOptions);
+        constructor(mapDiv: Element, opts?: MapOptions);
         fitBounds(bounds: LatLngBounds): void;
         getBounds(): LatLngBounds;
         getCenter(): LatLng;
         getDiv(): Element;
         getHeading(): number;
-        getMapTypeId(): MapTypeId | string;
+        getMapTypeId(): MapTypeId|string;
         getProjection(): Projection;
         getStreetView(): StreetViewPanorama;
         getTilt(): number;
         getZoom(): number;
         panBy(x: number, y: number): void;
-        panTo(latLng: LatLng): void;
+        panTo(latLng: LatLng|LatLngLiteral): void;
         panToBounds(latLngBounds: LatLngBounds): void;
-        setCenter(latlng: LatLng): void;
+        setCenter(latlng: LatLng|LatLngLiteral): void;
         setHeading(heading: number): void;
-        setMapTypeId(mapTypeId: MapTypeId | string): void;
+        setMapTypeId(mapTypeId: MapTypeId|string): void;
         setOptions(options: MapOptions): void;
         setStreetView(panorama: StreetViewPanorama): void;
         setTilt(tilt: number): void;
         setZoom(zoom: number): void;
-        controls: MVCArray[]; //Array<MVCArray.<Node >>
+        controls: MVCArray[]; //Array<MVCArray<Node>>
         data: Data;
         mapTypes: MapTypeRegistry;
         overlayMapTypes: MVCArray; // MVCArray<MapType>
@@ -99,8 +70,6 @@ declare module google.maps {
         mapMaker?: boolean;
         mapTypeControl?: boolean;
         mapTypeControlOptions?: MapTypeControlOptions;
-        navigationControl?: boolean;
-        navigationControlOptions?: NavigationControlOptions;
         mapTypeId?: MapTypeId;
         maxZoom?: number;
         minZoom?: number;
@@ -133,7 +102,7 @@ declare module google.maps {
 
     /***** Controls *****/
     export interface MapTypeControlOptions {
-        mapTypeIds?: (MapTypeId | string)[];
+        mapTypeIds?: (MapTypeId|string)[];
         position?: ControlPosition;
         style?: MapTypeControlStyle;
     }
@@ -157,7 +126,6 @@ declare module google.maps {
     }
 
     export interface ScaleControlOptions {
-        position?: ControlPosition;
         style?: ScaleControlStyle;
     }
 
@@ -195,39 +163,37 @@ declare module google.maps {
         TOP_RIGHT
     }
 
-    export interface NavigationControlOptions {
-        position?: ControlPosition;
-        style?: NavigationControlStyle;
-    }
-
-    export enum NavigationControlStyle {
-        DEFAULT,
-        SMALL,
-        ANDROID,
-        ZOOM_PAN
-    }
-
     /***** Data *****/
     export class Data extends MVCObject {
-        constructor(options?: google.maps.Data.DataOptions);
-        add(feature: google.maps.Data.Feature|google.maps.Data.FeatureOptions): google.maps.Data.Feature;
-        addGeoJson(geoJson: Object, options?: google.maps.Data.GeoJsonOptions): google.maps.Data.Feature[];
-        contains(feature: google.maps.Data.Feature): boolean;
-        forEach(callback: (feature:google.maps.Data.Feature) => void): void;
-        getFeatureById(id: number|string): google.maps.Data.Feature;
+        constructor(options?: Data.DataOptions);
+        add(feature: Data.Feature|Data.FeatureOptions): Data.Feature;
+        addGeoJson(geoJson: Object, options?: Data.GeoJsonOptions): Data.Feature[];
+        contains(feature: Data.Feature): boolean;
+        forEach(callback: (feature: Data.Feature) => void): void;
+        getControlPosition(): ControlPosition;
+        getControls(): string[]; 
+        getDrawingMode(): string;        
+        getFeatureById(id: number|string): Data.Feature;
         getMap(): Map;
-        getStyle(): google.maps.Data.StylingFunction|google.maps.Data.StyleOptions;
-        loadGeoJson(url: string, options?: google.maps.Data.GeoJsonOptions, callback?: (features:google.maps.Data.Feature[]) => void): void;
-        overrideStyle(feature: google.maps.Data.Feature, style: google.maps.Data.StyleOptions): void;
-        remove(feature: google.maps.Data.Feature): void;
-        revertStyle(feature?: google.maps.Data.Feature): void;
+        getStyle(): Data.StylingFunction|Data.StyleOptions;
+        loadGeoJson(url: string, options?: Data.GeoJsonOptions, callback?: (features: Data.Feature[]) => void): void;
+        overrideStyle(feature: Data.Feature, style: Data.StyleOptions): void;
+        remove(feature: Data.Feature): void;
+        revertStyle(feature?: Data.Feature): void;
+        setControlPosition(controlPosition: ControlPosition): void;
+        setControls(controls: string[]): void;
+        setDrawingMode(drawingMode: string): void;
         setMap(map: Map): void;
-        setStyle(style: google.maps.Data.StylingFunction|google.maps.Data.StyleOptions): void;
+        setStyle(style: Data.StylingFunction|Data.StyleOptions): void;
         toGeoJson(callback: (feature: Object) => void): void;
     }
 
     export module Data {
         export interface DataOptions {
+            controlPosition?: ControlPosition;
+            controls?: string[];
+            drawingMode?: string;
+            featureFactory?: (geometry: Data.Geometry) => Data.Feature;
             map?: Map;
             style?: Data.StylingFunction|Data.StyleOptions;
         }
@@ -239,9 +205,11 @@ declare module google.maps {
         export interface StyleOptions {
             clickable?: boolean;
             cursor?: string;
+            draggable?: boolean;
+            editable?: boolean;
             fillColor?: string;
             fillOpacity?: number;
-            icon?: any; // TODO string|Icon|Symbol;
+            icon?: string|Icon|Symbol;
             shape?: MarkerShape;
             strokeColor?: string;
             strokeOpacity?: number;
@@ -260,13 +228,13 @@ declare module google.maps {
             getId(): number|string;
             getProperty(name: string): any;
             removeProperty(name: string): void;
-            setGeometry(newGeometry: Data.Geometry|LatLng): void; // TODO LatLngLiteral
+            setGeometry(newGeometry: Data.Geometry|LatLng|LatLngLiteral): void;
             setProperty(name: string, newValue: any): void;
             toGeoJson(callback: (feature: Object) => void): void;
         }
 
         export interface FeatureOptions {
-            geometry?: Data.Geometry|LatLng; // TODO LatLngLiteral
+            geometry?: Data.Geometry|LatLng|LatLngLiteral;
             id?: number|string;
             properties?: Object;
         }
@@ -276,53 +244,54 @@ declare module google.maps {
         }
         
         export class Point extends Data.Geometry {
-            constructor(latLng: LatLng);  // TODO LatLngLiteral
+            constructor(latLng: LatLng|LatLngLiteral);
             get(): LatLng;
         }
         
         export class MultiPoint extends Data.Geometry {
-            constructor(elements: LatLng[]);  // TODO LatLngLiteral
+            constructor(elements: (LatLng|LatLngLiteral)[]);
+            getArray(): LatLng[];
             getAt(n: number): LatLng;
             getLength(): number;
         }
         
         export class LineString extends Data.Geometry {
-            constructor(elements: LatLng[]);  // TODO LatLngLiteral
+            constructor(elements: (LatLng|LatLngLiteral)[]);
             getArray(): LatLng[];
             getAt(n: number): LatLng;
             getLength(): number;
         }
         
         export class MultiLineString extends Data.Geometry {
-            constructor(elements: Data.LineString[]|LatLng[]); // TODO LatLngLiteral
+            constructor(elements: (Data.LineString|(LatLng|LatLngLiteral)[])[]); 
             getArray(): Data.LineString[];
             getAt(n: number): Data.LineString;
             getLength(): number;
         }
         
         export class LinearRing extends Data.Geometry {
-            constructor(elements: LatLng[]); // TODO LatLngLiteral
+            constructor(elements: (LatLng|LatLngLiteral)[]); 
             getArray(): LatLng[];
             getAt(n: number): LatLng;
             getLength(): number;
         }
         
         export class Polygon extends Data.Geometry {
-            constructor(elements: LinearRing[]|LatLng[][]); // TODO LatLngLiteral
-            getArray(): LinearRing[];
-            getAt(n: number): LinearRing;
+            constructor(elements: (Data.LinearRing|(LatLng|LatLngLiteral)[])[]); 
+            getArray(): Data.LinearRing[];
+            getAt(n: number): Data.LinearRing;
             getLength(): number;
         }
         
         export class MultiPolygon extends Data.Geometry {
-            constructor(elements: Data.Polygon[]|LinearRing[][]|LatLng[][][]); // TODO LatLngLiteral
+            constructor(elements: (Data.Polygon|(LinearRing|(LatLng|LatLngLiteral)[])[])[]);
             getArray(): Data.Polygon[];
             getAt(n: number): Data.Polygon;
             getLength(): number;
         }
         
         export class GeometryCollection extends Data.Geometry {
-            constructor(elements: Data.Geometry[]|LatLng[]); // TODO LatLngLiteral
+            constructor(elements: (Data.Geometry[]|LatLng[]|LatLngLiteral)[]);
             getArray(): Data.Geometry[];
             getAt(n: number): Data.Geometry;
             getLength(): number;
@@ -363,33 +332,32 @@ declare module google.maps {
     /***** Overlays *****/
     export class Marker extends MVCObject {
         static MAX_ZINDEX: number;
-        constructor (opts?: MarkerOptions);
+        constructor(opts?: MarkerOptions);
         getAnimation(): Animation;
+        getAttribution(): Attribution;
         getClickable(): boolean;
         getCursor(): string;
         getDraggable(): boolean;
-        getFlat(): boolean;
-        getIcon(): MarkerImage;
-        getMap(): any; // Map or StreetViewPanorama
+        getIcon(): string|Icon|Symbol;
+        getMap(): Map|StreetViewPanorama;
+        getOpacity(): number;
+        getPlace(): Place;
         getPosition(): LatLng;
-        getShadow(): MarkerImage;
         getShape(): MarkerShape;
         getTitle(): string;
         getVisible(): boolean;
         getZIndex(): number;
         setAnimation(animation: Animation): void;
+        setAttribution(attribution: Attribution): void;
         setClickable(flag: boolean): void;
         setCursor(cursor: string): void;
         setDraggable(flag: boolean): void;
-        setFlat(flag: boolean): void;
-        setIcon(icon: MarkerImage): void;
-        setIcon(icon: string): void;
-        setMap(map: Map): void;
-        setMap(map: StreetViewPanorama): void;
+        setIcon(icon: string|Icon|Symbol): void;
+        setMap(map: Map|StreetViewPanorama): void;
+        getOpacity(opacity: number): void;
         setOptions(options: MarkerOptions): void;
-        setPosition(latlng: LatLng): void;
-        setShadow(shadow: MarkerImage): void;
-        setShadow(shadow: string): void;
+        setPlace(place: Place): void;
+        setPosition(latlng: LatLng|LatLngLiteral): void;
         setShape(shape: MarkerShape): void;
         setTitle(title: string): void;
         setVisible(visible: boolean): void;
@@ -397,6 +365,11 @@ declare module google.maps {
     }
 
     export interface MarkerOptions {
+        /**
+         * The offset from the marker's position to the tip of an InfoWindow 
+         * that has been opened with the marker as anchor.
+         */
+        anchorPoint?: Point;
         /** Which animation to play when marker is added to a map. */
         animation?: Animation;
         /** 
@@ -411,31 +384,42 @@ declare module google.maps {
          * @default false
          */
         draggable?: boolean;
-        flat?: boolean;
-        /**
+       /**
          * Icon for the foreground. 
          * If a string is provided, it is treated as though it were an Icon with the string as url.
          * @type {(string|Icon|Symbol)}
          */
-        icon?: any;
+        icon?: string|Icon|Symbol;
         /**
          * Map on which to display Marker.
          * @type {(Map|StreetViewPanorama)}
+         * 
          */
-        map?: any;
+        map?: Map|StreetViewPanorama;
+        /** The marker's opacity between 0.0 and 1.0. */
+        opacity?: number;
         /**
          * Optimization renders many markers as a single static element.
          * Optimized rendering is enabled by default.
-         * Disable optimized rendering for animated GIFs or PNGs, or when each marker must be rendered 
-         * as a separate DOM element (advanced usage only).
+         * Disable optimized rendering for animated GIFs or PNGs, or when each
+         * marker must be rendered as a separate DOM element (advanced usage
+         * only).
          */
         optimized?: boolean;
+        /**
+         * Place information, used to identify and describe the place 
+         * associated with this Marker. In this context, 'place' means a
+         * business, point of interest or geographic location. To allow a user
+         * to save this place, open an info window anchored on this marker.
+         * The info window will contain information about the place and an
+         * option for the user to save it. Only one of position or place can
+         * be specified.
+         */
+        place?: Place;
         /**
          * Marker position. Required.
          */
-        position?: LatLng;
-        raiseOnDrag?: boolean;
-        shadow?: any;
+        position: LatLng;
         /** Image map region definition used for drag/click. */
         shape?: MarkerShape;
         /** Rollover text. */
@@ -453,39 +437,37 @@ declare module google.maps {
 
     export interface Icon {
         /**
-         * The position at which to anchor an image in correspondence to the location of the marker on the map. 
-         * By default, the anchor is located along the center point of the bottom of the image.
+         * The position at which to anchor an image in correspondence to the
+         * location of the marker on the map. By default, the anchor is
+         * located along the center point of the bottom of the image.
          */
         anchor?: Point;
         /**
-         * The position of the image within a sprite, if any.
-         * By default, the origin is located at the top left corner of the image (0, 0).
+         * The origin of the label relative to the top-left corner of the icon
+         * image, if a label is supplied by the marker. By default, the origin
+         * is located in the center point of the image.
+         */
+        labelOrigin?: Point;
+        /**
+         * The position of the image within a sprite, if any. By default, the
+         * origin is located at the top left corner of the image (0, 0).
          */
         origin?: Point;
         /**
-         * The size of the entire image after scaling, if any.
-         * Use this property to stretch/ shrink an image or a sprite.
+         * The size of the entire image after scaling, if any. Use this
+         * property to stretch/ shrink an image or a sprite.
          */
         scaledSize?: Size;
         /**
-         * The display size of the sprite or image.
-         * When using sprites, you must specify the sprite size.
-         * If the size is not provided, it will be set when the image loads.
+         * The display size of the sprite or image. When using sprites, you
+         * must specify the sprite size. If the size is not provided, it will
+         * be set when the image loads.
          */
         size?: Size;
         /** The URL of the image or sprite sheet. */
         url?: string;
     }
 
-    export class MarkerImage {
-        constructor (url: string, size?: Size, origin?: Point, anchor?: Point, scaledSize?: Size);
-        anchor: Point;
-        origin: Point;
-        scaledSize: Size;
-        size: Size;
-        url: string;
-    }
-
     export interface MarkerShape {
         coords?: number[];
         type?: string;
@@ -514,7 +496,7 @@ declare module google.maps {
          * The symbol's path, which is a built-in symbol path, or a custom path expressed using SVG path notation. Required.
          * @type {(SymbolPath|string)}
          */
-        path?: any;
+        path?: SymbolPath|string;
         /**
          * The angle by which to rotate the symbol, expressed clockwise in degrees. 
          * Defaults to 0. 
@@ -568,20 +550,21 @@ declare module google.maps {
      */
     export class InfoWindow extends MVCObject {
         /**
-         * Creates an info window with the given options.
-         * An InfoWindow can be placed on a map at a particular position or above a marker, 
-         * depending on what is specified in the options.
-         * Unless auto-pan is disabled, an InfoWindow will pan the map to make itself visible when it is opened.
-         * After constructing an InfoWindow, you must call open to display it on the map.
-         * The user can click the close button on the InfoWindow to remove it from the map, or the developer can call close() for the same effect.
+         * Creates an info window with the given options. An InfoWindow can be
+         * placed on a map at a particular position or above a marker,
+         * depending on what is specified in the options. Unless auto-pan is
+         * disabled, an InfoWindow will pan the map to make itself visible 
+         * when it is opened. After constructing an InfoWindow, you must call
+         * open to display it on the map. The user can click the close button
+         * on the InfoWindow to remove it from the map, or the developer can
+         * call close() for the same effect.
          */
         constructor(opts?: InfoWindowOptions);
         /** Closes this InfoWindow by removing it from the DOM structure. */
         close(): void;
-        getContent(): any; // string or Element
+        getContent(): string|Element;
         getPosition(): LatLng;
         getZIndex(): number;
-        open(map?: Map, anchor?: MVCObject): void;
         /**
          * Opens this InfoWindow on the given map. Optionally, an InfoWindow can be associated with an anchor.
          * In the core API, the only anchor is the Marker class.
@@ -589,9 +572,8 @@ declare module google.maps {
          * a Point anchorPoint property for calculating the pixelOffset (see InfoWindowOptions).
          * The anchorPoint is the offset from the anchor's position to the tip of the InfoWindow.
          */
-        open(map?: StreetViewPanorama, anchor?: MVCObject): void;
-        setContent(content: Node): void;
-        setContent(content: string): void;
+        open(map?: Map|StreetViewPanorama, anchor?: MVCObject): void;
+        setContent(content: string|Node): void;
         setOptions(options: InfoWindowOptions): void;
         setPosition(position: LatLng): void;
         setZIndex(zIndex: number): void;
@@ -604,7 +586,7 @@ declare module google.maps {
          * To set an explicit size for the content, set content to be a HTML element with that size.
          * @type {(string|Node)}
          */
-        content?: any;
+        content?: string|Node;
         /**
          * Disable auto-pan on open. By default, the info window will pan the map so that it is fully visible when it opens.
          */
@@ -624,7 +606,7 @@ declare module google.maps {
         /**
          * The LatLng at which to display this InfoWindow. If the InfoWindow is opened with an anchor, the anchor's position will be used instead.
          */
-        position?: LatLng;
+        position?: LatLng|LatLngLiteral;
         /**
          * All InfoWindows are displayed on the map in order of their zIndex, 
          * with higher values displaying in front of InfoWindows with lower values. 
@@ -636,18 +618,17 @@ declare module google.maps {
     }
 
     export class Polyline extends MVCObject {
-        constructor (opts?: PolylineOptions);
+        constructor(opts?: PolylineOptions);
         getDraggable(): boolean;
         getEditable(): boolean;
         getMap(): Map;
-        getPath(): MVCArray;
+        getPath(): MVCArray; // MVCArray<LatLng>
         getVisible(): boolean;
         setDraggable(draggable: boolean): void;
         setEditable(editable: boolean): void;
         setMap(map: Map): void;
         setOptions(options: PolylineOptions): void;
-        setPath(path: MVCArray): void;
-        setPath(path: LatLng[]): void;
+        setPath(path: MVCArray|LatLng[]|LatLngLiteral[]): void; // MVCArray<LatLng>|Array<LatLng|LatLngLiteral>
         setVisible(visible: boolean): void;
     }
 
@@ -658,7 +639,7 @@ declare module google.maps {
         geodesic?: boolean;
         icons?: IconSequence[];
         map?: Map;
-        path?: any[];
+        path?: MVCArray|LatLng[]|LatLngLiteral[]; // MVCArray<LatLng>|Array<LatLng|LatLngLiteral>
         strokeColor?: string;
         strokeOpacity?: number;
         strokeWeight?: number;
@@ -674,23 +655,24 @@ declare module google.maps {
     }
 
     export class Polygon extends MVCObject {
-        constructor (opts?: PolygonOptions);
+        constructor(opts?: PolygonOptions);
         getDraggable(): boolean;
         getEditable(): boolean;
         getMap(): Map;
-        getPath(): MVCArray;
-        getPaths(): MVCArray;
+        getPath(): MVCArray; // MVCArray<LatLng>
+        getPaths(): MVCArray; // MVCArray<MVCArray<LatLng>>
         getVisible(): boolean;
         setDraggable(draggable: boolean): void;
         setEditable(editable: boolean): void;
         setMap(map: Map): void;
         setOptions(options: PolygonOptions): void;
-        setPath(path: MVCArray): void;
-        setPath(path: LatLng[]): void;
+        setPath(path: MVCArray|LatLng[]|LatLngLiteral[]): void;
         setPaths(paths: MVCArray): void;
         setPaths(paths: MVCArray[]): void;
         setPaths(path: LatLng[]): void;
         setPaths(path: LatLng[][]): void;
+        setPaths(path: LatLngLiteral[]): void;
+        setPaths(path: LatLngLiteral[][]): void;
         setVisible(visible: boolean): void;
     }
 
@@ -702,7 +684,7 @@ declare module google.maps {
         fillOpacity?: number;
         geodesic?: boolean;
         map?: Map;
-        paths?: any[];
+        paths?: any[]; // MVCArray<MVCArray<LatLng>>|MVCArray<LatLng>|Array<Array<LatLng|LatLngLiteral>>|Array<LatLng|LatLngLiteral>
         strokeColor?: string;
         strokeOpacity?: number;
         strokePosition?: StrokePosition;
@@ -718,7 +700,7 @@ declare module google.maps {
     }
 
     export class Rectangle extends MVCObject {
-        constructor (opts?: RectangleOptions);
+        constructor(opts?: RectangleOptions);
         getBounds(): LatLngBounds;
         getDraggable(): boolean;
         getEditable(): boolean;
@@ -749,7 +731,7 @@ declare module google.maps {
     }
 
     export class Circle extends MVCObject {
-        constructor (opts?: CircleOptions);
+        constructor(opts?: CircleOptions);
         getBounds(): LatLngBounds;
         getCenter(): LatLng;
         getDraggable(): boolean;
@@ -757,7 +739,7 @@ declare module google.maps {
         getMap(): Map;
         getRadius(): number;
         getVisible(): boolean;
-        setCenter(center: LatLng): void;
+        setCenter(center: LatLng|LatLngLiteral): void;
         setDraggable(draggable: boolean): void;
         setEditable(editable: boolean): void;
         setMap(map: Map): void;
@@ -790,7 +772,7 @@ declare module google.maps {
     }
 
     export class GroundOverlay extends MVCObject {
-        constructor (url: string, bounds: LatLngBounds, opts?: GroundOverlayOptions);
+        constructor(url: string, bounds: LatLngBounds, opts?: GroundOverlayOptions);
         getBounds(): LatLngBounds;
         getMap(): Map;
         getOpacity(): number;
@@ -807,23 +789,20 @@ declare module google.maps {
 
     export class OverlayView extends MVCObject {
         draw(): void;
-        getMap(): Map;
+        getMap(): Map|StreetViewPanorama;
         getPanes(): MapPanes;
         getProjection(): MapCanvasProjection;
         onAdd(): void;
         onRemove(): void;
-        setMap(map: Map): void;
-        setMap(map: StreetViewPanorama): void;
+        setMap(map: Map|StreetViewPanorama): void;
     }
 
     export interface MapPanes {
         floatPane: Element;
-        floatShadow: Element;
         mapPane: Element;
-        overlayImage: Element;
+        markerLayer: Element;
         overlayLayer: Element;
         overlayMouseTarget: Element;
-        overlayShadow: Element;
     }
 
     export class MapCanvasProjection extends MVCObject {
@@ -836,17 +815,25 @@ declare module google.maps {
 
     /***** Services *****/
     export class Geocoder {
-        constructor ();
         geocode(request: GeocoderRequest, callback: (results: GeocoderResult[], status: GeocoderStatus) => void ): void;
     }
 
     export interface GeocoderRequest {
         address?: string;
         bounds?: LatLngBounds;
-        location?: LatLng;
+        componentRestrictions: GeocoderComponentRestrictions;
+        location?: LatLng|LatLngLiteral;
         region?: string;
     }
 
+    export interface GeocoderComponentRestrictions {
+        administrativeArea: string;
+        country: string;
+        locality: string;
+        postalCode:	string;
+        route: string;
+    }
+
     export enum GeocoderStatus {
         ERROR,
         INVALID_REQUEST,
@@ -861,6 +848,8 @@ declare module google.maps {
         address_components: GeocoderAddressComponent[];
         formatted_address: string;
         geometry: GeocoderGeometry;
+        partial_match: boolean;
+        postcode_localities: string[]        
         types: string[];
     }
 
@@ -885,7 +874,7 @@ declare module google.maps {
     }
 
     export class DirectionsRenderer extends MVCObject {
-        constructor (opts?: DirectionsRendererOptions);
+        constructor(opts?: DirectionsRendererOptions);
         getDirections(): DirectionsResult;
         getMap(): Map;
         getPanel(): Element;
@@ -915,16 +904,17 @@ declare module google.maps {
     }
 
     export class DirectionsService {
-        constructor ();
         route(request: DirectionsRequest, callback: (result: DirectionsResult, status: DirectionsStatus) => void ): void;
     }
 
     export interface DirectionsRequest {
+        avoidFerries?: boolean;
         avoidHighways?: boolean;
         avoidTolls?: boolean;
-        destination?: any;
+        destination?: LatLng|string;
+        durationInTraffic?: boolean;
         optimizeWaypoints?: boolean;
-        origin?: any;
+        origin?: LatLng|string;
         provideRouteAlternatives?: boolean;
         region?: string;
         transitOptions?: TransitOptions;
@@ -948,10 +938,28 @@ declare module google.maps {
     export interface TransitOptions {
         arrivalTime?: Date;
         departureTime?: Date;
+        modes: TransitMode[];
+        routingPreference: TransitRoutePreference;
     }
 
+    export enum TransitMode {
+        BUS,
+        RAIL,
+        SUBWAY,
+        TRAIN,
+        TRAM
+    } 
+    
+    export enum TransitRoutePreference
+    {
+        FEWER_TRANSFERS,
+        LESS_WALKING
+    }
+    
+    export interface TransitFare { }
+
     export interface DirectionsWaypoint {
-        location: any;
+        location: LatLng|string;
         stopover: boolean;
     }
 
@@ -971,20 +979,22 @@ declare module google.maps {
     }
 
     export interface DirectionsRoute {
-        legs: DirectionsLeg[];
-        waypoint_order: number[];
-        overview_path: LatLng[];
-        overview_polyline: string;
         bounds: LatLngBounds;
         copyrights: string;
+        fare: TransitFare;
+        legs: DirectionsLeg[];
+        overview_path: LatLng[];
+        overview_polyline: string;
         warnings: string[];
+        waypoint_order: number[];        
     }
 
     export interface DirectionsLeg {
-        arrival_time: Distance;
-        departure_time: Duration;
+        arrival_time: Time;
+        departure_time: Time;
         distance: Distance;
         duration: Duration;
+        duration_in_traffic: Duration;
         end_address: string;
         end_location: LatLng;
         start_address: string;
@@ -1058,11 +1068,31 @@ declare module google.maps {
         icon: string;
         local_icon: string;
         name: string;
-        type: string;
+        type: VehicleType;
+    }
+    
+    export enum VehicleType
+    {
+        BUS,
+        CABLE_CAR,
+        COMMUTER_TRAIN,
+        FERRY,
+        FUNICULAR,
+        GONDOLA_LIFT,
+        HEAVY_RAIL,
+        HIGH_SPEED_TRAIN,
+        INTERCITY_BUS,
+        METRO_RAIL,
+        MONORAIL,
+        OTHER,
+        RAIL,
+        SHARE_TAXI,
+        SUBWAY,
+        TRAM,
+        TROLLEYBUS
     }
 
     export class ElevationService {
-        constructor ();
         getElevationAlongPath(request: PathElevationRequest, callback: (results: ElevationResult[], status: ElevationStatus) => void ): void;
         getElevationForLocations(request: LocationElevationRequest, callback: (results: ElevationResult[], status: ElevationStatus) => void ): void;
     }
@@ -1091,8 +1121,7 @@ declare module google.maps {
     }
 
     export class MaxZoomService {
-        constructor ();
-        getMaxZoomAtLatLng(latlng: LatLng, callback: (result: MaxZoomResult) => void ): void;
+        getMaxZoomAtLatLng(latlng: LatLng|LatLngLiteral, callback: (result: MaxZoomResult) => void ): void;
     }
 
     export interface MaxZoomResult {
@@ -1106,16 +1135,18 @@ declare module google.maps {
     }
 
     export class DistanceMatrixService {
-        constructor ();
         getDistanceMatrix(request: DistanceMatrixRequest, callback: (response: DistanceMatrixResponse, status: DistanceMatrixStatus) => void ): void;
     }
 
     export interface DistanceMatrixRequest {
+        avoidFerries?: boolean;
         avoidHighways?: boolean;
         avoidTolls?: boolean;
-        destinations?: any[];
-        origins?: any[];
+        destinations?: LatLng[]|string[];
+        durationInTraffic?: boolean;
+        origins?: LatLng[]|string[];
         region?: string;
+        transitOptions?: TransitOptions;
         travelMode?: TravelMode;
         unitSystem?: UnitSystem;
     }
@@ -1133,6 +1164,7 @@ declare module google.maps {
     export interface DistanceMatrixResponseElement {
         distance: Distance;
         duration: Duration;
+        fare: TransitFare;
         status: DistanceMatrixElementStatus;
     }
 
@@ -1151,6 +1183,33 @@ declare module google.maps {
         OK,
         ZERO_RESULTS
     }
+    
+    /***** Save to Google Maps *****/
+    export interface Attribution {
+        iosDeepLinkId?: string;
+        source?: string;
+        webUrl?: string;
+    }
+
+    export interface Place {
+        location?: LatLng|LatLngLiteral;
+        placeId?: string;
+        query?: string;
+    }
+    
+    export class SaveWidget {
+        constructor(container: Node, opts?: SaveWidgetOptions);
+        getAttribution(): Attribution;
+        getPlace(): Place;
+        setAttribution(attribution: Attribution): void;
+        setOptions(opts: SaveWidgetOptions): void;
+        setPlace(place: Place): void;        
+    }
+    
+    export interface SaveWidgetOptions{
+        attribution?: Attribution;
+        place?:	Place;
+    }
 
     /***** Map Types *****/
     export interface MapType {
@@ -1166,7 +1225,7 @@ declare module google.maps {
     }
 
     export class MapTypeRegistry extends MVCObject {
-        constructor ();
+        constructor();
         set(id: string, mapType: MapType): void;
     }
 
@@ -1176,16 +1235,16 @@ declare module google.maps {
     }
 
     export class ImageMapType extends MVCObject implements MapType {
-        constructor (opts: ImageMapTypeOptions);
+        constructor(opts: ImageMapTypeOptions);
         getOpacity(): number;
-        setOpacity(opacity: number): void;
         getTile(tileCoord: Point, zoom: number, ownerDocument: Document): Element;
         releaseTile(tile: Element): void;
+        setOpacity(opacity: number): void;
     }
 
     export interface ImageMapTypeOptions {
         alt?: string;
-        getTileUrl: (tileCoord: Point, zoom: number) => string;
+        getTileUrl(tileCoord: Point, zoom: number): string;
         maxZoom?: number;
         minZoom?: number;
         name?: string;
@@ -1193,8 +1252,10 @@ declare module google.maps {
         tileSize?: Size;
     }
 
-    export class StyledMapType {
-        constructor (styles: MapTypeStyle[], options?: StyledMapTypeOptions);
+    export class StyledMapType extends MVCObject implements MapType {
+        constructor(styles: MapTypeStyle[], options?: StyledMapTypeOptions);
+        getTile(tileCoord: Point, zoom: number, ownerDocument: Document): Element;
+        releaseTile(tile: Element): void;
     }
 
     export interface StyledMapTypeOptions {
@@ -1205,8 +1266,8 @@ declare module google.maps {
     }
 
     export interface MapTypeStyle {
-        elementType?: string|MapTypeStyleElementType;
-        featureType?: string|MapTypeStyleFeatureType;
+        elementType?: MapTypeStyleElementType;
+        featureType?: MapTypeStyleFeatureType;
         stylers?: MapTypeStyler[];
     }
 
@@ -1221,7 +1282,10 @@ declare module google.maps {
         all?: string;
         landscape?: {
             man_made?: string;
-            natural?: string;
+            natural?: {
+              landcover?: string;
+              terrain?: string;  
+            };
         };
         poi?: {
             attraction?: string;
@@ -1251,13 +1315,23 @@ declare module google.maps {
         water?: string;
     }
 
-    export enum MapTypeStyleElementType {
-        all,
-        geometry,
-        labels
+    export interface MapTypeStyleElementType {
+        all?: string;
+        geometry?: {
+            fill?: string;
+            stroke?: string;
+        };
+        labels?: {
+            icon?: string;
+            text?: {
+                fill?: string;
+                stroke?: string;
+            }
+        };
     }
 
     export interface MapTypeStyler {
+        color?: string;
         gamma?: number;
         hue?: string;
         invert_lightness?: boolean;
@@ -1268,13 +1342,13 @@ declare module google.maps {
 
     /***** Layers *****/
     export class BicyclingLayer extends MVCObject {
-        constructor ();
+        constructor();
         getMap(): Map;
         setMap(map: Map): void;
     }
 
     export class FusionTablesLayer extends MVCObject {
-        constructor (options: FusionTablesLayerOptions);
+        constructor(options: FusionTablesLayerOptions);
         getMap(): Map;
         setMap(map: Map): void;
         setOptions(options: FusionTablesLayerOptions): void;
@@ -1328,37 +1402,44 @@ declare module google.maps {
     }
 
     export interface FusionTablesMouseEvent {
-        infoWindowHtml: string;
-        latLng: LatLng;
-        pixelOffset: Size;
-        row: Object;
+        infoWindowHtml?: string;
+        latLng?: LatLng;
+        pixelOffset?: Size;
+        row?: Object; // Object<FusionTablesCell>
     }
 
     export interface FusionTablesCell {
-        columnName: string;
-        value: string;
+        columnName?: string;
+        value?: string;
     }
 
     export class KmlLayer extends MVCObject {
-        constructor (url: string, opts?: KmlLayerOptions);
+        constructor(opts?: KmlLayerOptions);
         getDefaultViewport(): LatLngBounds;
         getMap(): Map;
         getMetadata(): KmlLayerMetadata;
         getStatus(): KmlLayerStatus;
         getUrl(): string;
+        getZIndex(): number;
         setMap(map: Map): void;
+        setUrl(url: string): void;
+        setZIndez(zIndex: number): void;
     }
 
     export interface KmlLayerOptions {
         clickable?: boolean;
         map?: Map;
         preserveViewport?: boolean;
+        screenOverlays?: boolean;
         suppressInfoWindows?: boolean;
+        url?: string;
+        zIndex?: number;
     }
 
     export interface KmlLayerMetadata {
         author: KmlAuthor;
         description: string;
+        hasScreenOverlays: boolean;
         name: string;
         snippet: string;
     }
@@ -1397,38 +1478,45 @@ declare module google.maps {
     }
 
     export class TrafficLayer extends MVCObject {
-        constructor ();
+        constructor();
         getMap(): void;
         setMap(map: Map): void;
     }
 
     export class TransitLayer extends MVCObject {
-        constructor ();
+        constructor();
         getMap(): void;
         setMap(map: Map): void;
     }
 
     /***** Street View *****/
     export class StreetViewPanorama {
-        constructor (container: Element, opts?: StreetViewPanoramaOptions);
-        controls: MVCArray[];
+        constructor(container: Element, opts?: StreetViewPanoramaOptions);
+        controls: MVCArray[]; // Array<MVCArray<Node>>
         getLinks(): StreetViewLink[];
+        getLocation():  StreetViewLocation;
         getPano(): string;
+        getPhotographerPov(): StreetViewPov;
         getPosition(): LatLng;
         getPov(): StreetViewPov;
+        getStatus(): StreetViewStatus;
         getVisible(): boolean;
+        getZoom(): number;
         registerPanoProvider(provider: (input: string) => StreetViewPanoramaData): void;
+        setLinks(links: Array<StreetViewLink>): void;
+        setOptions(options: StreetViewPanoramaOptions): void;
         setPano(pano: string): void;
-        setPosition(latLng: LatLng): void;
+        setPosition(latLng: LatLng|LatLngLiteral): void;
         setPov(pov: StreetViewPov): void;
         setVisible(flag: boolean): void;
-
+        setZoom(zoom: number): void;
     }
 
     export interface StreetViewPanoramaOptions {
         addressControl?: boolean;
         addressControlOptions?: StreetViewAddressControlOptions;
         clickToGo?: boolean;
+        disableDefaultUi?: boolean;
         disableDoubleClickZoom?: boolean;
         enableCloseButton?: boolean;
         imageDateControl?: boolean;
@@ -1437,7 +1525,7 @@ declare module google.maps {
         panControlOptions?: PanControlOptions;
         pano?: string;
         panoProvider?: (input: string) => StreetViewPanoramaData;
-        position?: LatLng;
+        position?: LatLng|LatLngLiteral;
         pov?: StreetViewPov;
         scrollwheel?: boolean;
         visible?: boolean;
@@ -1458,11 +1546,10 @@ declare module google.maps {
     export interface StreetViewPov {
         heading?: number;
         pitch?: number;
-        zoom?: number;
     }
 
     export interface StreetViewPanoramaData {
-        opyright?: string;
+        copyright?: string;
         imageDate?: string;
         links?: StreetViewLink[];
         location?: StreetViewLocation;
@@ -1473,17 +1560,19 @@ declare module google.maps {
         description?: string;
         latLng?: LatLng;
         pano?: string;
+        shortDescription?: string;
     }
 
     export interface StreetViewTileData {
+        getTileUrl(pano: string, tileZoom: number, tileX: number, tileY: number): string;
         centerHeading?: number;
         tileSize?: Size;
         worldSize?: Size;
     }
 
     export class StreetViewService {
-        getPanoramaById(pano: string, callback: (streetViewPanoramaData: StreetViewPanoramaData, streetViewStatus: StreetViewStatus) => void ): void;
-        getPanoramaByLocation(latlng: LatLng, radius: number, callback: (streetViewPanoramaData: StreetViewPanoramaData, streetViewStatus: StreetViewStatus) => void ): void;
+        getPanoramaById(pano: string, callback: (streetViewPanoramaData: StreetViewPanoramaData, streetViewStatus: StreetViewStatus) => void): void;
+        getPanoramaByLocation(latlng: LatLng|LatLngLiteral, radius: number, callback: (streetViewPanoramaData: StreetViewPanoramaData, streetViewStatus: StreetViewStatus) => void ): void;
     }
 
     export enum StreetViewStatus {
@@ -1491,21 +1580,22 @@ declare module google.maps {
         UNKNOWN_ERROR,
         ZERO_RESULTS
     }
+    
+    export class StreetViewCoverageLayer extends MVCObject  {
+        getMap(): Map;
+        setMap(map: Map): void;
+    }
 
-    /***** Event *****/
+    /***** Events *****/
     export interface MapsEventListener { }
 
     export class event {
-        static addDomListener(instance: any, eventName: string, handler: (event?: any, ...args: any[]) => void , capture?: boolean): MapsEventListener;
-        static addDomListener(instance: any, eventName: string, handler: Function, capture?: boolean): MapsEventListener;
-        static addDomListenerOnce(instance: any, eventName: string, handler: (event?: any, ...args: any[]) => void , capture?: boolean): MapsEventListener;
-        static addDomListenerOnce(instance: any, eventName: string, handler: Function, capture?: boolean): MapsEventListener;
-        static addListener(instance: any, eventName: string, handler: (event?: any, ...args: any[]) => void ): MapsEventListener;
-        static addListener(instance: any, eventName: string, handler: Function): MapsEventListener;
-        static addListenerOnce(instance: any, eventName: string, handler: (event?: any, ...args: any[]) => void ): MapsEventListener;
-        static addListenerOnce(instance: any, eventName: string, handler: Function): MapsEventListener;
-        static clearInstanceListeners(instance: any): void;
-        static clearListeners(instance: any, eventName: string): void;
+        static addDomListener(instance: Object, eventName: string, handler: Function, capture?: boolean): MapsEventListener;
+        static addDomListenerOnce(instance: Object, eventName: string, handler: Function, capture?: boolean): MapsEventListener;
+        static addListener(instance: Object, eventName: string, handler: Function): MapsEventListener;
+        static addListenerOnce(instance: Object, eventName: string, handler: Function): MapsEventListener;
+        static clearInstanceListeners(instance: Object): void;
+        static clearListeners(instance: Object, eventName: string): void;
         static removeListener(listener: MapsEventListener): void;
         static trigger(instance: any, eventName: string, ...args: any[]): void;
     }
@@ -1520,18 +1610,21 @@ declare module google.maps {
     /**
      * A LatLng is a point in geographical coordinates: latitude and longitude.
      * 
-     * * Latitude ranges between -90 and 90 degrees, inclusive.
-     *   Values above or below this range will be clamped to the range [-90, 90].
-     *   This means that if the value specified is less than -90, it will be set to -90.
+     * * Latitude ranges between -90 and 90 degrees, inclusive. Values above or
+     *   below this range will be clamped to the range [-90, 90]. This means
+     *   that if the value specified is less than -90, it will be set to -90.
      *   And if the value is greater than 90, it will be set to 90.
-     * * Longitude ranges between -180 and 180 degrees, inclusive.
-     *   Values above or below this range will be wrapped so that they fall within the range.
-     *   For example, a value of -190 will be converted to 170. A value of 190 will be converted to -170.
-     *   This reflects the fact that longitudes wrap around the globe.
+     * * Longitude ranges between -180 and 180 degrees, inclusive. Values above
+     *   or below this range will be wrapped so that they fall within the
+     *   range. For example, a value of -190 will be converted to 170. A value
+     *   of 190 will be converted to -170. This reflects the fact that
+     *   longitudes wrap around the globe.
      * 
-     * Although the default map projection associates longitude with the x-coordinate of the map, and latitude with the y-coordinate, 
-     * the latitude coordinate is always written first, followed by the longitude.
-     * Notice that you cannot modify the coordinates of a LatLng. If you want to compute another point, you have to create a new one.
+     * Although the default map projection associates longitude with the
+     * x-coordinate of the map, and latitude with the y-coordinate, the
+     * latitude coordinate is always written first, followed by the longitude.
+     * Notice that you cannot modify the coordinates of a LatLng. If you want
+     * to compute another point, you have to create a new one.
      */
     export class LatLng {
         /**
@@ -1554,8 +1647,10 @@ declare module google.maps {
         toUrlValue(precision?: number): string;
     }
 
+    export type LatLngLiteral = { lat: number; lng: number }
+
     export class LatLngBounds {
-        constructor (sw?: LatLng, ne?: LatLng);
+        constructor(sw?: LatLng, ne?: LatLng);
         contains(latLng: LatLng): boolean;
         equals(other: LatLngBounds): boolean;
         extend(point: LatLng): LatLngBounds;
@@ -1570,7 +1665,6 @@ declare module google.maps {
         union(other: LatLngBounds): LatLngBounds;
     }
 
-
     export class Point {
         /** A point on a two-dimensional plane. */
         constructor(x: number, y: number);
@@ -1585,138 +1679,143 @@ declare module google.maps {
     }
 
     export class Size {
-        constructor (width: number, height: number, widthUnit?: string, heightUnit?: string);
+        constructor(width: number, height: number, widthUnit?: string, heightUnit?: string);
         height: number;
         width: number;
         equals(other: Size): boolean;
         toString(): string;
     }
 
+    /***** MVC *****/
+    export class MVCObject {
+        constructor();
+        addListener(eventName: string, handler: (...args: any[]) => void): MapsEventListener;
+        bindTo(key: string, target: MVCObject, targetKey?: string, noNotify?: boolean): void;
+        changed(key: string): void;
+        get(key: string): any;
+        notify(key: string): void;
+        set(key: string, value: any): void;
+        setValues(values: any): void;
+        unbind(key: string): void;
+        unbindAll(): void;
+    }
+
+    export class MVCArray extends MVCObject {
+        constructor(array?: any[]);
+        clear(): void;
+        forEach(callback: (elem: any, i: number) => void): void;
+        getArray(): any[];
+        getAt(i: number): any;
+        getLength(): number;
+        insertAt(i: number, elem: any): void;
+        pop(): any;
+        push(elem: any): number;
+        removeAt(i: number): any;
+        setAt(i: number, elem: any): void;
+    }
+
     /***** Geometry Library *****/
     export module geometry {
         export class encoding {
             static decodePath(encodedPath: string): LatLng[];
-            static encodePath(path: any[]): string;
+            static encodePath(path: any[]): string; // LatLng[]|MVCArray<LatLng>
         }
 
         export class spherical {
-            static computeArea(path: any[], radius?: number): number;
+            static computeArea(path: any[], radius?: number): number; // LatLng[]|MVCArray<LatLng>
             static computeDistanceBetween(from: LatLng, to: LatLng, radius?: number): number;
             static computeHeading(from: LatLng, to: LatLng): number;
-            static computeLength(path: any[], radius?: number): number;
+            static computeLength(path: any[], radius?: number): number; // LatLng[]|MVCArray<LatLng>
             static computeOffset(from: LatLng, distance: number, heading: number, radius?: number): LatLng;
-            static computeSignedArea(loop: any[], radius?: number): number;
+            static computeOffsetOrigin(to: LatLng, distance: number, heading: number, radius?: number): LatLng;
+            static computeSignedArea(loop: any[], radius?: number): number; // LatLng[]|MVCArray<LatLng>
             static interpolate(from: LatLng, to: LatLng, fraction: number): LatLng;
         }
 
         export class poly {
             static containsLocation(point: LatLng, polygon: Polygon): boolean;
-            static isLocationOnEdge(point: LatLng, poly: any, tolerance?: number): boolean;
+            static isLocationOnEdge(point: LatLng, poly: Polygon|Polyline, tolerance?: number): boolean;
         }
     }
 
     /***** AdSense Library *****/
     export module adsense {
         export class AdUnit extends MVCObject {
-            constructor (container: Element, opts: AdUnitOptions);
+            constructor(container: Element, opts: AdUnitOptions);
+            getBackgroundColor(): string;
+            getBorderColor(): string;
             getChannelNumber(): string;
             getContainer(): Element;
             getFormat(): AdFormat;
             getMap(): Map;
             getPosition(): ControlPosition;
-            getPublisherId(): string;
+            getPublisherId(): string;            
+            getTextColor(): string;
+            getTitleColor(): string;
+            getUrlColor(): string;
+            setBackgroundColor(backgroundColor: string): void;
+            setBorderColor(borderColor: string): void;
             setChannelNumber(channelNumber: string): void;
             setFormat(format: AdFormat): void;
             setMap(map: Map): void;
             setPosition(position: ControlPosition): void;
+            setTextColor(textColor: string): void;
+            setTitleColor(titleColor: string): void;
+            setUrlColor(urlColor: string): void;
         }
 
         export interface AdUnitOptions {
+            backgroundColor?: string;
+            borderColor?: string;
             channelNumber?: string;
             format?: AdFormat;
             map?: Map;
             position?: ControlPosition;
             publisherId?: string;
+            textColor?: string;
+            titleColor?: string;
+            urlColor?: string;
         }
 
         export enum AdFormat {
             BANNER,
             BUTTON,
             HALF_BANNER,
+            LARGE_HORIZONTAL_LINK_UNIT,
             LARGE_RECTANGLE,
+            LARGE_VERTICAL_LINK_UNIT,
             LEADERBOARD,
             MEDIUM_RECTANGLE,
+            MEDIUM_VERTICAL_LINK_UNIT,
             SKYSCRAPER,
+            SMALL_HORIZONTAL_LINK_UNIT,
             SMALL_RECTANGLE,
             SMALL_SQUARE,
+            SMALL_VERTICAL_LINK_UNIT,
             SQUARE,
             VERTICAL_BANNER,
-            WIDE_SKYSCRAPER
-        }
-    }
-
-    /***** Panoramio Library *****/
-    export module panoramio {
-        export class PanoramioLayer extends MVCObject {
-            constructor (opts?: PanoramioLayerOptions);
-            getMap(): Map;
-            getTag(): string;
-            getUserId(): string;
-            setMap(map: Map): void;
-            setOptions(options: PanoramioLayerOptions): void;
-            setTag(tag: string): void;
-            setUserId(userId: string): void;
-        }
-
-        export interface PanoramioLayerOptions {
-            map?: Map;
-            suppressInfoWindows?: boolean;
-            tag?: string;
-            userId?: string;
-        }
-
-        export interface PanoramioFeature {
-            author: string;
-            photoId: string;
-            title: string;
-            url: string;
-            userId: string;
-        }
-
-        export interface PanoramioMouseEvent {
-            featureDetails: PanoramioFeature;
-            infoWindowHtml: string;
-            latLng: LatLng;
-            pixelOffset: Size;
+            WIDE_SKYSCRAPER,
+            X_LARGE_VERTICAL_LINK_UNIT
         }
     }
 
+    /***** Places Library *****/
     export module places {
-
-        export class AutocompleteService extends MVCObject {
-            constructor();
-            getPlacePredictions(request: AutocompletionRequest, callback: (result: AutocompletePrediction[], status: PlacesServiceStatus) => void): void;
-            getQueryPredictions(request: QueryAutocompletionRequest, callback: (result: QueryAutocompletePrediction[], status: PlacesServiceStatus) => void): void;
+        export class Autocomplete extends MVCObject {
+            constructor(inputField: HTMLInputElement, opts?: AutocompleteOptions);
+            getBounds(): LatLngBounds;
+            getPlace(): PlaceResult;
+            setBounds(bounds: LatLngBounds): void;
+            setComponentRestrictions(restrictions: ComponentRestrictions): void;
+            setTypes(types: string[]): void;
         }
 
-        export interface AutocompletionRequest {
-            input: string;
+        export interface AutocompleteOptions  {
             bounds?: LatLngBounds;
             componentRestrictions?: ComponentRestrictions;
-            location?: LatLng;
-            offset?: number;
-            radius?: number;
             types?: string[];
         }
 
-        export interface QueryAutocompletionRequest {
-            input: string;
-            bounds?: LatLngBounds;
-            location?: LatLng;
-            offset?: number;
-            radius?: number;
-        }
-
         export interface AutocompletePrediction {
             description: string;
             matched_substrings: PredictionSubstring[];
@@ -1724,58 +1823,46 @@ declare module google.maps {
             terms: PredictionTerm[];
             types: string[]
         }
-
+        
         export interface PredictionTerm {
             offset: number;
             value: string;
         }
-
+           
         export interface PredictionSubstring {
             length: number;
             offset: number;
+        }       
+        
+        export class AutocompleteService {
+            constructor();
+            getPlacePredictions(request: AutocompletionRequest, callback: (result: AutocompletePrediction[], status: PlacesServiceStatus) => void): void;
+            getQueryPredictions(request: QueryAutocompletionRequest, callback: (result: QueryAutocompletePrediction[], status: PlacesServiceStatus) => void): void;
         }
 
-        export interface QueryAutocompletePrediction {
-            description: string;
-            matched_substrings: PredictionSubstring[];
-            place_id: string;
-            terms: PredictionTerm[];
-        }
-
-        export class Autocomplete extends MVCObject {
-            constructor (inputField: HTMLInputElement, opts?: AutocompleteOptions);
-            getBounds(): LatLngBounds;
-            getPlace(): PlaceResult;
-            setBounds(bounds: LatLngBounds): void;
-            setComponentRestrictions(restrictions: ComponentRestrictions): void;
-            setTypes(types: string[]): void;
-        }
-
-        export interface AutocompleteOptions {
+        export interface AutocompletionRequest {
             bounds?: LatLngBounds;
             componentRestrictions?: ComponentRestrictions;
+            input: string;            
+            location?: LatLng;
+            offset?: number;
+            radius?: number;
             types?: string[];
         }
-
+        
         export interface ComponentRestrictions {
             country: string;
         }
 
-        export interface PhotoOptions {
-            maxHeight?: number;
-            maxWidth?: number;
-        }
-
         export interface PlaceAspectRating {
             rating: number;
             type: string;
         }
-
-        export interface PlaceDetailsRequest {
+        
+        export interface PlaceDetailsRequest  {
             placeId: string;
-            reference?: string;
         }
-
+        
         export interface PlaceGeometry {
             location: LatLng;
             viewport: LatLngBounds;
@@ -1787,6 +1874,11 @@ declare module google.maps {
             width: number;
             getUrl(opts: PhotoOptions): string;
         }
+        
+        export interface PhotoOptions {
+            maxHeight?: number;
+            maxWidth?: number;
+        }
 
         export interface PlaceResult {
             address_components: GeocoderAddressComponent[];
@@ -1796,7 +1888,6 @@ declare module google.maps {
             geometry: PlaceGeometry;
             html_attributions: string[];
             icon: string;
-            id?: string;
             international_phone_number: string;
             name: string;
             permanently_closed: boolean;
@@ -1804,7 +1895,6 @@ declare module google.maps {
             place_id: string;
             price_level: number;
             rating: number;
-            reference?: string;
             reviews: PlaceReview[];
             types: string[];
             url: string;
@@ -1819,11 +1909,16 @@ declare module google.maps {
             language: string;
             text: string;
         }
+        
+        export interface PlaceSearchPagination {
+            nextPage(): void;
+            hasNextPage: boolean;
+        }
 
         export interface PlaceSearchRequest {
             bounds: LatLngBounds;
             keyword: string;
-            location: LatLng;
+            location: LatLng|LatLngLiteral;
             maxPriceLevel?: number;
             minPriceLevel?: number;
             name: string;
@@ -1833,18 +1928,12 @@ declare module google.maps {
             types: string[];
         }
 
-        export interface PlaceSearchPagination {
-            nextPage(): void;
-            hasNextPage: boolean;
-        }
-
         export class PlacesService {
-            constructor (attrContainer: HTMLDivElement);
-            constructor (attrContainer: Map);
-            getDetails(request: PlaceDetailsRequest, callback: (result: PlaceResult, status: PlacesServiceStatus) => void ): void;
-            nearbySearch(request: PlaceSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus, pagination: PlaceSearchPagination) => void ): void;
-            radarSearch(request: RadarSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void ): void;
-            textSearch(request: TextSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void ): void;
+            constructor(attrContainer: HTMLDivElement|Map);
+            getDetails(request: PlaceDetailsRequest, callback: (result: PlaceResult, status: PlacesServiceStatus) => void): void;
+            nearbySearch(request: PlaceSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus, pagination: PlaceSearchPagination) => void): void;
+            radarSearch(request: RadarSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
+            textSearch(request: TextSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
         }
 
         export enum PlacesServiceStatus {
@@ -1856,10 +1945,24 @@ declare module google.maps {
             ZERO_RESULTS
         }
 
+        export interface QueryAutocompletePrediction {
+            description: string;
+            matched_substrings: PredictionSubstring[];
+            place_id: string;
+            terms: PredictionTerm[];
+        }
+
+        export interface QueryAutocompletionRequest {
+            bounds?: LatLngBounds;
+            input?: string;
+            location?: LatLng;
+            radius?: number;
+        }
+
         export interface RadarSearchRequest {
             bounds: LatLngBounds;
             keyword: string;
-            location: LatLng;
+            location: LatLng|LatLngLiteral;
             name: string;
             radius: number;
             types: string[];
@@ -1873,8 +1976,8 @@ declare module google.maps {
         export class SearchBox extends MVCObject {
             constructor(inputField: HTMLInputElement, opts?: SearchBoxOptions);
             getBounds(): LatLngBounds;
-            setBounds(bounds: LatLngBounds): void;
             getPlaces(): PlaceResult[];
+            setBounds(bounds: LatLngBounds): void;
         }
 
         export interface SearchBoxOptions {
@@ -1883,16 +1986,17 @@ declare module google.maps {
 
         export interface TextSearchRequest {
             bounds: LatLngBounds;
-            location: LatLng;
+            location: LatLng|LatLngLiteral;
             query: string;
             radius: number;
             types: string[];
         }
     }
 
+    /***** Drawing Library *****/
     export module drawing {
         export class DrawingManager extends MVCObject {
-            constructor (options?: DrawingManagerOptions);
+            constructor(options?: DrawingManagerOptions);
             getDrawingMode(): OverlayType;
             getMap(): Map;
             setDrawingMode(drawingMode: OverlayType): void;
@@ -1918,7 +2022,7 @@ declare module google.maps {
         }
 
         export interface OverlayCompleteEvent {
-            overlay: MVCObject;
+            overlay: Marker|Polygon|Polyline|Rectangle|Circle;
             type: OverlayType;
         }
 
@@ -1931,82 +2035,59 @@ declare module google.maps {
         }
     }
 
-    export module weather {
-        export class CloudLayer extends MVCObject {
-            constructor ();
-            getMap(): Map;
-            setMap(map: Map): void;
-        }
-        export class WeatherLayer extends MVCObject {
-            constructor (opts?: WeatherLayerOptions);
-            getMap(): Map;
-            setMap(map: Map): void;
-            setOptions(options: WeatherLayerOptions): void;
-        }
-
-        export interface WeatherLayerOptions {
-            clickable: boolean;
-            labelColor: LabelColor;
-            map: Map;
-            suppressInfoWindows: boolean;
-            temperatureUnits: TemperatureUnit;
-            windSpeedUnits: WindSpeedUnit;
-        }
-
-        export enum TemperatureUnit {
-            CELSIUS,
-            FAHRENHEIT
-        }
-
-        export enum WindSpeedUnit {
-            KILOMETERS_PER_HOUR,
-            METERS_PER_SECOND,
-            MILES_PER_HOUR
-        }
-
-        export enum LabelColor {
-            BLACK,
-            WHITE
-        }
-
-        export interface WeatherMouseEvent {
-            featureDetails: WeatherFeature;
-            infoWindowHtml: string;
-            latLng: LatLng;
-            pixelOffset: Size;
-        }
-
-        export interface WeatherFeature {
-            current: WeatherConditions;
-            forecast: WeatherForecast[];
-            location: string;
-            temperatureUnit: TemperatureUnit;
-            windSpeedUnit: WindSpeedUnit;
-        }
-
-        export interface WeatherConditions {
-            day: string;
-            description: string;
-            high: number;
-            humidity: number;
-            low: number;
-            shortDay: string;
-            temperature: number;
-            windDirection: string;
-            windSpeed: number;
-        }
-
-        export interface WeatherForecast {
-            day: string;
-            description: string;
-            high: number;
-            low: number;
-            shortDay: string;
-        }
-    }
+    /***** Visualization Library *****/
     export module visualization {
+        export class MapsEngineLayer extends MVCObject {
+            constructor(options: MapsEngineLayerOptions)
+            getLayerId(): string;
+            getLayerKey(): string;
+            getMap(): Map;
+            getMapId(): string;
+            getOpacity(): number;
+            getProperties(): MapsEngineLayerProperties;
+            getStatus(): MapsEngineStatus;
+            getZIndex(): number;
+            setLayerId(layerId: string): void;
+            setLayerKey(layerKey: string): void;
+            setMap(map: Map): void;
+            setMapId(mapId: string): void;
+            setOpacity(opacity: number): void;
+            setOptions(options: MapsEngineLayerOptions): void;
+            setZIndex(zIndex: number): void;
+        }
+        
+        export interface MapsEngineLayerOptions {
+            accessToken?: string;
+            clickable?: boolean;
+            fitBounds?: boolean;
+            layerId?: string;
+            layerKey?: string;
+            map?: Map;
+            mapId?: string;
+            opacity?: number;
+            suppressInfoWindows?: boolean;
+            zIndex?: number;
+        }
+        
+        export interface MapsEngineLayerProperties {
+            name: string;
+        }
+        
+        export interface MapsEngineMouseEvent {
+            featureId?: string;
+            infoWindowHtml?: string;
+            latLng?: LatLng;
+            pixelOffset?: Size;
+        }
+        
+        export enum MapsEngineStatus {
+            INVALID_LAYER,
+            OK,
+            UNKNOWN_ERROR   
+        }
+        
         export class HeatmapLayer extends MVCObject {
-            constructor (opts?: HeatmapLayerOptions);
+            constructor(opts?: HeatmapLayerOptions);
             getData(): MVCArray;
             getMap(): Map;
             setData(data: MVCArray): void;
diff --git a/gulp-debug/gulp-debug-tests.ts b/gulp-debug/gulp-debug-tests.ts
new file mode 100644
index 0000000000..e6485d8da9
--- /dev/null
+++ b/gulp-debug/gulp-debug-tests.ts
@@ -0,0 +1,14 @@
+/// <reference path="gulp-debug.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import gulp = require('gulp');
+import debug = require('gulp-debug');
+
+gulp.task('default', () =>
+    gulp.src('foo.js')
+        .pipe(debug({title: 'unicorn:'}))
+        .pipe(gulp.dest('dist'))
+);
+
+
+debug();
diff --git a/gulp-debug/gulp-debug.d.ts b/gulp-debug/gulp-debug.d.ts
new file mode 100644
index 0000000000..743f5f5eb1
--- /dev/null
+++ b/gulp-debug/gulp-debug.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for gulp-debug v2.0.1
+// Project: https://github.com/sindresorhus/gulp-debug
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'gulp-debug' {
+    interface IOptions {
+        title?: string;
+        minimal?: boolean;
+    }
+
+    function debug(options?: IOptions): NodeJS.ReadWriteStream;
+
+    export = debug;
+}
diff --git a/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts b/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
new file mode 100644
index 0000000000..c28b312f42
--- /dev/null
+++ b/gulp-jasmine-browser/gulp-jasmine-browser-tests.ts
@@ -0,0 +1,32 @@
+/// <reference path="gulp-jasmine-browser.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import gulp = require('gulp');
+import jasmineBrowser = require('gulp-jasmine-browser');
+
+gulp.task('jasmine', () =>
+  gulp.src(['src/**/*.js', 'spec/**/*_spec.js'])
+    .pipe(jasmineBrowser.specRunner())
+    .pipe(jasmineBrowser.server({port: 8888}))
+);
+
+
+gulp.task('jasmine-phantom', () =>
+  gulp.src(['src/**/*.js', 'spec/**/*_spec.js'])
+    .pipe(jasmineBrowser.specRunner({console: true}))
+    .pipe(jasmineBrowser.headless())
+);
+
+
+gulp.task('jasmine-slimerjs', () =>
+  gulp.src(['src/**/*.js', 'spec/**/*_spec.js'])
+    .pipe(jasmineBrowser.specRunner({console: true}))
+    .pipe(jasmineBrowser.headless({driver: 'slimerjs'}))
+);
+
+
+gulp.task('jasmine', () =>
+  gulp.src('spec/**/*_spec.js')
+    .pipe(jasmineBrowser.specRunner())
+    .pipe(jasmineBrowser.server())
+);
diff --git a/gulp-jasmine-browser/gulp-jasmine-browser.d.ts b/gulp-jasmine-browser/gulp-jasmine-browser.d.ts
new file mode 100644
index 0000000000..e2e7179699
--- /dev/null
+++ b/gulp-jasmine-browser/gulp-jasmine-browser.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for gulp-jasmine-browser v0.1.4
+// Project: https://github.com/jasmine/gulp-jasmine-browser
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'gulp-jasmine-browser' {
+    interface IJasmineBrowser {
+        specRunner(options?: any): NodeJS.ReadWriteStream;
+        server(options?: any): NodeJS.ReadWriteStream;
+        headless(options?: any): NodeJS.ReadWriteStream;
+    }
+
+    var jasmineBrowser: IJasmineBrowser;
+    export = jasmineBrowser;
+}
diff --git a/gulp-protractor/gulp-protractor-tests.ts b/gulp-protractor/gulp-protractor-tests.ts
new file mode 100644
index 0000000000..4224084d8b
--- /dev/null
+++ b/gulp-protractor/gulp-protractor-tests.ts
@@ -0,0 +1,20 @@
+/// <reference path="gulp-protractor.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import gulp = require('gulp');
+import protractor = require('gulp-protractor');
+
+gulp.src(["./src/tests/*.js"])
+    .pipe(protractor.protractor({
+        configFile: "test/protractor.config.js",
+        args: ['--baseUrl', 'http://127.0.0.1:8000']
+    }))
+
+
+gulp.task('webdriver_standalone', protractor.webdriver_standalone);
+
+
+gulp.task('webdriver-update', protractor.webdriver_update);
+
+
+console.log(protractor.getProtractorDir());
diff --git a/gulp-protractor/gulp-protractor.d.ts b/gulp-protractor/gulp-protractor.d.ts
new file mode 100644
index 0000000000..d0317e2e2d
--- /dev/null
+++ b/gulp-protractor/gulp-protractor.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for gulp-protractor v1.0.0
+// Project: https://github.com/mllrsohn/gulp-protractor
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+declare module 'gulp-protractor' {
+    interface IOptions {
+        configFile?: string;
+        args?: Array<string>;
+        debug?: boolean;
+    }
+
+    interface IGulpProtractor {
+        getProtractorDir(): string;
+        protractor(options?: IOptions): NodeJS.ReadWriteStream;
+        webdriver_standalone: gulp.ITaskCallback;
+        webdriver_update: gulp.ITaskCallback;
+    }
+
+    var protractor: IGulpProtractor;
+    export = protractor;
+}
diff --git a/gulp-rev-replace/gulp-rev-replace-tests.ts b/gulp-rev-replace/gulp-rev-replace-tests.ts
new file mode 100644
index 0000000000..57515c9aca
--- /dev/null
+++ b/gulp-rev-replace/gulp-rev-replace-tests.ts
@@ -0,0 +1,63 @@
+/// <reference path="gulp-rev-replace.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="../gulp-rev/gulp-rev.d.ts" />
+/// <reference path="../gulp-useref/gulp-useref.d.ts" />
+
+import gulp = require('gulp');
+import revReplace = require('gulp-rev-replace');
+import rev = require('gulp-rev');
+import useref = require('gulp-useref');
+
+gulp.task("index", () => {
+    var userefAssets = useref.assets();
+
+    return gulp.src("src/index.html")
+        .pipe(userefAssets)      // Concatenate with gulp-useref
+        .pipe(rev())                // Rename the concatenated files
+        .pipe(userefAssets.restore())
+        .pipe(useref())
+        .pipe(revReplace())         // Substitute in new filenames
+        .pipe(gulp.dest('public'));
+});
+
+
+var opt = {
+    srcFolder: 'src',
+    distFolder: 'dist'
+}
+
+gulp.task("revision", ["dist:css", "dist:js"], () =>
+    gulp.src(["dist/**/*.css", "dist/**/*.js"])
+        .pipe(rev())
+        .pipe(gulp.dest(opt.distFolder))
+        .pipe(rev.manifest())
+        .pipe(gulp.dest(opt.distFolder))
+);
+
+gulp.task("revreplace", ["revision"], () => {
+    var manifest = gulp.src("./" + opt.distFolder + "/rev-manifest.json");
+
+    return gulp.src(opt.srcFolder + "/index.html")
+        .pipe(revReplace({manifest: manifest}))
+        .pipe(gulp.dest(opt.distFolder));
+});
+
+
+function replaceJsIfMap(filename: string): string {
+    if (filename.indexOf('.map') > -1) {
+        return filename.replace('js/', '');
+    }
+    return filename;
+}
+
+gulp.task("revreplace", ["revision"], () => {
+    var manifest = gulp.src("./" + opt.distFolder + "/rev-manifest.json");
+
+    return gulp.src(opt.distFolder + '**/*.js')
+        .pipe(revReplace({
+            manifest: manifest,
+            modifyUnreved: replaceJsIfMap,
+            modifyReved: replaceJsIfMap
+        }))
+        .pipe(gulp.dest(opt.distFolder));
+});
diff --git a/gulp-rev-replace/gulp-rev-replace.d.ts b/gulp-rev-replace/gulp-rev-replace.d.ts
new file mode 100644
index 0000000000..3e683d183d
--- /dev/null
+++ b/gulp-rev-replace/gulp-rev-replace.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for gulp-rev-replace v0.2.1
+// Project: https://github.com/jamesknelson/gulp-rev-replace
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'gulp-rev-replace' {
+    interface IOptions {
+        canonicalUris?: boolean;
+        replaceInExtensions?: Array<string>;
+        prefix?: string;
+        manifest?: NodeJS.ReadWriteStream;
+        modifyUnreved?: Function;
+        modifyReved?: Function;
+    }
+
+    function revReplace(options?: IOptions): NodeJS.ReadWriteStream;
+
+    export = revReplace;
+}
diff --git a/gulp-rev/gulp-rev-tests.ts b/gulp-rev/gulp-rev-tests.ts
new file mode 100644
index 0000000000..37661424f1
--- /dev/null
+++ b/gulp-rev/gulp-rev-tests.ts
@@ -0,0 +1,36 @@
+/// <reference path="gulp-rev.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import gulp = require('gulp');
+import rev = require('gulp-rev');
+
+gulp.task('default', () =>
+    gulp.src('src/*.css')
+        .pipe(rev())
+        .pipe(gulp.dest('dist'))
+);
+
+gulp.task('default', () =>
+    // by default, gulp would pick `assets/css` as the base,
+    // so we need to set it explicitly:
+    gulp.src(['assets/css/*.css', 'assets/js/*.js'], {base: 'assets'})
+        .pipe(gulp.dest('build/assets'))  // copy original assets to build dir
+        .pipe(rev())
+        .pipe(gulp.dest('build/assets'))  // write rev'd assets to build dir
+        .pipe(rev.manifest())
+        .pipe(gulp.dest('build/assets')) // write manifest to build dir
+);
+
+gulp.task('default', () =>
+    // by default, gulp would pick `assets/css` as the base,
+    // so we need to set it explicitly:
+    gulp.src(['assets/css/*.css', 'assets/js/*.js'], {base: 'assets'})
+        .pipe(gulp.dest('build/assets'))
+        .pipe(rev())
+        .pipe(gulp.dest('build/assets'))
+        .pipe(rev.manifest({
+            base: 'build/assets',
+            merge: true // merge with the existing manifest (if one exists)
+        }))
+        .pipe(gulp.dest('build/assets'))
+);
diff --git a/gulp-rev/gulp-rev.d.ts b/gulp-rev/gulp-rev.d.ts
new file mode 100644
index 0000000000..6cd432b0de
--- /dev/null
+++ b/gulp-rev/gulp-rev.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for gulp-csso v5.0.1
+// Project: https://github.com/sindresorhus/gulp-rev
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'gulp-rev' {
+    interface IOptions {
+        base?: string;
+        cwd?: string;
+        merge?: boolean;
+    }
+
+    interface IRev {
+        (): NodeJS.ReadWriteStream;
+
+        manifest(): NodeJS.ReadWriteStream;
+        manifest(path?: string): NodeJS.ReadWriteStream;
+        manifest(options?: IOptions): NodeJS.ReadWriteStream;
+        manifest(path?: string, options?: IOptions): NodeJS.ReadWriteStream;
+    }
+
+    var rev: IRev;
+    export = rev;
+}
diff --git a/gulp-size/gulp-size-tests.ts b/gulp-size/gulp-size-tests.ts
new file mode 100644
index 0000000000..bfa2c6a04b
--- /dev/null
+++ b/gulp-size/gulp-size-tests.ts
@@ -0,0 +1,27 @@
+/// <reference path="gulp-size.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+/// <reference path="../gulp-debug/gulp-debug.d.ts" />
+
+import gulp = require('gulp');
+import size = require('gulp-size');
+import debug = require('gulp-debug');
+
+gulp.task('default', () =>
+    gulp.src('fixture.js')
+        .pipe(size())
+        .pipe(gulp.dest('dist'))
+);
+
+
+gulp.task('default', () => {
+    var s = size();
+
+    return gulp.src('fixture.js')
+        .pipe(s)
+        .pipe(gulp.dest('dist'))
+        .pipe(debug({title: 'Total size ' + s.prettySize}));
+});
+
+
+size();
+size({showFiles: true, gzip: true});
diff --git a/gulp-size/gulp-size.d.ts b/gulp-size/gulp-size.d.ts
new file mode 100644
index 0000000000..d25f6ed94b
--- /dev/null
+++ b/gulp-size/gulp-size.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for gulp-size v1.2.3
+// Project: https://github.com/sindresorhus/gulp-size
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'gulp-size' {
+    interface IOptions {
+        showFiles?: boolean;
+        gzip?: boolean;
+        title?: string;
+    }
+
+    interface ISizeStream extends NodeJS.ReadWriteStream {
+      size: number;
+      prettySize: string;
+    }
+
+    function size(options?: IOptions): ISizeStream;
+
+    export = size;
+}
diff --git a/gulp-uglify/gulp-uglify-tests.ts b/gulp-uglify/gulp-uglify-tests.ts
new file mode 100644
index 0000000000..e4f1f0d8a0
--- /dev/null
+++ b/gulp-uglify/gulp-uglify-tests.ts
@@ -0,0 +1,24 @@
+/// <reference path="./gulp-uglify.d.ts"/>
+/// <reference path="../gulp/gulp.d.ts"/>
+import gulp = require("gulp");
+import uglify = require("gulp-uglify");
+
+
+gulp.task('compress', function() {
+    var tsResult = gulp.src('lib/*.ts')
+        .pipe(uglify())
+        .pipe(gulp.dest('dist'));
+});
+
+gulp.task('compress2', function() {
+    var tsResult = gulp.src('lib/*.ts')
+        .pipe(uglify({
+            mangle: false,
+            preserverComments: "some",
+            compress: false,
+            output: {
+                max_line_len: 300
+            }
+        }))
+        .pipe(gulp.dest('dist'));
+});
\ No newline at end of file
diff --git a/gulp-uglify/gulp-uglify.d.ts b/gulp-uglify/gulp-uglify.d.ts
new file mode 100644
index 0000000000..840b5110bd
--- /dev/null
+++ b/gulp-uglify/gulp-uglify.d.ts
@@ -0,0 +1,175 @@
+// Type definitions for gulp-uglify
+// Project: https://github.com/terinjokes/gulp-uglify
+// Definitions by: Christopher Haws <https://github.com/ChristopherHaws/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts"/>
+
+declare module "gulp-uglify" {
+    function GulpUglify(options?: IGulpUglifyOptions): NodeJS.ReadWriteStream;
+
+    interface IGulpUglifyOptions {
+        /**
+         * Pass false to skip mangling names.
+         */
+        mangle?: boolean;
+
+        /**
+         * Pass if you wish to specify additional output options. The defaults are optimized for best compression.
+         */
+        output?: IOutputOptions;
+
+        /**
+         * Pass an object to specify custom compressor options. Pass false to skip compression completely.
+         */
+        compress?: boolean;
+
+        /**
+         * A convenience option for options.output.comments. Defaults to preserving no comments.
+         * all - Preserve all comments in code blocks
+         * some - Preserve comments that start with a bang (!) or include a Closure Compiler directive (@preserve, @license, @cc_on)
+         * function - Specify your own comment preservation function. You will be passed the current node and the current comment and are expected to return either true or false.
+         */
+        preserverComments?: string|((node: any, comment: ITokenizer) => boolean);
+    }
+
+    interface IOutputOptions {
+        /**
+         * Start indentation on every line (only when `beautify`)
+         */
+        indent_start?: number;
+
+        /**
+         * Indentation level (only when `beautify`)
+         */
+        indent_level?: number;
+
+        /**
+         * Quote all keys in object literals?
+         */
+        quote_keys?: boolean;
+
+        /**
+         * Add a space after colon signs?
+         */
+        space_colon?: boolean;
+
+        /**
+         * Output ASCII-safe? (encodes Unicode characters as ASCII)
+         */
+        ascii_only?: boolean;
+
+        /**
+         * Escape "</script"?
+         */
+        inline_script?: boolean;
+
+        /**
+         * Informative maximum line width (for beautified output)
+         */
+        width?: number;
+
+        /**
+         * Maximum line length (for non-beautified output)
+         */
+        max_line_len?: number;
+
+        /**
+         * Output IE-safe code?
+         */
+        ie_proof?: boolean;
+
+        /**
+         * Beautify output?
+         */
+        beautify?: boolean;
+
+        /**
+         * Output a source map
+         */
+        source_map?: ISourceMapOptions;
+
+        /**
+         * Use brackets every time?
+         */
+        bracketize?: boolean;
+
+        /**
+         * Output comments?
+         */
+        comments?: boolean;
+
+        /**
+         * Use semicolons to separate statements? (otherwise, newlines)
+         */
+        semicolons?: boolean;
+    }
+
+    interface ISourceMapOptions {
+        /**
+         * The compressed file name
+         */
+        file?: string;
+        /**
+         * The root URL to the original sources
+         */
+        root?: string;
+
+        /**
+         * The input source map.
+         * Useful when you compress code that was generated from some other source (possibly other programming language).
+         * If you have an input source map, pass it in this argument and UglifyJS will generate a mapping that maps back
+         * to the original source (as opposed to the compiled code that you are compressing).
+         */
+        orig? :Object|JSON;
+    }
+    
+    interface ITokenizer {
+        /**
+         * The type of this token.
+         * Can be "num", "string", "regexp", "operator", "punc", "atom", "name", "keyword", "comment1" or "comment2".
+         * "comment1" and "comment2" are for single-line, respectively multi-line comments.
+         */
+        type: string;
+        
+        /**
+         * The name of the file where this token originated from. Useful when compressing multiple files at once to generate the proper source map.
+         */
+        file: string;
+        
+        /**
+         * The "value" of the token.
+         * That's additional information and depends on the token type: "num", "string" and "regexp" tokens you get their literal value.
+         * - For "operator" you get the operator.
+         * - For "punc" it's the punctuation sign (parens, comma, semicolon etc).
+         * - For "atom", "name" and "keyword" it's the name of the identifier
+         * - For comments it's the body of the comment (excluding the initial "//" and "/*".
+         */
+        value: string;
+        
+        /**
+         * The line number of this token in the original code.
+         * 1-based index.
+         */
+        line: number;
+        
+        /**
+         * The column number of this token in the original code.
+         * 0-based index.
+         */
+        col: number;
+        
+        /**
+         * Short for "newline before", it's a boolean that tells us whether there was a newline before this node in the original source. It helps for automatic semicolon insertion.
+         * For multi-line comments in particular this will be set to true if there either was a newline before this comment, or * * if this comment contains a newline.
+         */
+        nlb: boolean;
+        
+        /**
+         * This doesn't apply for comment tokens, but for all other token types it will be an array of comment tokens that were found before.
+         */
+        comments_before: string[];
+    }
+
+    export = GulpUglify;
+}
\ No newline at end of file
diff --git a/gulp-useref/gulp-useref-tests.ts b/gulp-useref/gulp-useref-tests.ts
new file mode 100644
index 0000000000..95c35662dc
--- /dev/null
+++ b/gulp-useref/gulp-useref-tests.ts
@@ -0,0 +1,15 @@
+/// <reference path="gulp-useref.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import gulp = require('gulp');
+import useref = require('gulp-useref');
+
+gulp.task('default', () => {
+    var assets = useref.assets();
+
+    return gulp.src('app/*.html')
+        .pipe(assets)
+        .pipe(assets.restore())
+        .pipe(useref())
+        .pipe(gulp.dest('dist'));
+});
diff --git a/gulp-useref/gulp-useref.d.ts b/gulp-useref/gulp-useref.d.ts
new file mode 100644
index 0000000000..b1628aa5fb
--- /dev/null
+++ b/gulp-useref/gulp-useref.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for gulp-useref v1.2.0
+// Project: https://github.com/jonkemp/gulp-useref
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'gulp-useref' {
+    interface IAssetsOptions {
+        searchPath?: string | string[];
+        noconcat?: boolean;
+    }
+
+    interface IAssetsStream extends NodeJS.ReadWriteStream {
+        restore(): NodeJS.ReadWriteStream;
+    }
+
+    interface IUseref {
+        (options?: any): NodeJS.ReadWriteStream;
+        assets(options?: IAssetsOptions): IAssetsStream;
+    }
+
+    var useref: IUseref;
+    export = useref;
+}
diff --git a/gulp-watch/gulp-watch-tests.ts b/gulp-watch/gulp-watch-tests.ts
new file mode 100644
index 0000000000..9d9303ac22
--- /dev/null
+++ b/gulp-watch/gulp-watch-tests.ts
@@ -0,0 +1,30 @@
+/// <reference path="gulp-watch.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import gulp = require('gulp');
+import watch = require('gulp-watch');
+
+gulp.task('stream', () =>
+    gulp.src('css/**/*.css')
+        .pipe(watch('css/**/*.css'))
+        .pipe(gulp.dest('build'))
+);
+
+gulp.task('callback', (cb) =>
+    watch('css/**/*.css', () =>
+        gulp.src('css/**/*.css')
+            .pipe(watch('css/**/*.css'))
+            .on('end', cb)
+    )
+);
+
+gulp.task('build', () => {
+    var files = [
+        'app/**/*.ts',
+        'lib/**/*.ts',
+        'components/**/*.ts',
+    ];
+
+    gulp.src(files, { base: '..' })
+        .pipe(watch(files, { base: '..' }));
+});
diff --git a/gulp-watch/gulp-watch.d.ts b/gulp-watch/gulp-watch.d.ts
new file mode 100644
index 0000000000..35fb7de955
--- /dev/null
+++ b/gulp-watch/gulp-watch.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for gulp-watch v4.1.1
+// Project: https://github.com/floatdrop/gulp-watch
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'gulp-watch' {
+    interface IOptions {
+        ignoreInitial?: boolean;
+        events?: Array<string>;
+        base?: string;
+        name?: string;
+        verbose?: boolean;
+        readDelay?: number;
+    }
+
+    interface IWatchStream extends NodeJS.ReadWriteStream {
+        add(path: string | Array<string>): NodeJS.ReadWriteStream;
+        unwatch(path: string | Array<string>): NodeJS.ReadWriteStream;
+        close(): NodeJS.ReadWriteStream;
+    }
+
+    function watch(glob: string | Array<string>, options?: IOptions, callback?: Function): IWatchStream;
+
+    export = watch;
+}
diff --git a/hapi/hapi-8.2.0.d.ts b/hapi/hapi-8.2.0.d.ts
new file mode 100644
index 0000000000..8d3da2620b
--- /dev/null
+++ b/hapi/hapi-8.2.0.d.ts
@@ -0,0 +1,2212 @@
+// Type definitions for hapi 8.2.0
+// Project: http://github.com/spumko/hapi
+// Definitions by: Jason Swearingen <http://github.com/jasonswearingen>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+//This is a total rewrite of Hakubo's original hapi.d.ts, as it was out of date/incomplete.
+
+
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../bluebird/bluebird.d.ts" />
+
+
+
+
+declare module "hapi" {
+	import http = require("http");
+	import stream = require("stream");
+	import Events = require("events");
+
+	interface IDictionary<T> {
+		[key: string]: T;
+	}
+
+	/** Boom Module for errors. https://github.com/hapijs/boom
+	*  boom provides a set of utilities for returning HTTP errors. Each utility returns a Boom error response object (instance of Error) which includes the following properties:  */
+	export interface IBoom extends Error {
+		/**  if true, indicates this is a Boom object instance.  */
+		isBoom: boolean;
+		/** convenience bool indicating status code >= 500.  */
+		isServer: boolean;
+		/**  the error message.  */
+		message: string;
+		/**  the formatted response.Can be directly manipulated after object construction to return a custom error response.Allowed root keys:  */
+		output: {
+			/** the HTTP status code (typically 4xx or 5xx).  */
+			statusCode: number;
+			/** an object containing any HTTP headers where each key is a header name and value is the header content.  */
+			headers: IDictionary<string>;
+			/** the formatted object used as the response payload (stringified).Can be directly manipulated but any changes will be lost if reformat() is called.Any content allowed and by default includes the following content: */
+			payload: {
+				/** the HTTP status code, derived from error.output.statusCode.  */
+				statusCode: number;
+				/** the HTTP status message (e.g. 'Bad Request', 'Internal Server Error') derived from statusCode.  */
+				error: string;
+				/** the error message derived from error.message. */
+				message: string;
+			};
+		};
+		/**  reformat()rebuilds error.output using the other object properties.  */
+		reformat(): void;
+
+	}
+
+	/** cache functionality via the "CatBox" module. */
+	export interface ICatBoxCacheOptions {
+		/**  a prototype function or catbox engine object.  */
+		engine: any;
+		/**   an identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.  */
+		name?: string;
+		/**   if true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.  */
+		shared?: boolean;
+	}
+
+	/** Any connections configuration server defaults can be included to override and customize the individual connection. */
+	export interface ISeverConnectionOptions extends IConnectionConfigurationServerDefaults {
+		/**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
+		host?: string;
+		/** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
+		address?: string;
+		/** - the TCP port the connection will listen to.Defaults to an ephemeral port (0) which uses an available port when the server is started (and assigned to server.info.port).If port is a string containing a '/' character, it is used as a UNIX domain socket path and if it starts with '\.\pipe' as a Windows named pipe.*/
+		port?: string|number;
+		/** - the full public URI without the path (e.g. 'http://example.com:8080').If present, used as the connection info.uri otherwise constructed from the connection settings.*/
+		uri?: string;
+		/**  - optional node.js HTTP (or HTTPS) http.Server object or any compatible object.If the listener needs to be manually started, set autoListen to false.If the listener uses TLS, set tls to true.*/
+		listener?: any;
+		/**  - indicates that the connection.listener will be started manually outside the framework.Cannot be specified with a port setting.Defaults to true.*/
+		autoListen?: boolean;
+		/**  caching headers configuration: */
+		cache?: {
+			/** - an array of HTTP response status codes (e.g. 200) which are allowed to include a valid caching directive.Defaults to [200]. */
+			statuses: number[];
+		};
+		/** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
+		labels?: string|string[];
+		/**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
+		tls?: boolean;
+
+	}
+
+	export interface IConnectionConfigurationServerDefaults {
+		/**  application-specific connection configuration which can be accessed via connection.settings.app. Provides a safe place to store application configuration without potential conflicts with the framework internals. Should not be used to configure plugins which should use plugins[name]. Note the difference between connection.settings.app which is used to store configuration values and connection.app which is meant for storing run-time state.  */
+		app?: any;
+		/**  connection load limits configuration where:  */
+		load?: {
+			/**  maximum V8 heap size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+			maxHeapUsedBytes: number;
+			/**  maximum process RSS size over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+			maxRssBytes: number;
+			/**  maximum event loop delay duration in milliseconds over which incoming requests are rejected with an HTTP Server Timeout (503) response. Defaults to 0 (no limit).  */
+			maxEventLoopDelay: number;
+		};
+		/**  plugin-specific configuration which can later be accessed via connection.settings.plugins. Provides a place to store and pass connection-specific plugin configuration. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between connection.settings.plugins which is used to store configuration values and connection.plugins which is meant for storing run-time state. */
+		plugins?: any;
+		/**  controls how incoming request URIs are matched against the routing table: */
+		router?: {
+			/**  determines whether the paths '/example' and '/EXAMPLE' are considered different resources. Defaults to true.  */
+			isCaseSensitive: boolean;
+			/**  removes trailing slashes on incoming paths. Defaults to false.  */
+			stripTrailingSlash: boolean;
+		};
+		/** a route options object used to set the default configuration for every route. */
+		routes?: IRouteAdditionalConfigurationOptions;
+		state?: IServerState;
+	}
+
+	/** Note that the options object is deeply cloned and cannot contain any values that are unsafe to perform deep copy on.*/
+	export interface IServerOptions {
+		/**  application-specific configuration which can later be accessed via server.settings.app. Note the difference between server.settings.app which is used to store static configuration values and server.app which is meant for storing run-time state. Defaults to {}.  */
+		app?: any;
+		/**   sets up server-side caching. Every server includes a default cache for storing application state. By default, a simple memory-based cache is created which has limited capacity and capabilities. hapi uses catbox for its cache which includes support for common storage solutions (e.g. Redis, MongoDB, Memcached, and Riak). Caching is only utilized if methods and plugins explicitly store their state in the cache. The server cache configuration only defines the storage container itself. cache can be assigned:
+		a prototype function (usually obtained by calling require() on a catbox strategy such as require('catbox-redis')).
+		a configuration object with the following options:
+		enginea prototype function or catbox engine object.
+		namean identifier used later when provisioning or configuring caching for server methods or plugins. Each cache name must be unique. A single item may omit the name option which defines the default cache. If every cache includes a name, a default memory cache is provisions as well.
+		sharedif true, allows multiple cache users to share the same segment (e.g. multiple methods using the same cache storage container). Default to false.
+		other options passed to the catbox strategy used.
+		an array of the above object for configuring multiple cache instances, each with a unique name. When an array of objects is provided, multiple cache connections are established and each array item (except one) must include a name.  */
+		cache?: string|ICatBoxCacheOptions|Array<ICatBoxCacheOptions>|any;
+		/**  sets the default connections configuration which can be overridden by each connection where:  */
+		connections?: IConnectionConfigurationServerDefaults;
+		/** determines which logged events are sent to the console (this should only be used for development and does not affect which events are actually logged internally and recorded). Set to false to disable all console logging, or to an object*/
+		debug?: boolean|{
+			/** - a string array of server log tags to be displayed via console.error() when the events are logged via server.log() as well as internally generated server logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error. */
+			log: string[];
+			/**  - a string array of request log tags to be displayed via console.error() when the events are logged via request.log() as well as internally generated request logs. For example, to display all errors, set the option to ['error']. To turn off all console debug messages set it to false. Defaults to uncaught errors thrown in external code (these errors are handled automatically and result in an Internal Server Error response) or runtime errors due to developer error.*/
+			request: string[];
+		};
+		/** file system related settings*/
+		files?: {
+			/**  sets the maximum number of file etag hash values stored in the etags cache. Defaults to 10000.*/
+			etagsCacheMaxSize?: number;
+		};
+		/**  process load monitoring*/
+		load?: {
+			/**  the frequency of sampling in milliseconds. Defaults to 0 (no sampling).*/
+			sampleInterval?: number;
+		};
+
+		/** options passed to the mimos module (https://github.com/hapijs/mimos) when generating the mime database used by the server and accessed via server.mime.*/
+		mime?: any;
+		/**  if true, does not load the inert (file and directory support), h2o2 (proxy support), and vision (views support) plugins automatically. The plugins can be loaded manually after construction. Defaults to false (plugins loaded). */
+		minimal?: boolean;
+		/** plugin-specific configuration which can later be accessed via server.settings.plugins. plugins is an object where each key is a plugin name and the value is the configuration. Note the difference between server.settings.plugins which is used to store static configuration values and server.plugins which is meant for storing run-time state. Defaults to {}.*/
+		plugins?: IDictionary<any>;
+
+	}
+
+	export interface IServerViewCompile {
+		(template: string, options: any): void;
+		(template: string, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: boolean) => void) => void) => void): void;
+	}
+
+	export interface IServerViewsAdditionalOptions {
+		/**	path - the root file path used to resolve and load the templates identified when calling reply.view().Defaults to current working directory.*/
+		path?: string;
+		/**partialsPath - the root file path where partials are located.Partials are small segments of template code that can be nested and reused throughout other templates.Defaults to no partials support (empty path).
+		*/
+		partialsPath?: string;
+		/**helpersPath - the directory path where helpers are located.Helpers are functions used within templates to perform transformations and other data manipulations using the template context or other inputs.Each '.js' file in the helpers directory is loaded and the file name is used as the helper name.The files must export a single method with the signature function(context) and return a string.Sub - folders are not supported and are ignored.Defaults to no helpers support (empty path).Note that jade does not support loading helpers this way.*/
+		helpersPath?: string;
+		/**relativeTo - a base path used as prefix for path and partialsPath.No default.*/
+		relativeTo?: string;
+
+		/**layout - if set to true or a layout filename, layout support is enabled.A layout is a single template file used as the parent template for other view templates in the same engine.If true, the layout template name must be 'layout.ext' where 'ext' is the engine's extension. Otherwise, the provided filename is suffixed with the engine's extension and loaded.Disable layout when using Jade as it will handle including any layout files independently.Defaults to false.*/
+		layout?: boolean;
+		/**layoutPath - the root file path where layout templates are located (using the relativeTo prefix if present). Defaults to path.*/
+		layoutPath?: string;
+		/**layoutKeyword - the key used by the template engine to denote where primary template content should go.Defaults to 'content'.*/
+		layoutKeywork?: string;
+		/**encoding - the text encoding used by the templates when reading the files and outputting the result.Defaults to 'utf8'.*/
+		encoding?: string;
+		/**isCached - if set to false, templates will not be cached (thus will be read from file on every use).Defaults to true.*/
+		isCached?: boolean;
+		/**allowAbsolutePaths - if set to true, allows absolute template paths passed to reply.view().Defaults to false.*/
+		allowAbsolutePaths?: boolean;
+		/**allowInsecureAccess - if set to true, allows template paths passed to reply.view() to contain '../'.Defaults to false.*/
+		allowInsecureAccess?: boolean;
+		/**compileOptions - options object passed to the engine's compile function. Defaults to empty options {}.*/
+		compileOptions?: any;
+		/**runtimeOptions - options object passed to the returned function from the compile operation.Defaults to empty options {}.*/
+		runtimeOptions?: any;
+		/**contentType - the content type of the engine results.Defaults to 'text/html'.*/
+		contentType?: string;
+		/**compileMode - specify whether the engine compile() method is 'sync' or 'async'.Defaults to 'sync'.*/
+		compileMode?: string;
+		/**context - a global context used with all templates.The global context option can be either an object or a function that takes no arguments and returns a context object.When rendering views, the global context will be merged with any context object specified on the handler or using reply.view().When multiple context objects are used, values from the global context always have lowest precedence.*/
+		context?: any;
+	}
+
+	export interface IServerViewsEnginesOptions extends IServerViewsAdditionalOptions {
+		/**- the npm module used for rendering the templates.The module object must contain: "module", the rendering function. The required function signature depends on the compileMode settings.
+		* If the compileMode is 'sync', the signature is compile(template, options), the return value is a function with signature function(context, options), and the method is allowed to throw errors.If the compileMode is 'async', the signature is compile(template, options, callback) where callback has the signature function(err, compiled) where compiled is a function with signature function(context, options, callback) and callback has the signature function(err, rendered).*/
+		module: {
+			compile? (template: any, options: any): (context: any, options: any) => void;
+			compile? (template: any, options: any, callback: (err: any, compiled: (context: any, options: any, callback: (err: any, rendered: any) => void) => void) => void): void;
+		};
+	}
+
+	/**Initializes the server views manager
+	var Hapi = require('hapi');
+	var server = new Hapi.Server();
+	
+	server.views({
+	engines: {
+	html: require('handlebars'),
+	jade: require('jade')
+	},
+	path: '/static/templates'
+	});
+	When server.views() is called within a plugin, the views manager is only available to plugins methods.
+	*/
+	export interface IServerViewsConfiguration extends IServerViewsAdditionalOptions {
+		/** - required object where each key is a file extension (e.g. 'html', 'hbr'), mapped to the npm module used for rendering the templates.Alternatively, the extension can be mapped to an object with the following options:*/
+		engines: IDictionary<any>|IServerViewsEnginesOptions;
+		/**  defines the default filename extension to append to template names when multiple engines are configured and not explicit extension is provided for a given template. No default value.*/
+		defaultExtension?: string;
+	}
+
+	/**  Concludes the handler activity by setting a response and returning control over to the framework where:
+	erran optional error response.
+	resultan optional response payload.
+	Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first. 
+	FLOW CONTROL:	
+	When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
+	export interface IReply {
+		<T>(err: Error,
+		result?: string|number|boolean|Buffer|stream.Stream | Promise<T> | T,
+		/**  Note that when used to return both an error and credentials in the authentication methods, reply() must be called with three arguments function(err, null, data) where data is the additional authentication information. */
+		credentialData?: any
+		): IBoom;
+		/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
+		<T>(result: string|number|boolean|Buffer|stream.Stream | Promise<T> | T): Response;
+
+		/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200. 
+		  * The data argument is only used for passing back authentication data and is ignored elsewhere. */
+		continue(credentialData?: any): void;
+
+		/** Transmits a file from the file system. The 'Content-Type' header defaults to the matching mime type based on filename extension.  The response flow control rules do not apply. */
+		file(
+			/**   the file path. */
+			path: string,
+			/**  optional settings:  */
+			options?: {
+				/** - an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
+				filename?: string;
+				/** specifies whether to include the 'Content-Disposition' header with the response. Available values:
+				false - header is not included. This is the default value.
+				'attachment'
+				'inline'*/
+				mode?: boolean|string;
+				/**   if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.  */
+				lookupCompressed: boolean;
+			}): void;
+		/**  Concludes the handler activity by returning control over to the router with a templatized view response.
+		the response flow control rules apply. */
+
+		view(
+			/**  the template filename and path, relative to the templates path configured via the server views manager. */
+			template: string,
+			/**  optional object used by the template to render context-specific result. Defaults to no context {}. */
+			context?: {},
+			/**  optional object used to override the server's views manager configuration for this response. Cannot override isCached, partialsPath, or helpersPath which are only loaded at initialization.  */
+			options?: any): Response;
+		/** Concludes the handler activity by returning control over to the router and informing the router that a response has already been sent back directly via request.raw.res and that no further response action is needed
+		The response flow control rules do not apply. */
+		close(options?: {
+			/**   if false, the router will not call request.raw.res.end()) to ensure the response was ended. Defaults to true.  */
+			end?: boolean;
+		}): void;
+		/** Proxies the request to an upstream endpoint.
+		the response flow control rules do not apply. */
+
+		proxy(/**  an object including the same keys and restrictions defined by the route proxy handler options. */
+			options: IProxyHandlerConfig): void;
+		/** Redirects the client to the specified uri. Same as calling reply().redirect(uri).
+		he response flow control rules apply. */
+		redirect(uri: string): Response;
+	}
+
+	export interface ISessionHandler {
+		(request: Request, reply: IReply): void;
+	}
+	export interface IRequestHandler<T> {
+		(request: Request): T;
+	}
+
+
+	export interface IFailAction {
+		(source: string, error: any, next: () => void): void
+	}
+	/**  generates a reverse proxy handler */
+	export interface IProxyHandlerConfig {
+		/** the upstream service host to proxy requests to. The same path on the client request will be used as the path on the host.*/
+		host?: string;
+		/** the upstream service port. */
+		port?: number;
+		/**  The protocol to use when making a request to the proxied host:
+		'http'
+		'https'*/
+		protocol?: string;
+		/**  an absolute URI used instead of the incoming host, port, protocol, path, and query. Cannot be used with host, port, protocol, or mapUri.*/
+		uri?: string;
+		/**  if true, forwards the headers sent from the client to the upstream service being proxied to, headers sent from the upstream service will also be forwarded to the client. Defaults to false.*/
+		passThrough?: boolean;
+		/** localStatePassThrough - if false, any locally defined state is removed from incoming requests before being passed upstream. This is a security feature to prevent local state (e.g. authentication cookies) from leaking upstream to other servers along with the cookies intended for those servers. This value can be overridden on a per state basis via the server.state() passThrough option. Defaults to false.*/
+		localStatePassThrough?: boolean;
+		/**acceptEncoding - if false, does not pass-through the 'Accept-Encoding' HTTP header which is useful when using an onResponse post-processing to avoid receiving an encoded response (e.g. gzipped). Can only be used together with passThrough. Defaults to true (passing header).*/
+		acceptEncoding?: boolean;
+		/** rejectUnauthorized - sets the rejectUnauthorized property on the https agent making the request. This value is only used when the proxied server uses TLS/SSL. When set it will override the node.js rejectUnauthorized property. If false then ssl errors will be ignored. When true the server certificate is verified and an 500 response will be sent when verification fails. This shouldn't be used alongside the agent setting as the agent will be used instead. Defaults to the https agent default value of true.*/
+		rejectUnauthorized?: boolean;
+		/**if true, sets the 'X-Forwarded-For', 'X-Forwarded-Port', 'X-Forwarded-Proto' headers when making a request to the proxied upstream endpoint. Defaults to false.*/
+		xforward?: boolean;
+		/** the maximum number of HTTP redirections allowed, to be followed automatically by the handler. Set to false or 0 to disable all redirections (the response will contain the redirection received from the upstream service). If redirections are enabled, no redirections (301, 302, 307, 308) will be passed along to the client, and reaching the maximum allowed redirections will return an error response. Defaults to false.*/
+		redirects?: boolean|number;
+		/**number of milliseconds before aborting the upstream request. Defaults to 180000 (3 minutes).*/
+		timeout?: number;
+		/** a function used to map the request URI to the proxied URI. Cannot be used together with host, port, protocol, or uri. The function signature is function(request, callback) where:
+		request - is the incoming request object.
+		callback - is function(err, uri, headers) where:
+		err - internal error condition.
+		uri - the absolute proxy URI.
+		headers - optional object where each key is an HTTP request header and the value is the header content.*/
+		mapUri?: (request: Request, callback: (err: any, uri: string, headers?: { [key: string]: string }) => void) => void;
+		/**  a custom function for processing the response from the upstream service before sending to the client. Useful for custom error handling of responses from the proxied endpoint or other payload manipulation. Function signature is function(err, res, request, reply, settings, ttl) where: - err - internal or upstream error returned from attempting to contact the upstream proxy. - res - the node response object received from the upstream service. res is a readable stream (use the wreck module read method to easily convert it to a Buffer or string). - request - is the incoming request object. - reply - the reply interface function. - settings - the proxy handler configuration. - ttl - the upstream TTL in milliseconds if proxy.ttl it set to 'upstream' and the upstream response included a valid 'Cache-Control' header with 'max-age'.*/
+		onResponse?: (
+		err: any,
+		res: http.ServerResponse,
+		req: Request,
+		reply: () => void,
+		settings: IProxyHandlerConfig,
+		ttl: number
+		) => void;
+		/** if set to 'upstream', applies the upstream response caching policy to the response using the response.ttl() method (or passed as an argument to the onResponse method if provided).*/
+		ttl?: number;
+		/** - a node http(s) agent to be used for connections to upstream server.  see https://nodejs.org/api/http.html#http_class_http_agent */
+		agent?: http.Agent;
+		/** sets the maximum number of sockets available per outgoing proxy host connection. false means use the wreck module default value (Infinity). Does not affect non-proxy outgoing client connections. Defaults to Infinity.*/
+		maxSockets?: boolean|number;
+	}
+	/**  TODO: fill in joi definition  */
+	export interface IJoi {
+
+	}
+	/**  a validation function using the signature function(value, options, next) */
+	export interface IValidationFunction {
+
+		(/**   the object containing the path parameters. */
+		value: any,
+		/**  the server validation options. */
+		options: any,
+		/**   the callback function called when validation is completed.  */
+		next: (err: any, value: any) => void): void;
+	}
+	/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
+	export interface IRouteFailFunction {
+		/**  a custom error handler function with the signature 'function(request, reply, source, error)` */
+		(
+		/** - the [request object]. */
+		request: Request,
+		/**   the continuation reply interface. */
+		reply: IReply,
+		/**  the source of the invalid field (e.g. 'path', 'query', 'payload'). */
+		source: string,
+		/**  the error object prepared for the client response (including the validation function error under error.data). */
+		error: any): void;
+	}
+
+	/**  Each route can be customize to change the default behavior of the request lifecycle using the following options:  */
+	export interface IRouteAdditionalConfigurationOptions {
+		/**  application specific configuration.Should not be used by plugins which should use plugins[name] instead. */
+		app?: any;
+		/** authentication configuration.Value can be: false to disable authentication if a default strategy is set.
+		a string with the name of an authentication strategy registered with server.auth.strategy().
+		an object  */
+		auth?: boolean|string|
+		{
+			/**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values: 
+			'required'authentication is required.
+			'optional'authentication is optional (must be valid if present).
+			'try'same as 'optional' but allows for invalid authentication. */
+			mode: string;
+			/**  a string array of strategy names in order they should be attempted.If only one strategy is used, strategy can be used instead with the single string value.Defaults to the default authentication strategy which is available only when a single strategy is configured.  */
+			strategies: string | Array<string>;
+			/**  if set, the payload (in requests other than 'GET' and 'HEAD') is authenticated after it is processed.Requires a strategy with payload authentication support (e.g.Hawk).Cannot be set to a value other than 'required' when the scheme sets the options.payload to true.Available values:
+			falseno payload authentication.This is the default value.
+			'required'payload authentication required.This is the default value when the scheme sets options.payload to true.
+			'optional'payload authentication performed only when the client includes payload authentication information (e.g.hash attribute in Hawk). */
+			payload?: string;
+			/**  the application scope required to access the route.Value can be a scope string or an array of scope strings.The authenticated credentials object scope property must contain at least one of the scopes defined to access the route.Set to false to remove scope requirements.Defaults to no scope required.  */
+			scope?: string|Array<string>|boolean;
+			/** the required authenticated entity type.If set, must match the entity value of the authentication credentials.Available values:
+			anythe authentication can be on behalf of a user or application.This is the default value.
+			userthe authentication must be on behalf of a user.
+			appthe authentication must be on behalf of an application. */
+			entity?: string;
+		};
+		/** an object passed back to the provided handler (via this) when called. */
+		bind?: any;
+		/** if the route method is 'GET', the route can be configured to include caching directives in the response using the following options */
+		cache?: {
+			/**  mines the privacy flag included in clientside caching using the 'Cache-Control' header.Values are:
+			fault'no privacy flag.This is the default setting.
+			'public'mark the response as suitable for public caching.
+			'private'mark the response as suitable only for private caching.  */
+			privacy: string;
+			/**  relative expiration expressed in the number of milliseconds since the item was saved in the cache.Cannot be used together with expiresAt. */
+			expiresIn: number;
+			/**  time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records for the route expire.Cannot be used together with expiresIn.  */
+			expiresAt: string;
+		};
+		/** the Cross- Origin Resource Sharing protocol allows browsers to make cross- origin API calls.CORS is required by web applications running inside a browser which are loaded from a different domain than the API server.CORS headers are disabled by default. To enable, set cors to true, or to an object with the following options: */
+		cors?: {
+			/** a strings array of allowed origin servers ('Access-Control-Allow-Origin').The array can contain any combination of fully qualified origins along with origin strings containing a wildcard '' character, or a single `''origin string. Defaults to any origin['*']`. */
+			origin?: Array<string>;
+			/** if true, matches the value of the incoming 'Origin' header to the list of origin values ('*' matches anything) and if a match is found, uses that as the value of the 'Access-Control-Allow-Origin' response header.When false, the origin config is returned as- is.Defaults to true.  */
+			matchOrigin?: boolean;
+			/** if false, prevents the connection from returning the full list of non- wildcard origin values if the incoming origin header does not match any of the values.Has no impact if matchOrigin is set to false.Defaults to true. */
+			isOriginExposed?: boolean;
+			/**  number of seconds the browser should cache the CORS response ('Access-Control-Max-Age').The greater the value, the longer it will take before the browser checks for changes in policy.Defaults to 86400 (one day). */
+			maxAge?: number;
+			/**  a strings array of allowed headers ('Access-Control-Allow-Headers').Defaults to ['Authorization', 'Content-Type', 'If-None-Match']. */
+			headers?: string[];
+			/**  a strings array of additional headers to headers.Use this to keep the default headers in place. */
+			additionalHeaders?: string[];
+			/**  a strings array of allowed HTTP methods ('Access-Control-Allow-Methods').Defaults to ['GET', 'HEAD', 'POST', 'PUT', 'DELETE', 'OPTIONS']. */
+			methods?: string[];
+			/**  a strings array of additional methods to methods.Use this to keep the default methods in place. */
+			additionalMethods?: string[];
+			/**  a strings array of exposed headers ('Access-Control-Expose-Headers').Defaults to ['WWW-Authenticate', 'Server-Authorization']. */
+			exposedHeaders?: string[];
+			/**  a strings array of additional headers to exposedHeaders.Use this to keep the default headers in place. */
+			additionalExposedHeaders?: string[];
+			/**  if true, allows user credentials to be sent ('Access-Control-Allow-Credentials').Defaults to false. */
+			credentials?: boolean;
+			/** if false, preserves existing CORS headers set manually before the response is sent.Defaults to true. */
+			override?: boolean;
+		};
+		/**   defines the behavior for serving static resources using the built-in route handlers for files and directories: */
+		files?: {/** determines the folder relative paths are resolved against when using the file and directory handlers. */
+			relativeTo: string;
+		};
+
+		/**  an alternative location for the route handler option. */
+		handler?: ISessionHandler | string | IRouteHandlerConfig;
+		/** an optional unique identifier used to look up the route using server.lookup(). */
+		id?: number;
+		/** optional arguments passed to JSON.stringify() when converting an object or error response to a string payload.Supports the following: */
+		json?: {
+			/** the replacer function or array.Defaults to no action. */
+			replacer?: Function | string[];
+			/**  number of spaces to indent nested object keys.Defaults to no indentation. */
+			space?: number|string;
+			/** string suffix added after conversion to JSON string.Defaults to no suffix. */
+			suffix?: string;
+		};
+		/** enables JSONP support by setting the value to the query parameter name containing the function name used to wrap the response payload.For example, if the value is 'callback', a request comes in with 'callback=me', and the JSON response is '{ "a":"b" }', the payload will be 'me({ "a":"b" });'.Does not work with stream responses. */
+		jsonp?: string;
+		/** determines how the request payload is processed: */
+		payload?: {
+			/**  the type of payload representation requested. The value must be one of:
+			'data'the incoming payload is read fully into memory.If parse is true, the payload is parsed (JSON, formdecoded, multipart) based on the 'Content- Type' header.If parse is false, the raw Buffer is returned.This is the default value except when a proxy handler is used.
+			'stream'the incoming payload is made available via a Stream.Readable interface.If the payload is 'multipart/form-data' and parse is true, fields values are presented as text while files are provided as streams.File streams from a 'multipart/form-data' upload will also have a property hapi containing filename and headers properties.
+			'file'the incoming payload in written to temporary file in the directory specified by the server's payload.uploads settings. If the payload is 'multipart/ formdata' and parse is true, fields values are presented as text while files are saved. Note that it is the sole responsibility of the application to clean up the files generated by the framework. This can be done by keeping track of which files are used (e.g. using the request.app object), and listening to the server 'response' event to perform any needed cleaup. */
+			output?: string;
+			/**  can be true, false, or gunzip; determines if the incoming payload is processed or presented raw. true and gunzip includes gunzipping when the appropriate 'Content-Encoding' is specified on the received request. If parsing is enabled and the 'Content-Type' is known (for the whole payload as well as parts), the payload is converted into an object when possible. If the format is unknown, a Bad Request (400) error response is sent. Defaults to true, except when a proxy handler is used. The supported mime types are:
+			'application/json'
+			'application/x-www-form-urlencoded'
+			'application/octet-stream'
+			'text/ *'
+			'multipart/form-data' */
+			parse?: string | boolean;
+			/** a string or an array of strings with the allowed mime types for the endpoint.Defaults to any of the supported mime types listed above.Note that allowing other mime types not listed will not enable them to be parsed, and that if parsing mode is 'parse', the request will result in an error response. */
+			allow?: string | string[];
+			/** a mime type string overriding the 'Content-Type' header value received.Defaults to no override. */
+			override?: string;
+			/**  limits the size of incoming payloads to the specified byte count.Allowing very large payloads may cause the server to run out of memory.Defaults to 1048576 (1MB).  */
+			maxBytes?: number;
+			/** payload reception timeout in milliseconds.Sets the maximum time allowed for the client to transmit the request payload (body) before giving up and responding with a Request Timeout (408) error response.Set to false to disable.Defaults to 10000 (10 seconds). */
+			timeout?: number;
+			/**  the directory used for writing file uploads.Defaults to os.tmpDir(). */
+			uploads?: string;
+			/**  determines how to handle payload parsing errors. Allowed values are:
+			'error'return a Bad Request (400) error response. This is the default value.
+			'log'report the error but continue processing the request.
+			'ignore'take no action and continue processing the request. */
+			failAction?: string;
+		};
+		/** pluginspecific configuration.plugins is an object where each key is a plugin name and the value is the plugin configuration.  */
+		plugins?: IDictionary<any>;
+		/** an array with [route prerequisites] methods which are executed in serial or in parallel before the handler is called.  */
+		pre?: any[];
+		/** validation rules for the outgoing response payload (response body).Can only validate object response: */
+		response?: {
+			/**   the default response object validation rules (for all non-error responses) expressed as one of:
+			trueany payload allowed (no validation performed). This is the default.
+			falseno payload allowed.
+			a Joi validation object.
+			a validation function using the signature function(value, options, next) where:
+			valuethe object containing the response object.
+			optionsthe server validation options.
+			next(err)the callback function called when validation is completed.  */
+			schema: boolean|any;
+			/** HTTP status- codespecific validation rules.The status key is set to an object where each key is a 3 digit HTTP status code and the value has the same definition as schema.If a response status code is not present in the status object, the schema definition is used, expect for errors which are not validated by default.  */
+			status: number;
+			/** the percent of responses validated (0100).Set to 0 to disable all validation.Defaults to 100 (all responses). */
+			sample: number;
+			/**  defines what to do when a response fails validation.Options are:
+			errorreturn an Internal Server Error (500) error response.This is the default value.
+			loglog the error but send the response.  */
+			failAction: string;
+			/** if true, applies the validation rule changes to the response.Defaults to false. */
+			modify: boolean;
+			/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options.  */
+			options: any;
+		};
+		/** sets common security headers (disabled by default).To enable set security to true or to an object with the following options */
+		security?: boolean| {
+			/** controls the 'Strict-Transport-Security' header.If set to true the header will be set to max- age=15768000, if specified as a number the maxAge parameter will be set to that number.Defaults to true.You may also specify an object with the following fields: */
+			hsts: boolean|number|{
+				/** the max- age portion of the header, as a number.Default is 15768000. */
+				maxAge?: number;
+				/**  a boolean specifying whether to add the includeSubdomains flag to the header. */
+				includeSubdomains?: boolean;
+			};
+			/** controls the 'X-Frame-Options' header.When set to true the header will be set to DENY, you may also specify a string value of 'deny' or 'sameorigin'.To use the 'allow-from' rule, you must set this to an object with the following fields: */
+			xframe: {
+				/** either 'deny', 'sameorigin', or 'allow-from' */
+				rule: string;
+				/** when rule is 'allow-from' this is used to form the rest of the header, otherwise this field is ignored.If rule is 'allow-from' but source is unset, the rule will be automatically changed to 'sameorigin'. */
+				source: string;
+			};
+			/** boolean that controls the 'X-XSS-PROTECTION' header for IE.Defaults to true which sets the header to equal '1; mode=block'.NOTE: This setting can create a security vulnerability in versions of IE below 8, as well as unpatched versions of IE8.See here and here for more information.If you actively support old versions of IE, it may be wise to explicitly set this flag to false. */
+			xss: boolean;
+			/**  boolean controlling the 'X-Download-Options' header for IE, preventing downloads from executing in your context.Defaults to true setting the header to 'noopen'. */
+			noOpen: boolean;
+			/** boolean controlling the 'X-Content-Type-Options' header.Defaults to true setting the header to its only and default option, 'nosniff'. */
+			noSniff: boolean;
+		};
+		/** HTTP state management (cookies) allows the server to store information on the client which is sent back to the server with every request (as defined in RFC 6265).state supports the following options: */
+		state?: {
+			/** determines if incoming 'Cookie' headers are parsed and stored in the request.state object.Defaults to true. */
+			parse: boolean;
+			/** determines how to handle cookie parsing errors.Allowed values are:
+			'error'return a Bad Request (400) error response.This is the default value.
+			'log'report the error but continue processing the request.
+			'ignore'take no action. */
+			failAction: string;
+		};
+		/**  request input validation rules for various request components.When using a Joi validation object, the values of the other inputs (i.e.headers, query, params, payload, and auth) are made available under the validation context (accessible in rules as Joi.ref('$query.key')).Note that validation is performed in order(i.e.headers, params, query, payload) and if type casting is used (converting a string to number), the value of inputs not yet validated will reflect the raw, unvalidated and unmodified values.The validate object supports: */
+		validate?: {
+			/** validation rules for incoming request headers.Values allowed:
+			* trueany headers allowed (no validation performed).This is the default.
+			falseno headers allowed (this will cause all valid HTTP requests to fail).
+			a Joi validation object.
+			a validation function using the signature function(value, options, next) where:
+			valuethe object containing the request headers.
+			optionsthe server validation options.
+			next(err, value)the callback function called when validation is completed.
+			*/
+			headers?: boolean | IJoi | IValidationFunction;
+
+		
+			/** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
+			trueany path parameters allowed (no validation performed).This is the default.
+			falseno path variables allowed.
+			a Joi validation object.
+			a validation function using the signature function(value, options, next) where:
+			valuethe object containing the path parameters.
+			optionsthe server validation options.
+			next(err, value)the callback function called when validation is completed. */
+			params?: boolean | IJoi | IValidationFunction;
+			/** validation rules for an incoming request URI query component (the key- value part of the URI between '?' and '#').The query is parsed into its individual key- value pairs (using the qs module) and stored in request.query prior to validation.Values allowed:
+			trueany query parameters allowed (no validation performed).This is the default.
+			falseno query parameters allowed.
+			a Joi validation object.
+			a validation function using the signature function(value, options, next) where:
+			valuethe object containing the query parameters.
+			optionsthe server validation options.
+			next(err, value)the callback function called when validation is completed. */
+			query?: boolean | IJoi | IValidationFunction;
+			/**  validation rules for an incoming request payload (request body).Values allowed:
+			trueany payload allowed (no validation performed).This is the default.
+			falseno payload allowed.
+			a Joi validation object.
+			a validation function using the signature function(value, options, next) where:
+			valuethe object containing the payload object.
+			optionsthe server validation options.
+			next(err, value)the callback function called when validation is completed.  */
+			payload?: boolean | IJoi | IValidationFunction;
+			/** an optional object with error fields copied into every validation error response. */
+			errorFields?: any;
+			/** determines how to handle invalid requests.Allowed values are:
+			'error'return a Bad Request (400) error response.This is the default value.
+			'log'log the error but continue processing the request.
+			'ignore'take no action.
+			OR a custom error handler function with the signature 'function(request, reply, source, error)` where:
+			requestthe request object.
+			replythe continuation reply interface.
+			sourcethe source of the invalid field (e.g. 'path', 'query', 'payload').
+			errorthe error object prepared for the client response (including the validation function error under error.data). */
+			failAction?: string | IRouteFailFunction;
+			/** options to pass to Joi.Useful to set global options such as stripUnknown or abortEarly (the complete list is available here: https://github.com/hapijs/joi#validatevalue-schema-options-callback ).Defaults to no options. */
+			options?: any;
+		};
+		/** define timeouts for processing durations: */
+		timeout?: {
+			/** response timeout in milliseconds.Sets the maximum time allowed for the server to respond to an incoming client request before giving up and responding with a Service Unavailable (503) error response.Disabled by default (false). */
+			server: boolean|number;
+			/** by default, node sockets automatically timeout after 2 minutes.Use this option to override this behavior.Defaults to undefined which leaves the node default unchanged.Set to false to disable socket timeouts. */
+			socket: boolean|number;
+		};
+
+		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+		*route description used for generating documentation (string).
+		*/
+		description?: string;
+		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+		*route notes used for generating documentation (string or array of strings).
+		*/
+		notes?: string|string[];
+		/**  ONLY WHEN ADDING NEW ROUTES (not when setting defaults).
+		*route tags used for generating documentation (array of strings).
+		*/
+		tags?: string[]
+	}
+	/** server.realm http://hapijs.com/api#serverrealm
+	The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), 
+	the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). 
+	Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+	The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
+	exports.register = function (server, options, next) {
+	console.log(server.realm.modifiers.route.prefix);
+	return next();
+	};
+	*/
+	export interface IServerRealm {
+		/** when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method */
+		modifiers: {
+			/** routes preferences: */
+			route: {
+				/** - the route path prefix used by any calls to server.route() from the server. */
+				prefix: string;
+				/**  the route virtual host settings used by any calls to server.route() from the server. */
+				vhost: string;
+			};
+
+		};
+		/** the active plugin name (empty string if at the server root). */
+		plugin: string;
+		/** plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state. */
+		plugins: IDictionary<any>;
+		/**  settings overrides */
+		settings: {
+			files: {
+				relativeTo: any;
+			};
+			bind: any;
+		}
+	}
+	/** server.state(name, [options]) http://hapijs.com/api#serverstatename-options
+	HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions where:*/
+	export interface IServerState {
+/**  - the cookie name string. */name: string;
+
+/** - are the optional cookie settings: */options: {
+/**  - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/ttl: number;
+/**  - sets the 'Secure' flag.Defaults to false.*/isSecure: boolean;
+/**  - sets the 'HttpOnly' flag.Defaults to false.*/isHttpOnly: boolean
+/**  - the path scope.Defaults to null (no path).*/path: any;
+/**  - the domain scope.Defaults to null (no domain). */domain: any;
+			/**  if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value. The value can be a function with signature function(request, next) where:
+			request - the request object.
+			next - the continuation function using the function(err, value) signature.*/
+			autoValue: (request: Request, next: (err: any, value: any) => void) => void;
+			/**  - encoding performs on the provided value before serialization. Options are:
+			'none' - no encoding. When used, the cookie value must be a string. This is the default value.
+			'base64' - string value is encoded using Base64.
+			'base64json' - object value is JSON-stringified than encoded using Base64.
+			'form' - object value is encoded using the x-www-form-urlencoded method.
+			'iron' - Encrypts and sign the value using iron.*/
+			encoding: string;
+/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:*/sign: {
+/** - algorithm options.Defaults to require('iron').defaults.integrity.*/integrity: any;
+/** - password used for HMAC key generation.*/password: string;
+			};
+/**  - password used for 'iron' encoding.*/password: string;
+/** - options for 'iron' encoding.Defaults to require('iron').defaults.*/iron: any;
+/** - if false, errors are ignored and treated as missing cookies.*/ignoreErrors: boolean;
+/**  - if true, automatically instruct the client to remove invalid cookies.Defaults to false.*/clearInvalid: boolean;
+/**  - if false, allows any cookie value including values in violation of RFC 6265. Defaults to true.*/strictHeader: boolean;
+/**  - overrides the default proxy localStatePassThrough setting.*/passThrough: any;
+		};
+	}
+
+	export interface IFileHandlerConfig {
+		/**  a path string or function as described above.*/
+		path: string;
+		/** an optional filename to specify if sending a 'Content-Disposition' header, defaults to the basename of path*/
+		filename?: string;
+		/**- specifies whether to include the 'Content-Disposition' header with the response. Available values:
+		false - header is not included. This is the default value.
+		'attachment'
+		'inline'*/
+		mode?: boolean| string;
+		/** if true, looks for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.*/
+		lookupCompressed: boolean;
+	}
+
+	/**http://hapijs.com/api#route-handler 
+	Built-in handlers
+		
+	The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
+	export interface IRouteHandlerConfig {
+		/** generates a static file endpoint for serving a single file. file can be set to:
+					a relative or absolute file path string (relative paths are resolved based on the route files configuration).
+		a function with the signature function(request) which returns the relative or absolute file path.
+		an object with the following options */
+		file?: string | IRequestHandler<void> |IFileHandlerConfig;
+		/** directory - generates a directory endpoint for serving static content from a directory. Routes using the directory handler must include a path parameter at the end of the path string (e.g. /path/to/somewhere/{param} where the parameter name does not matter). The path parameter can use any of the parameter options (e.g. {param} for one level files only, {param?} for one level files or the directory root, {param*} for any level, or {param*3} for a specific level). If additional path parameters are present, they are ignored for the purpose of selecting the file system resource. The directory handler is an object with the following options:
+					path - (required) the directory root path (relative paths are resolved based on the route files configuration). Value can be:
+		a single path string used as the prefix for any resources requested by appending the request path parameter to the provided string.
+		an array of path strings. Each path will be attempted in order until a match is found (by following the same process as the single path string).
+		a function with the signature function(request) which returns the path string or an array of path strings. If the function returns an error, the error is passed back to the client in the response.
+		index - optional boolean|string|string[], determines if an index file will be served if found in the folder when requesting a directory. The given string or strings specify the name(s) of the index file to look for. If true, looks for 'index.html'. Any falsy value disables index file lookup. Defaults to true.
+		listing - optional boolean, determines if directory listing is generated when a directory is requested without an index document. Defaults to false.
+		showHidden - optional boolean, determines if hidden files will be shown and served. Defaults to false.
+		redirectToSlash - optional boolean, determines if requests for a directory without a trailing slash are redirected to the same path with the missing slash. Useful for ensuring relative links inside the response are resolved correctly. Disabled when the server config router.stripTrailingSlash is true.Defaults to false.
+		lookupCompressed - optional boolean, instructs the file processor to look for the same filename with the '.gz' suffix for a pre-compressed version of the file to serve if the request supports content encoding. Defaults to false.
+		defaultExtension - optional string, appended to file requests if the requested file is not found. Defaults to no extension.*/
+		directory?: {
+			path: string |Array<string> | IRequestHandler<string> | IRequestHandler<Array<string>>;
+			index?: boolean;
+			listing?: boolean;
+			showHidden?: boolean;
+			redirectToSlash?: boolean;
+			lookupCompressed?: boolean;
+			defaultExtension?: string;
+		};
+		proxy?: IProxyHandlerConfig;
+		view?: string | {
+			template: string;
+			context: {
+				payload: any;
+				params: any;
+				query: any;
+				pre: any;
+			}
+		};
+		config?: {
+			handler: any;
+			bind: any;
+			app: any;
+			plugins: {
+				[name: string]: any;
+			};
+			pre: Array<() => void>;
+			validate: {
+				headers: any;
+				params: any;
+				query: any;
+				payload: any;
+				errorFields?: any;
+				failAction?: string | IFailAction;
+			};
+			payload: {
+				output: {
+					data: any;
+					stream: any;
+					file: any;
+				};
+				parse?: any;
+				allow?: string|Array<string>;
+				override?: string;
+				maxBytes?: number;
+				uploads?: number;
+				failAction?: string;
+			};
+			response: {
+				schema: any;
+				sample: number;
+				failAction: string;
+			};
+			cache: {
+				privacy: string;
+				expiresIn: number;
+				expiresAt: number;
+			};
+			auth: string|boolean|{
+				mode: string;
+				strategies: Array<string>;
+				payload?: boolean|string;
+				tos?: boolean|string;
+				scope?: string|Array<string>;
+				entity: string;
+			};
+			cors?: boolean;
+			jsonp?: string;
+			description?: string;
+			notes?: string|Array<string>;
+			tags?: Array<string>;
+		};
+	}
+	/** Route configuration
+	The route configuration object*/
+	export interface IRouteConfiguration {
+		/**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
+		path: string;
+		/** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). 
+		* Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
+		method: string|string[];
+		/**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
+		vhost?: string;
+		/**  - (required) the function called to generate the response after successful authentication and validation.The handler function is described in Route handler.If set to a string, the value is parsed the same way a prerequisite server method string shortcut is processed.Alternatively, handler can be assigned an object with a single key using the name of a registered handler type and value with the options passed to the registered handler.*/
+		handler: ISessionHandler | string | IRouteHandlerConfig;
+		/** - additional route options.*/
+		config?: IRouteAdditionalConfigurationOptions;
+	}
+	/** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
+	export interface IRoute {
+
+		
+		/** the route HTTP method. */
+		method: string;
+		/** the route path. */
+		path: string;
+		/** the route vhost option if configured. */
+		vhost?: string|Array<string>;
+		/** the [active realm] associated with the route.*/
+		realm: IServerRealm;
+		/** the [route options]  object with all defaults applied. */
+		settings: IRouteAdditionalConfigurationOptions;
+	}
+
+	export interface IServerAuthScheme {
+		/** authenticate(request, reply) - required function called on each incoming request configured with the authentication scheme where:
+		request - the request object.
+		reply - the reply interface the authentication method must call when done authenticating the request where:
+		reply(err, response, result) - is called if authentication failed where:
+		err - any authentication error.
+		response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
+		result - an object containing:
+		credentials - the authenticated credentials.
+		artifacts - optional authentication artifacts.
+		reply.continue(result) - is called if authentication succeeded where:
+		result - same object as result above.
+		When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. 
+		.If the err returned by the reply() method includes a message, no additional strategies will be attempted. 
+		If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		var scheme = function (server, options) {
+		return {
+		authenticate: function (request, reply) {
+		var req = request.raw.req;
+		var authorization = req.headers.authorization;
+		if (!authorization) {
+		return reply(Boom.unauthorized(null, 'Custom'));
+		}
+		return reply(null, { credentials: { user: 'john' } });
+		}
+		};
+		};
+		server.auth.scheme('custom', scheme);*/
+		authenticate(request: Request, reply: IReply): void;
+		/** payload(request, reply) - optional function called to authenticate the request payload where:
+		request - the request object.
+		reply(err, response) - is called if authentication failed where:
+		err - any authentication error.
+		response - any authentication response action such as redirection. Ignored if err is present, otherwise required.
+		reply.continue() - is called if payload authentication succeeded.
+		When the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.*/
+		payload? (request: Request, reply: IReply): void;
+		/** response(request, reply) - optional function called to decorate the response with authentication headers before the response headers or payload is written where:
+		request - the request object.
+		reply(err, response) - is called if an error occurred where:
+		err - any authentication error.
+		response - any authentication response to send instead of the current response. Ignored if err is present, otherwise required.
+		reply.continue() - is called if the operation succeeded.*/
+		response? (request: Request, reply: IReply): void;
+		/** an optional object  */
+		options?: {
+			/**  if true, requires payload validation as part of the scheme and forbids routes from disabling payload auth validation. Defaults to false.*/
+			payload: boolean;
+		}
+	}
+
+
+
+	export interface IServerInject {
+		(options: {
+			/**  the request HTTP method (e.g. 'POST'). Defaults to 'GET'.*/
+			method: string;
+			/** the request URL. If the URI includes an authority (e.g. 'example.com:8080'), it is used to automatically set an HTTP 'Host' header, unless one was specified in headers.*/
+			url: string;
+			/** an object with optional request headers where each key is the header name and the value is the header content. Defaults to no additions to the default Shot headers.*/
+			headers: IDictionary<string>;
+			/**- an optional string or buffer containing the request payload (object must be manually converted to a string first). Defaults to no payload. Note that payload processing defaults to 'application/json' if no 'Content-Type' header provided.*/
+			payload: string|Buffer;
+			/**an optional credentials object containing authentication information. The credentials are used to bypass the default authentication strategies, and are validated directly as if they were received via an authentication scheme. Defaults to no credentials.*/
+			credentials: any;
+			/**object with options used to simulate client request stream conditions for testing:
+			error - if true, emits an 'error' event after payload transmission (if any). Defaults to false.
+			close - if true, emits a 'close' event after payload transmission (if any). Defaults to false.
+			end - if false, does not end the stream. Defaults to true.*/
+			simulate: {
+				error: boolean;
+				close: boolean;
+				end: boolean;
+			};
+		},
+		callback: (
+		/**the response object where:
+		statusCode - the HTTP status code.
+		headers - an object containing the headers set.
+		payload - the response payload string.
+		rawPayload - the raw response payload buffer.
+		raw - an object with the injection request and response objects:
+		req - the simulated node request object.
+		res - the simulated node response object.
+		result - the raw handler response (e.g. when not a stream or a view) before it is serialized for transmission. If not available, the value is set to payload. Useful for inspection and reuse of the internal objects returned (instead of parsing the response string).
+		request - the request object.*/
+		res: { statusCode: number; headers: IDictionary<string>; payload: string; rawPayload: Buffer; raw: { req: http.ClientRequest; res: http.ServerResponse }; result: string; request: Request }) => void
+		):void;
+
+	}
+
+
+	/** host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+	The return value is an array where each item is an object containing:
+	info - the connection.info the connection the table was generated for.
+	labels - the connection labels.
+	table - an array of routes where each route contains:
+	settings - the route config with defaults applied.
+	method - the HTTP method in lower case.
+	path - the route path.*/
+	export interface IConnectionTable {
+		info: any;
+		labels: any;
+		table: IRoute[];
+	}
+
+	export interface ICookieSettings {
+		/** - time - to - live in milliseconds.Defaults to null (session time- life - cookies are deleted when the browser is closed).*/
+		ttl?: number;
+		/** - sets the 'Secure' flag.Defaults to false.*/
+		isSecure?: boolean;
+		/** - sets the 'HttpOnly' flag.Defaults to false.*/
+		isHttpOnly?: boolean;
+		/** - the path scope.Defaults to null (no path).*/
+		path?: string;
+		/** - the domain scope.Defaults to null (no domain).*/
+		domain?: any;
+		/** - if present and the cookie was not received from the client or explicitly set by the route handler, the cookie is automatically added to the response with the provided value.The value can be a function with signature function(request, next) where:
+		request - the request object.
+		next - the continuation function using the function(err, value) signature.*/
+		autoValue?: (request: Request, next: (err: any, value: any) => void) => void;
+		/** - encoding performs on the provided value before serialization.Options are:
+		'none' - no encoding.When used, the cookie value must be a string.This is the default value.
+		'base64' - string value is encoded using Base64.
+		'base64json' - object value is JSON- stringified than encoded using Base64.
+		'form' - object value is encoded using the x- www - form - urlencoded method. */
+		encoding?: string;
+		/**  - an object used to calculate an HMAC for cookie integrity validation.This does not provide privacy, only a mean to verify that the cookie value was generated by the server.Redundant when 'iron' encoding is used.Options are:
+		integrity - algorithm options.Defaults to require('iron').defaults.integrity.
+		password - password used for HMAC key generation. */
+		sign?: { integrity: any; password: string; }
+		password?: string;
+		iron?: any;
+		ignoreErrors?: boolean;
+		clearInvalid?: boolean;
+		strictHeader?: boolean;
+		passThrough?: any;
+	}
+
+	/** method - the method function with the signature is one of:
+	function(arg1, arg2, ..., argn, next) where:
+	arg1, arg2, etc. - the method function arguments.
+	next - the function called when the method is done with the signature function(err, result, ttl) where:
+	err - error response if the method failed.
+	result - the return value.
+	ttl - 0 if result is valid but cannot be cached. Defaults to cache policy.
+	function(arg1, arg2, ..., argn) where:
+	arg1, arg2, etc. - the method function arguments.
+	the callback option is set to false.
+	the method must returns a value (result, Error, or a promise) or throw an Error.*/
+	export interface IServerMethod {
+		//(): void;
+		//(next: (err: any, result: any, ttl: number) => void): void;
+		//(arg1: any): void;
+		//(arg1: any, arg2: any, next: (err: any, result: any, ttl: number) => void): void;
+		//(arg1: any, arg2: any): void;
+		(...args: any[]): void;
+
+	}
+	/** options - optional configuration:
+	bind - a context object passed back to the method function (via this) when called. Defaults to active context (set via server.bind() when the method is registered.
+	cache - the same cache configuration used in server.cache().
+	callback - if false, expects the method to be a synchronous function. Note that using a synchronous function with caching will convert the method interface to require a callback as an additional argument with the signature function(err, result, cached, report) since the cache interface cannot return values synchronously. Defaults to true.
+	generateKey - a function used to generate a unique key (for caching) from the arguments passed to the method function (the callback argument is not passed as input). The server will automatically generate a unique key if the function's arguments are all of types 'string', 'number', or 'boolean'. However if the method uses other types of arguments, a key generation function must be provided which takes the same arguments as the function and returns a unique string (or null if no key can be generated).*/
+	export interface IServerMethodOptions {
+		bind?: any;
+		cache?: ICatBoxCacheOptions;
+		callback?: boolean;
+		generateKey?(args: any[]): string;
+	}
+	/** Request object
+	
+	The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
+	Request events
+	
+	The request object supports the following events:
+	
+	'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
+	'finish' - emitted when the request payload finished reading. The event method signature is function ().
+	'disconnect' - emitted when a request errors or aborts unexpectedly.
+	var Crypto = require('crypto');
+	var Hapi = require('hapi');
+	var server = new Hapi.Server();
+	server.connection({ port: 80 });
+	
+	server.ext('onRequest', function (request, reply) {
+	
+	var hash = Crypto.createHash('sha1');
+	request.on('peek', function (chunk) {
+	
+	hash.update(chunk);
+	});
+	
+	request.once('finish', function () {
+	
+	console.log(hash.digest('hex'));
+	});
+	
+	request.once('disconnect', function () {
+	
+	console.error('request aborted');
+	});
+	
+	return reply.continue();
+	});*/
+	export class Request extends Events.EventEmitter {
+		/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
+		app: any;
+		/**  authentication information*/
+		auth: {
+			/** true is the request has been successfully authenticated, otherwise false.*/
+			isAuthenticated: boolean;
+			/**  the credential object received during the authentication process. The presence of an object does not mean successful authentication.*/
+			credentials: any;
+			/**  an artifact object received from the authentication strategy and used in authentication-related actions.*/
+			artifacts: any;
+			/**  the route authentication mode.*/
+			mode: any;
+			/** the authentication error is failed and mode set to 'try'.*/
+			error: any;
+			/** an object used by the ['cookie' authentication scheme]  https://github.com/hapijs/hapi-auth-cookie */
+			session: any
+		};
+		/**  the node domain object used to protect against exceptions thrown in extensions, handlers and route prerequisites. Can be used to manually bind callback functions otherwise bound to other domains.*/
+		domain: any;
+		/** the raw request headers (references request.raw.headers).*/
+		headers: IDictionary<string>;
+		/** a unique request identifier (using the format '{now}:{connection.info.id}:{5 digits counter}').*/
+		id: number;
+		/**  request information */
+		info: {
+			/**  request reception timestamp. */
+			received: number;
+			/**  request response timestamp (0 is not responded yet). */
+			responded: number;
+			/** remote client IP address. */
+
+			remoteAddress: string;
+			/**  remote client port. */
+			remotePort: number;
+			/**  content of the HTTP 'Referrer' (or 'Referer') header. */
+			referrer: string;
+			/**  content of the HTTP 'Host' header (e.g. 'example.com:8080'). */
+			host: string;
+			/**  the hostname part of the 'Host' header (e.g. 'example.com').*/
+			hostname: string;
+		};
+		/**  the request method in lower case (e.g. 'get', 'post'). */
+		method: string;
+		/**  the parsed content-type header. Only available when payload parsing enabled and no payload error occurred. */
+		mime: string;
+		/**  an object containing the values of params, query, and payload before any validation modifications made. Only set when input validation is performed.*/
+		orig: {
+			params: any;
+			query: any;
+			payload: any;
+		};
+		/**  an object where each key is a path parameter name with matching value as described in Path parameters.*/
+		params: IDictionary<string>;
+		/** an array containing all the path params values in the order they appeared in the path.*/
+		paramsArray: string[];
+		/**  the request URI's path component. */
+		path: string;
+		/** the request payload based on the route payload.output and payload.parse settings.*/
+		payload: any;
+		/**  plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state.*/
+		plugins: any;
+		/** an object where each key is the name assigned by a route prerequisites function. The values are the raw values provided to the continuation function as argument. For the wrapped response object, use responses.*/
+		pre: IDictionary<any>;
+		/** the response object when set. The object can be modified but must not be assigned another object. To replace the response with another from within an extension point, use reply(response) to override with a different response. Contains null when no response has been set (e.g. when a request terminates prematurely when the client disconnects).*/
+		response: Response;
+		/**preResponses - same as pre but represented as the response object created by the pre method.*/
+		preResponses: any;
+		/**an object containing the query parameters.*/
+		query: any;
+		/**  an object containing the Node HTTP server objects. Direct interaction with these raw objects is not recommended.*/
+		raw: {
+			req: http.ClientRequest;
+			res: http.ServerResponse;
+		};
+		/** the route public interface.*/
+		route: IRoute;
+		/** the server object. */
+		server: Server;
+		/** Special key reserved for plugins implementing session support. Plugins utilizing this key must check for null value to ensure there is no conflict with another similar server. */
+		session: any;
+		/** an object containing parsed HTTP state information (cookies) where each key is the cookie name and value is the matching cookie content after processing using any registered cookie definition. */
+		state: any;
+		/** complex object contining details on the url */
+		url: {
+			/** null when i tested */
+			auth: any;
+			/** null when i tested */
+			hash: any;
+			/** null when i tested */
+			host: any;
+			/** null when i tested */
+			hostname: any;
+			href: string;
+			path: string;
+			/** path without search*/
+			pathname: string;
+			/** null when i tested */
+			port: any;
+			/** null when i tested */
+			protocol: any;
+			/** querystring parameters*/
+			query: IDictionary<string>;
+			/** querystring parameters as a string*/
+			search: string;
+			/** null when i tested */
+			slashes: any;
+		};
+		/** request.setUrl(url)
+		
+		Available only in 'onRequest' extension methods.
+		
+		Changes the request URI before the router begins processing the request where:
+		
+		url - the new request path value.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		
+		server.ext('onRequest', function (request, reply) {
+		
+		// Change all requests to '/test'
+		request.setUrl('/test');
+		return reply.continue();
+		});*/
+		setUrl(url: string): void;
+		/** request.setMethod(method)
+		
+		Available only in 'onRequest' extension methods.
+		
+		Changes the request method before the router begins processing the request where:
+		
+		method - is the request HTTP method (e.g. 'GET').
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		
+		server.ext('onRequest', function (request, reply) {
+		
+		// Change all requests to 'GET'
+		request.setMethod('GET');
+		return reply.continue();
+		});*/
+		setMethod(method: string): void;
+		/** request.log(tags, [data, [timestamp]])
+		
+		Always available.
+		
+		Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
+		
+		data - an optional message string or object with the application data being logged.
+		timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+		Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
+		
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		
+		server.on('request', function (request, event, tags) {
+		
+		if (tags.error) {
+		console.log(event);
+		}
+		});
+		
+		var handler = function (request, reply) {
+		
+		request.log(['test', 'error'], 'Test event');
+		return reply();
+		};
+		*/
+		log(
+			/** a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events.*/
+			tags: string|string[],
+			/** an optional message string or object with the application data being logged.*/
+			data?: string,
+			/**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
+			timestamp?: number): void;
+		/** request.getLog([tags], [internal])
+		
+		Always available.
+		
+		Returns an array containing the events matching any of the tags specified (logical OR)
+		request.getLog();
+		request.getLog('error');
+		request.getLog(['error', 'auth']);
+		request.getLog(['error'], true);
+		request.getLog(false);*/
+
+		getLog(
+			/** is a single tag string or array of tag strings. If no tags specified, returns all events.*/
+			tags?: string,
+			/**  filters the events to only those with a matching event.internal value. If true, only internal logs are included. If false, only user event are included. Defaults to all events (undefined).*/
+			internal?: boolean): string[];
+
+		/** request.tail([name])
+		
+		Available until immediately after the 'response' event is emitted.
+		
+		Adds a request tail which has to complete before the request lifecycle is complete where:
+		
+		name - an optional tail name used for logging purposes.
+		Returns a tail function which must be called when the tail activity is completed.
+		
+		Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
+		
+		When all tails completed, the server emits a 'tail' event.
+		
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		
+		var get = function (request, reply) {
+		
+		var dbTail = request.tail('write to database');
+		
+		db.save('key', 'value', function () {
+		
+		dbTail();
+		});
+		
+		return reply('Success!');
+		};
+		
+		server.route({ method: 'GET', path: '/', handler: get });
+		
+		server.on('tail', function (request) {
+		
+		console.log('Request completed including db activity');
+		});*/
+		tail(
+			/** an optional tail name used for logging purposes.*/
+			name?: string): Function;
+	}
+	/** Response events
+	
+	The response object supports the following events:
+	
+	'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
+	'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
+	var Crypto = require('crypto');
+	var Hapi = require('hapi');
+	var server = new Hapi.Server();
+	server.connection({ port: 80 });
+	
+	server.ext('onPreResponse', function (request, reply) {
+	
+	var response = request.response;
+	if (response.isBoom) {
+	return reply();
+	}
+	
+	var hash = Crypto.createHash('sha1');
+	response.on('peek', function (chunk) {
+	
+	hash.update(chunk);
+	});
+	
+	response.once('finish', function () {
+	
+	console.log(hash.digest('hex'));
+	});
+	
+	return reply.continue();
+	});*/
+	export class Response extends Events.EventEmitter {
+		/**  the HTTP response status code. Defaults to 200 (except for errors).*/
+		statusCode: number;
+		/** an object containing the response headers where each key is a header field name. Note that this is an incomplete list of headers to be included with the response. Additional headers will be added once the response is prepare for transmission.*/
+		headers: IDictionary<string>;
+		/** the value provided using the reply interface.*/
+		source: any;
+		/** a string indicating the type of source with available values:
+		'plain' - a plain response such as string, number, null, or simple object (e.g. not a Stream, Buffer, or view).
+		'buffer' - a Buffer.
+		'view' - a view generated with reply.view().
+		'file' - a file generated with reply.file() of via the directory handler.
+		'stream' - a Stream.
+		'promise' - a Promise object. */
+		variety: string;
+		/** application-specific state. Provides a safe place to store application data without potential conflicts with the framework. Should not be used by plugins which should use plugins[name].*/
+		app: any;
+		/** plugin-specific state. Provides a place to store and pass request-level plugin data. The plugins is an object where each key is a plugin name and the value is the state. */
+		plugins: any;
+		/** settings - response handling flags:
+		charset - the 'Content-Type' HTTP header 'charset' property. Defaults to 'utf-8'.
+		encoding - the string encoding scheme used to serial data into the HTTP payload when source is a string or marshals into a string. Defaults to 'utf8'.
+		passThrough - if true and source is a Stream, copies the statusCode and headers of the stream to the outbound response. Defaults to true.
+		stringify - options used for source value requiring stringification. Defaults to no replacer and no space padding.
+		ttl - if set, overrides the route cache expiration milliseconds value set in the route config. Defaults to no override.
+		varyEtag - if true, a suffix will be automatically added to the 'ETag' header at transmission time (separated by a '-' character) when the HTTP 'Vary' header is present.*/
+		settings: {
+			charset: string;
+			encoding: string;
+			passThrough: boolean;
+			stringify: any;
+			ttl: number;
+			varyEtag: boolean;
+		}
+
+		/**  sets the HTTP 'Content-Length' header (to avoid chunked transfer encoding) where:
+		length - the header value. Must match the actual payload size.*/
+		bytes(length: number): void;
+		/**  sets the 'Content-Type' HTTP header 'charset' property where: charset - the charset property value.*/
+		charset(charset: string): void;
+
+		/**  sets the HTTP status code where:
+		statusCode - the HTTP status code.*/
+		code(statusCode: number): void;
+		/** sets the HTTP status code to Created (201) and the HTTP 'Location' header where: uri - an absolute or relative URI used as the 'Location' header value.*/
+		created(uri: string): void;
+
+
+		/** encoding(encoding) - sets the string encoding scheme used to serial data into the HTTP payload where: encoding - the encoding property value (see node Buffer encoding).*/
+		encoding(encoding: string): void;
+
+		/** etag(tag, options) - sets the representation entity tag where:
+		tag - the entity tag string without the double-quote.
+		options - optional settings where:
+		weak - if true, the tag will be prefixed with the 'W/' weak signifier. Weak tags will fail to match identical tags for the purpose of determining 304 response status. Defaults to false.
+		vary - if true and content encoding is set or applied to the response (e.g 'gzip' or 'deflate'), the encoding name will be automatically added to the tag at transmission time (separated by a '-' character). Ignored when weak is true. Defaults to true.*/
+		etag(tag: string, options: {
+			weak: boolean; vary: boolean;
+		}): void;
+
+		/**header(name, value, options) - sets an HTTP header where:
+		name - the header name.
+		value - the header value.
+		options - optional settings where:
+		append - if true, the value is appended to any existing header value using separator. Defaults to false.
+		separator - string used as separator when appending to an exiting value. Defaults to ','.
+		override - if false, the header value is not set if an existing value present. Defaults to true.*/
+		header(name: string, value: string, options?: {
+			append: boolean;
+			separator: string;
+			override: boolean;
+		}): void;
+
+		/** location(uri) - sets the HTTP 'Location' header where:
+		uri - an absolute or relative URI used as the 'Location' header value.*/
+		location(uri: string): void;
+
+		/** redirect(uri) - sets an HTTP redirection response (302) and decorates the response with additional methods listed below, where:
+		uri - an absolute or relative URI used to redirect the client to another resource. */
+		redirect(uri: string): void;
+
+		/** replacer(method) - sets the JSON.stringify() replacer argument where:
+		method - the replacer function or array. Defaults to none.*/
+		replacer(method: Function| Array<Function>): void;
+
+		/** spaces(count) - sets the JSON.stringify() space argument where:
+		count - the number of spaces to indent nested object keys. Defaults to no indentation. */
+		spaces(count: number): void;
+		/**state(name, value, [options]) - sets an HTTP cookie where:
+		name - the cookie name.
+		value - the cookie value. If no encoding is defined, must be a string.
+		options - optional configuration. If the state was previously registered with the server using server.state(), the specified keys in options override those same keys in the server definition (but not others).*/
+		state(name: string, value: string, options?: any): void;
+
+	}
+
+
+
+	/** Server http://hapijs.com/api#server
+	rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080). 
+	Server events
+	The server object inherits from Events.EventEmitter and emits the following events:
+	'log' - events logged with server.log() and server events generated internally by the framework.
+	'start' - emitted when the server is started using server.start().
+	'stop' - emitted when the server is stopped using server.stop().
+	'request' - events generated by request.log(). Does not include any internally generated events.
+	'request-internal' - request events generated internally by the framework (multiple events per request).
+	'request-error' - emitted whenever an Internal Server Error (500) error response is sent. Single event per request.
+	'response' - emitted after the response is sent back to the client (or when the client connection closed and no response sent, in which case request.response is null). Single event per request.
+	'tail' - emitted when a request finished processing, including any registered tails. Single event per request.
+	Note that the server object should not be used to emit application events as its internal implementation is designed to fan events out to the various plugin selections and not for application events.
+	MORE EVENTS HERE: http://hapijs.com/api#server-events*/
+	export class Server extends Events.EventEmitter {
+
+		constructor(options?: IServerOptions);
+		/** Provides a safe place to store server-specific run-time application data without potential conflicts with the framework internals. The data can be accessed whenever the server is accessible. Initialized with an empty object.
+		var Hapi = require('hapi');
+		server = new Hapi.Server();
+		server.app.key = 'value';
+		var handler = function (request, reply) {
+		return reply(request.server.app.key);
+		}; */
+		app: any;
+		/** An array containing the server's connections. When the server object is returned from server.select(), the connections array only includes the connections matching the selection criteria.
+		var server = new Hapi.Server();
+		server.connection({ port: 80, labels: 'a' });
+		server.connection({ port: 8080, labels: 'b' });
+		// server.connections.length === 2
+		var a = server.select('a');
+		// a.connections.length === 1*/
+		connections: Array<ISeverConnectionOptions>;
+		/** When the server contains exactly one connection, info is an object containing information about the sole connection.
+		* When the server contains more than one connection, each server.connections array member provides its own connection.info.
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		// server.info.port === 80
+		server.connection({ port: 8080 });
+		// server.info === null
+		// server.connections[1].info.port === 8080
+		*/
+		info: {
+			/**  - a unique connection identifier (using the format '{hostname}:{pid}:{now base36}').*/
+			id: string;
+			/**  - the connection creation timestamp.*/
+			created: number;
+			/**  - the connection start timestamp (0 when stopped).*/
+			started: number;
+			/**  the connection port based on the following rules:
+			the configured port value before the server has been started.
+			the actual port assigned when no port is configured or set to 0 after the server has been started.*/
+			port: number;
+
+			/** - the host name the connection was configured to. Defaults to the operating system hostname when available, otherwise 'localhost'.*/
+			host: string;
+			/** - the active IP address the connection was bound to after starting.Set to undefined until the server has been started or when using a non TCP port (e.g. UNIX domain socket).*/
+			address: string;
+			/**  - the protocol used:
+			'http' - HTTP.
+			'https' - HTTPS.
+			'socket' - UNIX domain socket or Windows named pipe.*/
+			protocol: string;
+			/** a string representing the connection (e.g. 'http://example.com:8080' or 'socket:/unix/domain/socket/path'). Contains the uri setting if provided, otherwise constructed from the available settings. If no port is available or set to 0, the uri will not include a port component.*/
+			uri: string;
+		};
+		/** An object containing the process load metrics (when load.sampleInterval is enabled):
+		rss - RSS memory usage.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server({ load: { sampleInterval: 1000 } });
+		console.log(server.load.rss);*/
+		load: {
+			/** - event loop delay milliseconds.*/
+			eventLoopDelay: number;
+			/**  - V8 heap usage.*/
+			heapUsed: number;
+		};
+		/** When the server contains exactly one connection, listener is the node HTTP server object of the sole connection.
+		When the server contains more than one connection, each server.connections array member provides its own connection.listener.
+		var Hapi = require('hapi');
+		var SocketIO = require('socket.io');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		var io = SocketIO.listen(server.listener);
+		io.sockets.on('connection', function(socket) {
+		socket.emit({ msg: 'welcome' });
+		});*/
+		listener: http.Server;
+
+		/** server.methods
+		An object providing access to the server methods where each server method name is an object property.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.method('add', function (a, b, next) {
+		return next(null, a + b);
+		});
+		server.methods.add(1, 2, function (err, result) {
+		// result === 3
+		});*/
+		methods: IDictionary<Function>;
+
+		/** server.mime
+		Provides access to the server MIME database used for setting content-type information. The object must not be modified directly but only through the mime server setting.
+		var Hapi = require('hapi');
+		var options = {
+		mime: {
+		override: {
+		'node/module': {
+		source: 'steve',
+		compressible: false,
+		extensions: ['node', 'module', 'npm'],
+		type: 'node/module'
+		}
+		}
+		}
+		};
+		var server = new Hapi.Server(options);
+		// server.mime.path('code.js').type === 'application/javascript'
+		// server.mime.path('file.npm').type === 'node/module'*/
+		mime: any;
+		/**server.plugins
+		An object containing the values exposed by each plugin registered where each key is a plugin name and the values are the exposed properties by each plugin using server.expose(). Plugins may set the value of the server.plugins[name] object directly or via the server.expose() method.
+		exports.register = function (server, options, next) {
+		server.expose('key', 'value');
+		// server.plugins.example.key === 'value'
+		return next();
+		};
+		exports.register.attributes = {
+		name: 'example'
+		};*/
+		plugins: IDictionary<any>;
+		/** server.realm
+		The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
+		modifiers - when the server object is provided as an argument to the plugin register() method, modifiers provides the registration preferences passed the server.register() method and includes:
+		route - routes preferences:
+		prefix - the route path prefix used by any calls to server.route() from the server.
+		vhost - the route virtual host settings used by any calls to server.route() from the server.
+		plugin - the active plugin name (empty string if at the server root).
+		plugins - plugin-specific state to be shared only among activities sharing the same active state. plugins is an object where each key is a plugin name and the value is the plugin state.
+		settings - settings overrides:
+		files.relativeTo
+		bind
+		The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
+		exports.register = function (server, options, next) {
+		console.log(server.realm.modifiers.route.prefix);
+		return next();
+		};*/
+		realm: IServerRealm;
+
+		/** server.root
+		The root server object containing all the connections and the root server methods (e.g. start(), stop(), connection()).*/
+		root: Server;
+		/** server.settings
+		The server configuration object after defaults applied.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server({
+		app: {
+		key: 'value'
+		}
+		});
+		// server.settings.app === { key: 'value' }*/
+		settings: IServerOptions;
+
+		/** server.version
+		The hapi module version number.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		// server.version === '8.0.0'*/
+		version: string;
+
+		/** server.after(method, [dependencies])
+		Adds a method to be called after all the plugin dependencies have been registered and before the server starts (only called if the server is started) where:
+		after - the method with signature function(plugin, next) where:
+		server - server object the after() method was called on.
+		next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+		err - internal error which is returned back via the server.start() callback.
+		dependencies - a string or array of string with the plugin names to call this method after their after() methods. There is no requirement for the other plugins to be registered. Setting dependencies only arranges the after methods in the specified order.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		server.after(function () {
+		// Perform some pre-start logic
+		});
+		server.start(function (err) {
+		// After method already executed
+		});
+		server.auth.default(options)*/
+		after(method: (plugin: any, next: (err: any) => void) => void, dependencies: string|string[]): void;
+
+		auth: {
+			/** server.auth.default(options)
+			Sets a default strategy which is applied to every route where:
+			options - a string with the default strategy name or an object with a specified strategy or strategies using the same format as the route auth handler options.
+			The default does not apply when the route config specifies auth as false, or has an authentication strategy configured. Otherwise, the route authentication config is applied to the defaults. Note that the default only applies at time of route configuration, not at runtime. Calling default() after adding a route will have no impact on routes added prior.
+			The default auth strategy configuration can be accessed via connection.auth.settings.default.
+			var server = new Hapi.Server();
+			server.connection({ port: 80 });
+			server.auth.scheme('custom', scheme);
+			server.auth.strategy('default', 'custom');
+			server.auth.default('default');
+			server.route({
+			method: 'GET',
+			path: '/',
+			handler: function (request, reply) {
+			return reply(request.auth.credentials.user);
+			}
+			});*/
+			default(options: string):void;
+			/** server.auth.scheme(name, scheme)
+			Registers an authentication scheme where:
+			name - the scheme name.
+			scheme - the method implementing the scheme with signature function(server, options) where:
+			server - a reference to the server object the scheme is added to.
+			options - optional scheme settings used to instantiate a strategy.*/
+			scheme(name: string,
+				/** When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. If the err returned by the reply() method includes a message, no additional strategies will be attempted. If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
+				n the scheme payload() method returns an error with a message, it means payload validation failed due to bad payload. If the error has no message but includes a scheme name (e.g. Boom.unauthorized(null, 'Custom')), authentication may still be successful if the route auth.payload configuration is set to 'optional'.
+				server = new Hapi.Server();
+				server.connection({ port: 80 });
+				scheme = function (server, options) {
+				urn {
+				authenticate: function (request, reply) {
+				req = request.raw.req;
+				var authorization = req.headers.authorization;
+				if (!authorization) {
+				return reply(Boom.unauthorized(null, 'Custom'));
+				}
+				urn reply(null, { credentials: { user: 'john' } });
+				}
+				};
+				};
+				*/
+				scheme: (server: Server, options: any) => IServerAuthScheme): void;
+
+			/** server.auth.strategy(name, scheme, [mode], [options])
+			Registers an authentication strategy where:
+			name - the strategy name.
+			scheme - the scheme name (must be previously registered using server.auth.scheme()).
+			mode - if true, the scheme is automatically assigned as a required strategy to any route without an auth config. Can only be assigned to a single server strategy. Value must be true (which is the same as 'required') or a valid authentication mode ('required', 'optional', 'try'). Defaults to false.
+			options - scheme options based on the scheme requirements.
+			var server = new Hapi.Server();
+			server.connection({ port: 80 });
+			server.auth.scheme('custom', scheme);
+			server.auth.strategy('default', 'custom');
+			server.route({
+			method: 'GET',
+			path: '/',
+			config: {
+			auth: 'default',
+			handler: function (request, reply) {
+			return reply(request.auth.credentials.user);
+			}
+			}
+			});*/
+			strategy(name: string, scheme: any, mode?: boolean, options?: any):void;
+
+			/** server.auth.test(strategy, request, next)
+			Tests a request against an authentication strategy where:
+			strategy - the strategy name registered with server.auth.strategy().
+			request - the request object.
+			next - the callback function with signature function(err, credentials) where:
+			err - the error if authentication failed.
+			credentials - the authentication credentials object if authentication was successful.
+			Note that the test() method does not take into account the route authentication configuration. It also does not perform payload authentication. It is limited to the basic strategy authentication execution. It does not include verifying scope, entity, or other route properties.
+			var server = new Hapi.Server();
+			server.connection({ port: 80 });
+			server.auth.scheme('custom', scheme);
+			server.auth.strategy('default', 'custom');
+			server.route({
+			method: 'GET',
+			path: '/',
+			handler: function (request, reply) {
+			request.server.auth.test('default', request, function (err, credentials) {
+			if (err) {
+			return reply({ status: false });
+			}
+			return reply({ status: true, user: credentials.name });
+			});
+			}
+			});*/
+			test(strategy: string, request: Request, next: (err: any, credentials: any) => void): void;
+		};
+		/** server.bind(context)
+		Sets a global context used as the default bind object when adding a route or an extension where:
+		context - the object used to bind this in handler and extension methods.
+		When setting context inside a plugin, the context is applied only to methods set up by the plugin. Note that the context applies only to routes and extensions added after it has been set.
+		var handler = function (request, reply) {
+		return reply(this.message);
+		};
+		exports.register = function (server, options, next) {
+		var bind = {
+		message: 'hello'
+		};
+		server.bind(bind);
+		server.route({ method: 'GET', path: '/', handler: handler });
+		return next();
+		};*/
+		bind(context: any): void;
+
+
+		/** server.cache(options)
+		Provisions a cache segment within the server cache facility where:
+		options - catbox policy configuration where:
+		expiresIn - relative expiration expressed in the number of milliseconds since the item was saved in the cache. Cannot be used together with expiresAt.
+		expiresAt - time of day expressed in 24h notation using the 'HH:MM' format, at which point all cache records expire. Uses local time. Cannot be used together with expiresIn.
+		generateFunc - a function used to generate a new cache item if one is not found in the cache when calling get(). The method's signature is function(id, next) where: - id - the id string or object provided to the get() method. - next - the method called when the new item is returned with the signature function(err, value, ttl) where: - err - an error condition. - value - the new value generated. - ttl - the cache ttl value in milliseconds. Set to 0 to skip storing in the cache. Defaults to the cache global policy.
+		staleIn - number of milliseconds to mark an item stored in cache as stale and attempt to regenerate it when generateFunc is provided. Must be less than expiresIn.
+		staleTimeout - number of milliseconds to wait before checking if an item is stale.
+		generateTimeout - number of milliseconds to wait before returning a timeout error when the generateFunc function takes too long to return a value. When the value is eventually returned, it is stored in the cache for future requests.
+		cache - the cache name configured in 'server.cache`. Defaults to the default cache.
+		segment - string segment name, used to isolate cached items within the cache partition. When called within a plugin, defaults to '!name' where 'name' is the plugin name. Required when called outside of a plugin.
+		shared - if true, allows multiple cache provisions to share the same segment. Default to false.
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		var cache = server.cache({ segment: 'countries', expiresIn: 60 * 60 * 1000 });
+		cache.set('norway', { capital: 'oslo' }, null, function (err) {
+		cache.get('norway', function (err, value, cached, log) {
+		// value === { capital: 'oslo' };
+		});
+		});*/
+		cache(options: ICatBoxCacheOptions): void;
+
+		/** server.connection([options])
+		Adds an incoming server connection 
+		Returns a server object with the new connection selected.
+		Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
+		Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		var web = server.connection({ port: 8000, host: 'example.com', labels: ['web'] });
+		var admin = server.connection({ port: 8001, host: 'example.com', labels: ['admin'] });
+		// server.connections.length === 2
+		// web.connections.length === 1
+		// admin.connections.length === 1 */
+		connection(options: ISeverConnectionOptions): Server;
+		/** server.decorate(type, property, method)
+		Extends various framework interfaces with custom methods where:
+		type - the interface being decorated. Supported types:
+		'reply' - adds methods to the reply interface.
+		'server' - adds methods to the Server object.
+		property - the object decoration key name.
+		method - the extension function.
+		Note that decorations apply to the entire server and all its connections regardless of current selection.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		server.decorate('reply', 'success', function () {
+		return this.response({ status: 'ok' });
+		});
+		server.route({
+		method: 'GET',
+		path: '/',
+		handler: function (request, reply) {
+		return reply.success();
+		}
+		});*/
+		decorate(type: string, property: string, method: Function):void;
+
+		/** server.dependency(dependencies, [after])
+		Used within a plugin to declares a required dependency on other plugins where:
+		dependencies - a single string or array of plugin name strings which must be registered in order for this plugin to operate. Plugins listed must be registered before the server is started. Does not provide version dependency which should be implemented using npm peer dependencies.
+		after - an optional function called after all the specified dependencies have been registered and before the server starts. The function is only called if the server is started. If a circular dependency is detected, an exception is thrown (e.g. two plugins each has an after function to be called after the other). The function signature is function(server, next) where:
+		server - the server the dependency() method was called on.
+		next - the callback function the method must call to return control over to the application and complete the registration process. The function signature is function(err) where:
+		err - internal error condition, which is returned back via the server.start() callback.
+		exports.register = function (server, options, next) {
+		server.dependency('yar', after);
+		return next();
+		};
+		var after = function (server, next) {
+		// Additional plugin registration logic
+		return next();
+		};*/
+		dependency(dependencies: string|string[], after?: (server: Server, next: (err: any) => void) => void): void;
+
+
+		/** server.expose(key, value)
+		Used within a plugin to expose a property via server.plugins[name] where:
+		key - the key assigned (server.plugins[name][key]).
+		value - the value assigned.
+		exports.register = function (server, options, next) {
+		server.expose('util', function () { console.log('something'); });
+		return next();
+		};*/
+		expose(key: string, value: any): void;
+
+		/** server.expose(obj)
+		Merges a deep copy of an object into to the existing content of server.plugins[name] where:
+		obj - the object merged into the exposed properties container.
+		exports.register = function (server, options, next) {
+		server.expose({ util: function () { console.log('something'); } });
+		return next();
+		};*/
+		expose(obj: any): void;
+
+		/** server.ext(event, method, [options])
+		Registers an extension function in one of the available extension points where:
+		event - the event name.
+		method - a function or an array of functions to be executed at a specified point during request processing. The required extension function signature is function(request, reply) where:
+		request - the request object.
+		reply - the reply interface which is used to return control back to the framework. To continue normal execution of the request lifecycle, reply.continue() must be called. To abort processing and return a response to the client, call reply(value) where value is an error or any other valid response.
+		this - the object provided via options.bind or the current active context set with server.bind().
+		options - an optional object with the following:
+		before - a string or array of strings of plugin names this method must execute before (on the same event). Otherwise, extension methods are executed in the order added.
+		after - a string or array of strings of plugin names this method must execute after (on the same event). Otherwise, extension methods are executed in the order added.
+		bind - a context object passed back to the provided method (via this) when called.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		server.ext('onRequest', function (request, reply) {
+		// Change all requests to '/test'
+		request.setUrl('/test');
+		return reply.continue();
+		});
+		var handler = function (request, reply) {
+		return reply({ status: 'ok' });
+		};
+		server.route({ method: 'GET', path: '/test', handler: handler });
+		server.start();
+		// All requests will get routed to '/test'*/
+		ext(event: string, method: (request: Request, reply: IReply, bind?: any) => void, options?: { before: string|string[]; after: string|string[]; bind?: any }): void;
+
+		/** server.handler(name, method)
+		Registers a new handler type to be used in routes where:
+		name - string name for the handler being registered. Cannot override the built-in handler types (directory, file, proxy, and view) or any previously registered type.
+		method - the function used to generate the route handler using the signature function(route, options) where:
+		route - the route public interface object.
+		options - the configuration object provided in the handler config.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ host: 'localhost', port: 8000 });
+		// Defines new handler for routes on this server
+		server.handler('test', function (route, options) {
+		return function (request, reply) {
+		return reply('new handler: ' + options.msg);
+		}
+		});
+		server.route({
+		method: 'GET',
+		path: '/',
+		handler: { test: { msg: 'test' } }
+		});
+		server.start();
+		The method function can have a defaults object or function property. If the property is set to an object, that object is used as the default route config for routes using this handler. If the property is set to a function, the function uses the signature function(method) and returns the route default configuration.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ host: 'localhost', port: 8000 });
+		var handler = function (route, options) {
+		return function (request, reply) {
+		return reply('new handler: ' + options.msg);
+		}
+		};
+		// Change the default payload processing for this handler
+		handler.defaults = {
+		payload: {
+		output: 'stream',
+		parse: false
+		}
+		};
+		server.handler('test', handler);*/
+		handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
+		/** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection. 
+		Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack. 
+		Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
+		* When the server contains more than one connection, each server.connections array member provides its own connection.inject().
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		var handler = function (request, reply) {
+		return reply('Success!');
+		};
+		server.route({ method: 'GET', path: '/', handler: handler });
+		server.inject('/', function (res) {
+		console.log(res.result);
+		});
+		*/
+		inject: IServerInject;
+
+		/** server.log(tags, [data, [timestamp]])
+		Logs server events that cannot be associated with a specific request. When called the server emits a 'log' event which can be used by other listeners or plugins to record the information or output to the console. The arguments are:
+		tags - a string or an array of strings (e.g. ['error', 'database', 'read']) used to identify the event. Tags are used instead of log levels and provide a much more expressive mechanism for describing and filtering events. Any logs generated by the server internally include the 'hapi' tag along with event-specific information.
+		data - an optional message string or object with the application data being logged.
+		timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		server.on('log', function (event, tags) {
+		if (tags.error) {
+		console.log(event);
+		}
+		});
+		server.log(['test', 'error'], 'Test event');*/
+		log(tags: string|string[], data?: string|any, timestamp?: number): void;
+		/**server.lookup(id)
+		When the server contains exactly one connection, looks up a route configuration where:
+		id - the route identifier as set in the route options.
+		returns the route public interface object if found, otherwise null.
+		var server = new Hapi.Server();
+		server.connection();
+		server.route({
+		method: 'GET',
+		path: '/',
+		config: {
+		handler: function (request, reply) { return reply(); },
+		id: 'root'
+		}
+		});
+		var route = server.lookup('root');
+		When the server contains more than one connection, each server.connections array member provides its own connection.lookup() method.*/
+		lookup(id: string): IRoute;
+		/** server.match(method, path, [host])
+		When the server contains exactly one connection, looks up a route configuration where:
+		method - the HTTP method (e.g. 'GET', 'POST').
+		path - the requested path (must begin with '/').
+		host - optional hostname (to match against routes with vhost).
+		returns the route public interface object if found, otherwise null.
+		var server = new Hapi.Server();
+		server.connection();
+		server.route({
+		method: 'GET',
+		path: '/',
+		config: {
+		handler: function (request, reply) { return reply(); },
+		id: 'root'
+		}
+		});
+		var route = server.match('get', '/');
+		When the server contains more than one connection, each server.connections array member provides its own connection.match() method.*/
+		match(method: string, path: string, host?: string): IRoute;
+
+
+
+
+		/** server.method(name, method, [options])
+		Registers a server method. Server methods are functions registered with the server and used throughout the application as a common utility. Their advantage is in the ability to configure them to use the built-in cache and share across multiple request handlers without having to create a common module.
+		Methods are registered via server.method(name, method, [options])
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		// Simple arguments
+		var add = function (a, b, next) {
+		return next(null, a + b);
+		};
+		server.method('sum', add, { cache: { expiresIn: 2000 } });
+		server.methods.sum(4, 5, function (err, result) {
+		console.log(result);
+		});
+		// Object argument
+		var addArray = function (array, next) {
+		var sum = 0;
+		array.forEach(function (item) {
+		sum += item;
+		});
+		return next(null, sum);
+		};
+		server.method('sumObj', addArray, {
+		cache: { expiresIn: 2000 },
+		generateKey: function (array) {
+		return array.join(',');
+		}
+		});
+		server.methods.sumObj([5, 6], function (err, result) {
+		console.log(result);
+		});
+		// Synchronous method with cache
+		var addSync = function (a, b) {
+		return a + b;
+		};
+		server.method('sumSync', addSync, { cache: { expiresIn: 2000 }, callback: false });
+		server.methods.sumSync(4, 5, function (err, result) {
+		console.log(result);
+		}); */
+		method(
+			/**  a unique method name used to invoke the method via server.methods[name]. When configured with caching enabled, server.methods[name].cache.drop(arg1, arg2, ..., argn, callback) can be used to clear the cache for a given key. Supports using nested names such as utils.users.get which will automatically create the missing path under server.methods and can be accessed for the previous example via server.methods.utils.users.get.*/
+			name: string,
+			method: IServerMethod,
+			options?: IServerMethodOptions):void;
+
+
+		/**server.method(methods)
+		Registers a server method function as described in server.method() using a configuration object where:
+		methods - an object or an array of objects where each one contains:
+		name - the method name.
+		method - the method function.
+		options - optional settings.
+		var add = function (a, b, next) {
+		next(null, a + b);
+		};
+		server.method({
+		name: 'sum',
+		method: add,
+		options: {
+		cache: {
+		expiresIn: 2000
+		}
+		}
+		});*/
+		method(methods: {
+			name: string; method: IServerMethod; options?: IServerMethodOptions
+		}| Array<{
+				name: string; method: IServerMethod; options?: IServerMethodOptions
+			}>):void;
+		/**server.path(relativeTo)
+		Sets the path prefix used to locate static resources (files and view templates) when relative paths are used where:
+		relativeTo - the path prefix added to any relative file path starting with '.'.
+		Note that setting a path within a plugin only applies to resources accessed by plugin methods. If no path is set, the connection files.relativeTo configuration is used. The path only applies to routes added after it has been set.
+		exports.register = function (server, options, next) {
+		server.path(__dirname + '../static');
+		server.route({ path: '/file', method: 'GET', handler: { file: './test.html' } });
+		next();
+		};*/
+		path(relativeTo: string): void;
+		/**server.register(plugins, [options], callback)
+		Registers a plugin where:
+		plugins - an object or array of objects where each one is either:
+		a plugin registration function.
+		an object with the following:
+		register - the plugin registration function.
+		options - optional options passed to the registration function when called.
+		options - optional registration options (different from the options passed to the registration function):
+		select - a string or array of string labels used to pre-select connections for plugin registration.
+		routes - modifiers applied to each route added by the plugin:
+		prefix - string added as prefix to any route path (must begin with '/'). If a plugin registers a child plugin the prefix is passed on to the child or is added in front of the child-specific prefix.
+		vhost - virtual host string (or array of strings) applied to every route. The outer-most vhost overrides the any nested configuration.
+		callback - the callback function with signature function(err) where:
+		err - an error returned from the registration function. Note that exceptions thrown by the registration function are not handled by the framework.
+		server.register({
+		register: require('plugin_name'),
+		options: {
+		message: 'hello'
+		}
+		}, function (err) {
+		if (err) {
+		console.log('Failed loading plugin');
+		}
+		});*/
+		register(plugins: any|any[], options: {
+			select: string|string[];
+			routes: {
+				prefix: string; vhost?: string|string[]
+			};
+		}
+			, callback: (err: any) => void):void;
+
+		register(plugins: any|any[], callback: (err: any) => void):void;
+
+		/**server.render(template, context, [options], callback)
+		Utilizes the server views manager to render a template where:
+		template - the template filename and path, relative to the views manager templates path (path or relativeTo).
+		context - optional object used by the template to render context-specific result. Defaults to no context ({}).
+		options - optional object used to override the views manager configuration.
+		callback - the callback function with signature function (err, rendered, config) where:
+		err - the rendering error if any.
+		rendered - the result view string.
+		config - the configuration used to render the template.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		server.views({
+		engines: { html: require('handlebars') },
+		path: __dirname + '/templates'
+		});
+		var context = {
+		title: 'Views Example',
+		message: 'Hello, World'
+		};
+		server.render('hello', context, function (err, rendered, config) {
+		console.log(rendered);
+		});*/
+		render(template: string, context: any, options: any, callback: (err: any, rendered: any, config: any) => void):void;
+		/** server.route(options)
+		Adds a connection route where:
+		options - a route configuration object or an array of configuration objects.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		server.route({ method: 'GET', path: '/', handler: function (request, reply) { return reply('ok'); } });
+		server.route([
+		{ method: 'GET', path: '/1', handler: function (request, reply) { return reply('ok'); } },
+		{ method: 'GET', path: '/2', handler: function (request, reply) { return reply('ok'); } }
+		]);*/
+		route(options: IRouteConfiguration):void;
+		route(options: IRouteConfiguration[]):void;
+		/**server.select(labels)
+		Selects a subset of the server's connections where:
+		labels - a single string or array of strings of labels used as a logical OR statement to select all the connections with matching labels in their configuration.
+		Returns a server object with connections set to the requested subset. Selecting again on a selection operates as a logic AND statement between the individual selections.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80, labels: ['a', 'b'] });
+		server.connection({ port: 8080, labels: ['a', 'c'] });
+		server.connection({ port: 8081, labels: ['b', 'c'] });
+		var a = server.select('a');     // 80, 8080
+		var ac = a.select('c');         // 8080*/
+		select(labels: string|string[]): void;
+		/** server.start([callback])
+		Starts the server connections by listening for incoming requests on the configured port of each listener (unless the connection was configured with autoListen set to false), where:
+		callback - optional callback when server startup is completed or failed with the signature function(err) where:
+		err - any startup error condition.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		server.start(function (err) {
+		console.log('Server started at: ' + server.info.uri);
+		});*/
+		start(callback?: (err: any) => void): void;
+		/** server.state(name, [options])
+		HTTP state management uses client cookies to persist a state across multiple requests. Registers a cookie definitions
+		State defaults can be modified via the server connections.routes.state configuration option.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		// Set cookie definition
+		server.state('session', {
+		ttl: 24 * 60 * 60 * 1000,     // One day
+		isSecure: true,
+		path: '/',
+		encoding: 'base64json'
+		});
+		// Set state in route handler
+		var handler = function (request, reply) {
+		var session = request.state.session;
+		if (!session) {
+		session = { user: 'joe' };
+		}
+		session.last = Date.now();
+		return reply('Success').state('session', session);
+		};
+		Registered cookies are automatically parsed when received. Parsing rules depends on the route state.parse configuration. If an incoming registered cookie fails parsing, it is not included in request.state, regardless of the state.failAction setting. When state.failAction is set to 'log' and an invalid cookie value is received, the server will emit a 'request-internal' event. To capture these errors subscribe to the 'request-internal' events and filter on 'error' and 'state' tags:
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		server.on('request-internal', function (request, event, tags) {
+		if (tags.error && tags.state) {
+		console.error(event);
+		}
+		});	*/
+		state(name: string, options?: ICookieSettings): void;
+
+		/** server.stop([options], [callback])
+		Stops the server's connections by refusing to accept any new connections or requests (existing connections will continue until closed or timeout), where:
+		options - optional object with:
+		timeout - overrides the timeout in millisecond before forcefully terminating a connection. Defaults to 5000 (5 seconds).
+		callback - optional callback method with signature function() which is called once all the connections have ended and it is safe to exit the process.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80 });
+		server.stop({ timeout: 60 * 1000 }, function () {
+		console.log('Server stopped');
+		});*/
+		stop(options?: { timeout: number }, callback?: () => void): void;
+		/**server.table([host])
+		Returns a copy of the routing table where:
+		host - optional host to filter routes matching a specific virtual host. Defaults to all virtual hosts.
+		The return value is an array where each item is an object containing:
+		info - the connection.info the connection the table was generated for.
+		labels - the connection labels.
+		table - an array of routes where each route contains:
+		settings - the route config with defaults applied.
+		method - the HTTP method in lower case.
+		path - the route path.
+		Note that if the server has not been started and multiple connections use port 0, the table items will override each other and will produce an incomplete result.
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80, host: 'example.com' });
+		server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
+		var table = server.table();
+		When calling connection.table() directly on each connection, the return value is the same as the array table item value of an individual connection:
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.connection({ port: 80, host: 'example.com' });
+		server.route({ method: 'GET', path: '/example', handler: function (request, reply) { return reply(); } });
+		var table = server.connections[0].table();
+		//[
+		//    {
+		//        method: 'get',
+		//        path: '/example',
+		//        settings: { ... }
+		//    }
+		//]
+		*/
+		table(host?: any): IConnectionTable;
+
+		/**server.views(options)
+		Initializes the server views manager
+		var Hapi = require('hapi');
+		var server = new Hapi.Server();
+		server.views({
+		engines: {
+		html: require('handlebars'),
+		jade: require('jade')
+		},
+		path: '/static/templates'
+		});
+		When server.views() is called within a plugin, the views manager is only available to plugins methods.*/
+		views(options: IServerViewsConfiguration): void;
+
+	}
+}
\ No newline at end of file
diff --git a/hapi/hapi-tests-8.2.0.ts b/hapi/hapi-tests-8.2.0.ts
new file mode 100644
index 0000000000..11ad81d2dd
--- /dev/null
+++ b/hapi/hapi-tests-8.2.0.ts
@@ -0,0 +1,99 @@
+/// <reference path="hapi.d.ts" />
+
+import Hapi = require("hapi");
+
+// Create a server with a host and port
+var server = new Hapi.Server();
+server.connection({
+	host: "localhost",
+	port: 8000,
+});
+
+// Add plugins
+var plugin: any = {
+	register: function (plugin: Object, options: Object, next: Function) {
+		next();
+	}
+};
+
+plugin.register.attributes = {
+	name: "test",
+	version: "1.0.0"
+};
+
+// optional options parameter
+server.register({}, function (err) {});
+
+// optional options.routes.vhost parameter 
+server.register({}, { select: 'api', routes: { prefix: '/prefix' } }, function (err) {});
+
+//server.pack.register(plugin, (err: Object) => {
+//	if (err) { throw err; }
+//});
+
+//server.pack.register([plugin], (err: Object) => {
+//	if (err) { throw err; }
+//});
+
+// Add server method
+var add = function (a: number, b: number, next: (err: any, result?: any, ttl?: number) => void) {
+	next(null, a + b);
+};
+
+server.method("sum", add);//, { cache: { expiresIn: 2000 } });
+
+server.methods["sum"](4, 5, (err: any, result: any) => {
+	console.log(result);
+});
+
+var addArray = function (array: Array<number>, next: (err: any, result?: any, ttl?: number) => void) {
+	var sum: number = 0;
+	array.forEach((item: number) => {
+		sum += item;
+	});
+	next(null, sum);
+};
+
+server.method("sumObj", addArray, {
+	//cache: { expiresIn: 2000 },
+	generateKey: (array: Array<number>) => {
+		return array.join(',');
+	}
+});
+
+server.methods["sumObj"]([5, 6], (err: any, result: any) => {
+	console.log(result);
+});
+
+// Add the route
+server.route({
+	method: 'GET',
+	path: '/hello',
+	handler: function (request: Hapi.Request, reply: Function) {
+		reply('hello world');
+	}
+});
+
+server.route([{
+	method: 'GET',
+	path: '/hello2',
+	handler: function (request: Hapi.Request, reply: Function) {
+		reply('hello world2');
+	}
+}]);
+
+// config.validate parameters should be optional
+server.route([{
+    method: 'GET',
+    path: '/hello2',
+    handler: function(request: Hapi.Request, reply: Function) {
+        reply('hello world2');
+    },
+    config: {
+        validate: {
+        }
+    }
+}]);
+
+// Start the server
+server.start();
diff --git a/hapi/hapi-tests.ts b/hapi/hapi-tests.ts
index 11ad81d2dd..ab58fd9385 100644
--- a/hapi/hapi-tests.ts
+++ b/hapi/hapi-tests.ts
@@ -4,9 +4,9 @@ import Hapi = require("hapi");
 
 // Create a server with a host and port
 var server = new Hapi.Server();
-server.connection({
+server.connection(<Hapi.IServerConnectionOptions>{
 	host: "localhost",
-	port: 8000,
+	port: 8000
 });
 
 // Add plugins
@@ -24,7 +24,7 @@ plugin.register.attributes = {
 // optional options parameter
 server.register({}, function (err) {});
 
-// optional options.routes.vhost parameter 
+// optional options.routes.vhost parameter
 server.register({}, { select: 'api', routes: { prefix: '/prefix' } }, function (err) {});
 
 //server.pack.register(plugin, (err: Object) => {
diff --git a/hapi/hapi.d.ts b/hapi/hapi.d.ts
index 8d3da2620b..adf1665659 100644
--- a/hapi/hapi.d.ts
+++ b/hapi/hapi.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for hapi 8.2.0
+// Type definitions for hapi 8.8.0
 // Project: http://github.com/spumko/hapi
 // Definitions by: Jason Swearingen <http://github.com/jasonswearingen>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
@@ -62,7 +62,7 @@ declare module "hapi" {
 	}
 
 	/** Any connections configuration server defaults can be included to override and customize the individual connection. */
-	export interface ISeverConnectionOptions extends IConnectionConfigurationServerDefaults {
+	export interface IServerConnectionOptions extends IConnectionConfigurationServerDefaults {
 		/**  - the public hostname or IP address. Used only to set server.info.host and server.info.uri. If not configured, defaults to the operating system hostname and if not available, to 'localhost'.*/
 		host?: string;
 		/** - sets the host name or IP address the connection will listen on.If not configured, defaults to host if present, otherwise to all available network interfaces (i.e. '0.0.0.0').Set to 127.0.0.1 or localhost to restrict connection to only those coming from the same machine.*/
@@ -83,7 +83,7 @@ declare module "hapi" {
 		/** - a string or string array of labels used to server.select() specific connections matching the specified labels.Defaults to an empty array [](no labels).*/
 		labels?: string|string[];
 		/**  - used to create an HTTPS connection.The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS documentation.Set to true when passing a listener object that has been configured to use TLS directly. */
-		tls?: boolean;
+		tls?: boolean|Object;
 
 	}
 
@@ -209,7 +209,7 @@ declare module "hapi" {
 	/**Initializes the server views manager
 	var Hapi = require('hapi');
 	var server = new Hapi.Server();
-	
+
 	server.views({
 	engines: {
 	html: require('handlebars'),
@@ -229,8 +229,8 @@ declare module "hapi" {
 	/**  Concludes the handler activity by setting a response and returning control over to the framework where:
 	erran optional error response.
 	resultan optional response payload.
-	Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first. 
-	FLOW CONTROL:	
+	Since an request can only have one response regardless if it is an error or success, the reply() method can only result in a single response value. This means that passing both an err and result will only use the err. There is no requirement for either err or result to be (or not) an Error object. The framework will simply use the first argument if present, otherwise the second. The method supports two arguments to be compatible with the common callback pattern of error first.
+	FLOW CONTROL:
 	When calling reply(), the framework waits until process.nextTick() to continue processing the request and transmit the response. This enables making changes to the returned response object before the response is sent. This means the framework will resume as soon as the handler method exits. To suspend this behavior, the returned response object supports the following methods: hold(), send() */
 	export interface IReply {
 		<T>(err: Error,
@@ -241,7 +241,7 @@ declare module "hapi" {
 		/**  Note that if result is a Stream with a statusCode property, that status code will be used as the default response code.  */
 		<T>(result: string|number|boolean|Buffer|stream.Stream | Promise<T> | T): Response;
 
-		/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200. 
+		/** Returns control back to the framework without setting a response. If called in the handler, the response defaults to an empty payload with status code 200.
 		  * The data argument is only used for passing back authentication data and is ignored elsewhere. */
 		continue(credentialData?: any): void;
 
@@ -384,7 +384,7 @@ declare module "hapi" {
 		an object  */
 		auth?: boolean|string|
 		{
-			/**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values: 
+			/**  the authentication mode.Defaults to 'required' if a server authentication strategy is configured, otherwise defaults to no authentication.Available values:
 			'required'authentication is required.
 			'optional'authentication is optional (must be valid if present).
 			'try'same as 'optional' but allows for invalid authentication. */
@@ -569,7 +569,7 @@ declare module "hapi" {
 			*/
 			headers?: boolean | IJoi | IValidationFunction;
 
-		
+
 			/** validation rules for incoming request path parameters, after matching the path against the route and extracting any parameters then stored in request.params.Values allowed:
 			trueany path parameters allowed (no validation performed).This is the default.
 			falseno path variables allowed.
@@ -634,8 +634,8 @@ declare module "hapi" {
 		tags?: string[]
 	}
 	/** server.realm http://hapijs.com/api#serverrealm
-	The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(), 
-	the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin). 
+	The realm object contains server-wide or plugin-specific state that can be shared across various methods. For example, when calling server.bind(),
+	the active realm settings.bind property is set which is then used by routes and extensions added at the same level (server root or plugin).
 	Realms are a limited version of a sandbox where plugins can maintain state used by the framework when adding routes, extensions, and other properties.
 	The server.realm object should be considered read-only and must not be changed directly except for the plugins property can be directly manipulated by the plugins (each setting its own under plugins[name]).
 	exports.register = function (server, options, next) {
@@ -716,9 +716,9 @@ declare module "hapi" {
 		lookupCompressed: boolean;
 	}
 
-	/**http://hapijs.com/api#route-handler 
+	/**http://hapijs.com/api#route-handler
 	Built-in handlers
-		
+
 	The framework comes with a few built-in handler types available by setting the route handler config to an object containing one of these keys.*/
 	export interface IRouteHandlerConfig {
 		/** generates a static file endpoint for serving a single file. file can be set to:
@@ -815,7 +815,7 @@ declare module "hapi" {
 	export interface IRouteConfiguration {
 		/**  - (required) the absolute path used to match incoming requests (must begin with '/'). Incoming requests are compared to the configured paths based on the connection router configuration option.The path can include named parameters enclosed in {} which will be matched against literal values in the request as described in Path parameters.*/
 		path: string;
-		/** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match). 
+		/** - (required) the HTTP method.Typically one of 'GET', 'POST', 'PUT', 'PATCH', 'DELETE', or 'OPTIONS'.Any HTTP method is allowed, except for 'HEAD'.Use '*' to match against any HTTP method (only when an exact match was not found, and any match with a specific method will be given a higher priority over a wildcard match).
 		* Can be assigned an array of methods which has the same result as adding the same route with different methods manually.*/
 		method: string|string[];
 		/**  - an optional domain string or an array of domain strings for limiting the route to only requests with a matching host header field.Matching is done against the hostname part of the header only (excluding the port).Defaults to all hosts.*/
@@ -828,7 +828,7 @@ declare module "hapi" {
 	/** Route public interface When route information is returned or made available as a property.  http://hapijs.com/api#route-public-interface */
 	export interface IRoute {
 
-		
+
 		/** the route HTTP method. */
 		method: string;
 		/** the route path. */
@@ -853,8 +853,8 @@ declare module "hapi" {
 		artifacts - optional authentication artifacts.
 		reply.continue(result) - is called if authentication succeeded where:
 		result - same object as result above.
-		When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route. 
-		.If the err returned by the reply() method includes a message, no additional strategies will be attempted. 
+		When the scheme authenticate() method implementation calls reply() with an error condition, the specifics of the error affect whether additional authentication strategies will be attempted if configured for the route.
+		.If the err returned by the reply() method includes a message, no additional strategies will be attempted.
 		If the err does not include a message but does include a scheme name (e.g. Boom.unauthorized(null, 'Custom')), additional strategies will be attempted in order of preference.
 		var server = new Hapi.Server();
 		server.connection({ port: 80 });
@@ -1014,12 +1014,12 @@ declare module "hapi" {
 		generateKey?(args: any[]): string;
 	}
 	/** Request object
-	
+
 	The request object is created internally for each incoming request. It is different from the node.js request object received from the HTTP server callback (which is available in request.raw.req). The request object methods and properties change throughout the request lifecycle.
 	Request events
-	
+
 	The request object supports the following events:
-	
+
 	'peek' - emitted for each chunk of payload data read from the client connection. The event method signature is function(chunk, encoding).
 	'finish' - emitted when the request payload finished reading. The event method signature is function ().
 	'disconnect' - emitted when a request errors or aborts unexpectedly.
@@ -1027,25 +1027,25 @@ declare module "hapi" {
 	var Hapi = require('hapi');
 	var server = new Hapi.Server();
 	server.connection({ port: 80 });
-	
+
 	server.ext('onRequest', function (request, reply) {
-	
+
 	var hash = Crypto.createHash('sha1');
 	request.on('peek', function (chunk) {
-	
+
 	hash.update(chunk);
 	});
-	
+
 	request.once('finish', function () {
-	
+
 	console.log(hash.digest('hex'));
 	});
-	
+
 	request.once('disconnect', function () {
-	
+
 	console.error('request aborted');
 	});
-	
+
 	return reply.continue();
 	});*/
 	export class Request extends Events.EventEmitter {
@@ -1157,64 +1157,64 @@ declare module "hapi" {
 			slashes: any;
 		};
 		/** request.setUrl(url)
-		
+
 		Available only in 'onRequest' extension methods.
-		
+
 		Changes the request URI before the router begins processing the request where:
-		
+
 		url - the new request path value.
 		var Hapi = require('hapi');
 		var server = new Hapi.Server();
 		server.connection({ port: 80 });
-		
+
 		server.ext('onRequest', function (request, reply) {
-		
+
 		// Change all requests to '/test'
 		request.setUrl('/test');
 		return reply.continue();
 		});*/
 		setUrl(url: string): void;
 		/** request.setMethod(method)
-		
+
 		Available only in 'onRequest' extension methods.
-		
+
 		Changes the request method before the router begins processing the request where:
-		
+
 		method - is the request HTTP method (e.g. 'GET').
 		var Hapi = require('hapi');
 		var server = new Hapi.Server();
 		server.connection({ port: 80 });
-		
+
 		server.ext('onRequest', function (request, reply) {
-		
+
 		// Change all requests to 'GET'
 		request.setMethod('GET');
 		return reply.continue();
 		});*/
 		setMethod(method: string): void;
 		/** request.log(tags, [data, [timestamp]])
-		
+
 		Always available.
-		
+
 		Logs request-specific events. When called, the server emits a 'request' event which can be used by other listeners or plugins. The arguments are:
-		
+
 		data - an optional message string or object with the application data being logged.
 		timestamp - an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).
 		Any logs generated by the server internally will be emitted only on the 'request-internal' channel and will include the event.internal flag set to true.
-		
+
 		var Hapi = require('hapi');
 		var server = new Hapi.Server();
 		server.connection({ port: 80 });
-		
+
 		server.on('request', function (request, event, tags) {
-		
+
 		if (tags.error) {
 		console.log(event);
 		}
 		});
-		
+
 		var handler = function (request, reply) {
-		
+
 		request.log(['test', 'error'], 'Test event');
 		return reply();
 		};
@@ -1227,9 +1227,9 @@ declare module "hapi" {
 			/**  an optional timestamp expressed in milliseconds. Defaults to Date.now() (now).*/
 			timestamp?: number): void;
 		/** request.getLog([tags], [internal])
-		
+
 		Always available.
-		
+
 		Returns an array containing the events matching any of the tags specified (logical OR)
 		request.getLog();
 		request.getLog('error');
@@ -1244,38 +1244,38 @@ declare module "hapi" {
 			internal?: boolean): string[];
 
 		/** request.tail([name])
-		
+
 		Available until immediately after the 'response' event is emitted.
-		
+
 		Adds a request tail which has to complete before the request lifecycle is complete where:
-		
+
 		name - an optional tail name used for logging purposes.
 		Returns a tail function which must be called when the tail activity is completed.
-		
+
 		Tails are actions performed throughout the request lifecycle, but which may end after a response is sent back to the client. For example, a request may trigger a database update which should not delay sending back a response. However, it is still desirable to associate the activity with the request when logging it (or an error associated with it).
-		
+
 		When all tails completed, the server emits a 'tail' event.
-		
+
 		var Hapi = require('hapi');
 		var server = new Hapi.Server();
 		server.connection({ port: 80 });
-		
+
 		var get = function (request, reply) {
-		
+
 		var dbTail = request.tail('write to database');
-		
+
 		db.save('key', 'value', function () {
-		
+
 		dbTail();
 		});
-		
+
 		return reply('Success!');
 		};
-		
+
 		server.route({ method: 'GET', path: '/', handler: get });
-		
+
 		server.on('tail', function (request) {
-		
+
 		console.log('Request completed including db activity');
 		});*/
 		tail(
@@ -1283,34 +1283,34 @@ declare module "hapi" {
 			name?: string): Function;
 	}
 	/** Response events
-	
+
 	The response object supports the following events:
-	
+
 	'peek' - emitted for each chunk of data written back to the client connection. The event method signature is function(chunk, encoding).
 	'finish' - emitted when the response finished writing but before the client response connection is ended. The event method signature is function ().
 	var Crypto = require('crypto');
 	var Hapi = require('hapi');
 	var server = new Hapi.Server();
 	server.connection({ port: 80 });
-	
+
 	server.ext('onPreResponse', function (request, reply) {
-	
+
 	var response = request.response;
 	if (response.isBoom) {
 	return reply();
 	}
-	
+
 	var hash = Crypto.createHash('sha1');
 	response.on('peek', function (chunk) {
-	
+
 	hash.update(chunk);
 	});
-	
+
 	response.once('finish', function () {
-	
+
 	console.log(hash.digest('hex'));
 	});
-	
+
 	return reply.continue();
 	});*/
 	export class Response extends Events.EventEmitter {
@@ -1412,7 +1412,7 @@ declare module "hapi" {
 
 
 	/** Server http://hapijs.com/api#server
-	rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080). 
+	rver object is the main application container. The server manages all incoming connections along with all the facilities provided by the framework. A server can contain more than one connection (e.g. listen to port 80 and 8080).
 	Server events
 	The server object inherits from Events.EventEmitter and emits the following events:
 	'log' - events logged with server.log() and server events generated internally by the framework.
@@ -1443,7 +1443,7 @@ declare module "hapi" {
 		// server.connections.length === 2
 		var a = server.select('a');
 		// a.connections.length === 1*/
-		connections: Array<ISeverConnectionOptions>;
+		connections: Array<IServerConnectionOptions>;
 		/** When the server contains exactly one connection, info is an object containing information about the sole connection.
 		* When the server contains more than one connection, each server.connections array member provides its own connection.info.
 		var server = new Hapi.Server();
@@ -1734,7 +1734,7 @@ declare module "hapi" {
 		cache(options: ICatBoxCacheOptions): void;
 
 		/** server.connection([options])
-		Adds an incoming server connection 
+		Adds an incoming server connection
 		Returns a server object with the new connection selected.
 		Must be called before any other server method that modifies connections is called for it to apply to the new connection (e.g. server.state()).
 		Note that the options object is deeply cloned (with the exception of listener which is shallowly copied) and cannot contain any values that are unsafe to perform deep copy on.
@@ -1745,7 +1745,7 @@ declare module "hapi" {
 		// server.connections.length === 2
 		// web.connections.length === 1
 		// admin.connections.length === 1 */
-		connection(options: ISeverConnectionOptions): Server;
+		connection(options: IServerConnectionOptions): Server;
 		/** server.decorate(type, property, method)
 		Extends various framework interfaces with custom methods where:
 		type - the interface being decorated. Supported types:
@@ -1872,8 +1872,8 @@ declare module "hapi" {
 		};
 		server.handler('test', handler);*/
 		handler<THandlerConfig>(name: string, method: (route: IRoute, options: THandlerConfig) => ISessionHandler): void;
-		/** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection. 
-		Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack. 
+		/** When the server contains exactly one connection, injects a request into the sole connection simulating an incoming HTTP request without making an actual socket connection.
+		Injection is useful for testing purposes as well as for invoking routing logic internally without the overhead or limitations of the network stack.
 		Utilizes the [shot module | https://github.com/hapijs/shot ] for performing injections, with some additional options and response properties
 		* When the server contains more than one connection, each server.connections array member provides its own connection.inject().
 		var Hapi = require('hapi');
@@ -2209,4 +2209,4 @@ declare module "hapi" {
 		views(options: IServerViewsConfiguration): void;
 
 	}
-}
\ No newline at end of file
+}
diff --git a/highcharts/highcharts-tests.ts b/highcharts/highcharts-tests.ts
index 464f536d99..9918df9535 100644
--- a/highcharts/highcharts-tests.ts
+++ b/highcharts/highcharts-tests.ts
@@ -23,10 +23,10 @@ var animate: HighchartsAnimation = {
 
 var gradient: HighchartsGradient = {
     linearGradient: {
-        x0: 0,
-        y0: 0,
-        x1: 500,
-        y1: 500
+        x1: 0,
+        y1: 0,
+        x2: 500,
+        y2: 500
     },
     stops: [
         [0, 'rgb(255, 255, 255)'],
@@ -136,4 +136,4 @@ var highChartSettings: HighchartsOptions = {
 
 var container = $("#container").highcharts(highChartSettings, (chart) => {
     chart.series[0].setVisible(true, true);
-});
\ No newline at end of file
+});
diff --git a/highcharts/highcharts.d.ts b/highcharts/highcharts.d.ts
index 584d61c9ba..9bda29782d 100644
--- a/highcharts/highcharts.d.ts
+++ b/highcharts/highcharts.d.ts
@@ -166,7 +166,7 @@ interface HighchartsChartEvents {
 
 interface HighchartsGradient {
     linearGradient?: {
-        x0: number; y0: number; x1: number; y1: number;
+        x1: number; y1: number; x2: number; y2: number;
     };
     radialGradient?: {
         cx: number; cy: number; r: number;
diff --git a/i18next/i18next.d.ts b/i18next/i18next.d.ts
index f390954591..3d24c9b967 100644
--- a/i18next/i18next.d.ts
+++ b/i18next/i18next.d.ts
@@ -23,7 +23,7 @@ interface I18nextOptions {
     preload?: string[];                     // Default value: []
     lowerCaseLng?: boolean;                    // Default value: false
     returnObjectTrees?: boolean;               // Default value: false
-    fallbackLng?: string;                   // Default value: 'dev'
+    fallbackLng?: string|boolean;           // Default value: 'dev'
     detectLngQS?: string;                   // Default value: 'setLng'
     ns?: any;                               // Default value: 'translation' (string), can also be an object
     nsseparator?: string;                   // Default value: '::'
@@ -135,4 +135,4 @@ declare module 'i18next' {
 
 declare module 'i18next-client' {
     export = i18n;
-}
\ No newline at end of file
+}
diff --git a/jasmine/jasmine.d.ts b/jasmine/jasmine.d.ts
index 13160c4d2d..40b26ebced 100644
--- a/jasmine/jasmine.d.ts
+++ b/jasmine/jasmine.d.ts
@@ -296,7 +296,7 @@ declare module jasmine {
         toContainHtml(expected: string): boolean;
         toContainText(expected: string): boolean;
         toThrow(expected?: any): boolean;
-        toThrowError(expected?: any): boolean;
+        toThrowError(expected?: any, message?: string): boolean;
         not: Matchers;
 
         Any: Any;
diff --git a/jquery-validation-unobtrusive/jquery-validation-unobtrusive-tests.ts b/jquery-validation-unobtrusive/jquery-validation-unobtrusive-tests.ts
new file mode 100644
index 0000000000..96ccbe325a
--- /dev/null
+++ b/jquery-validation-unobtrusive/jquery-validation-unobtrusive-tests.ts
@@ -0,0 +1,62 @@
+/// <reference path="jquery-validation-unobtrusive.d.ts" />
+
+// Test overloads for `add` method
+$.validator.unobtrusive.adapters.add("adapter", () => { });
+$.validator.unobtrusive.adapters.add("adapter", function () {
+    return true;
+});
+$.validator.unobtrusive.adapters.add("adapter", ["param1", "param2"], () => { });
+
+// Test overloads for `addMinMax` method
+$.validator.unobtrusive.adapters.addMinMax("adapter", "minRule", "maxRule", "minMaxRule");
+$.validator.unobtrusive.adapters.addMinMax("adapter", "minRule", "maxRule", "minMaxRule", "minAttr");
+$.validator.unobtrusive.adapters.addMinMax("adapter", "minRule", "maxRule", "minMaxRule", "minAttr", "maxAttr");
+
+// Test overloads for `addSingleVal` method
+$.validator.unobtrusive.adapters.addSingleVal("adapter", "rule");
+$.validator.unobtrusive.adapters.addSingleVal("adapter", "attr", "rule");
+
+// Test overloads for `addBool` method
+$.validator.unobtrusive.adapters.addBool("adapter");
+$.validator.unobtrusive.adapters.addBool("adapter", "rule");
+
+// Test `addMethod`
+$.validator.unobtrusive.adapters.addMethod("adapter", (value, element, params) => {
+    return true;
+});
+
+// Test method chaining
+$.validator.unobtrusive.adapters
+    .add("required", () => { })
+    .addMinMax("length", "minlength", "maxlength", "rangelength")
+    .addSingleVal("regex", "pattern")
+    .addBool("url")
+    .addMethod("nonalphamin", (value, element, nonalphamin) => {
+        return null;
+    });
+
+// Test `Adapters` indexer
+var adapterName = $.validator.unobtrusive.adapters[0].name;
+
+// Test `Adapters` iterator
+$.each($.validator.unobtrusive.adapters, function (index, adapter) {
+    console.log(adapter.name);
+    console.log(adapter.params);
+    console.log(adapter.adapt);
+});
+
+// Test `Adapters` array
+$.validator.unobtrusive.adapters.push({ name: "adapter", params: ["param1"], adapt: () => { } });
+
+// Test overloads for `parseElement`
+$.validator.unobtrusive.parseElement("form");
+$.validator.unobtrusive.parseElement(document);
+$.validator.unobtrusive.parseElement(document.getElementById("the-form"));
+$.validator.unobtrusive.parseElement($("#the-form"));
+$.validator.unobtrusive.parseElement($("#the-form"), true);
+
+// Test overloads for `parse`
+$.validator.unobtrusive.parse("form");
+$.validator.unobtrusive.parse(document);
+$.validator.unobtrusive.parse(document.getElementById("the-form"));
+$.validator.unobtrusive.parse($("#the-form"));
diff --git a/jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts b/jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts
new file mode 100644
index 0000000000..f14b589139
--- /dev/null
+++ b/jquery-validation-unobtrusive/jquery-validation-unobtrusive.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for Microsoft jQuery Unobtrusive Validation v3.2.3
+// Project: http://aspnetwebstack.codeplex.com/
+// Definitions by: Matt Brooks <https://github.com/EnableSoftware>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../jquery.validation/jquery.validation.d.ts" />
+
+declare module MicrosoftJQueryUnobtrusiveValidation {
+    type JQuerySelector = string | Document | Element | JQuery;
+
+    interface Adapter {
+        name: string;
+        params: string[];
+        adapt: Function
+    }
+
+    interface Adapters extends Array<Adapter> {
+        add(adapterName: string, fn: Function): Adapters;
+        add(adapterName: string, params: string[], fn: Function): Adapters;
+        addMinMax(adapterName: string, minRuleName: string, maxRuleName: string, minMaxRuleName: string, minAttribute?: string, maxAttribute?: string): Adapters;
+        addSingleVal(adapterName: string, ruleName: string): Adapters;
+        addSingleVal(adapterName: string, attribute: string, ruleName: string): Adapters;
+        addBool(adapterName: string, ruleName?: string): Adapters;
+        addMethod(adapterName: string, fn: (value: string, element: Element, params: any) => any): Adapters;
+    }
+
+    interface Validator {
+        adapters: Adapters;
+        parseElement(element: JQuerySelector, skipAttach?: boolean): void;
+        parse(selector: JQuerySelector): void;
+    }
+}
+
+declare module JQueryValidation {
+    interface ValidatorStatic {
+        unobtrusive: MicrosoftJQueryUnobtrusiveValidation.Validator;
+    }
+}
diff --git a/jquery.autosize/jquery.autosize-tests.ts b/jquery.autosize/jquery.autosize-tests.ts
new file mode 100755
index 0000000000..df4aef5b24
--- /dev/null
+++ b/jquery.autosize/jquery.autosize-tests.ts
@@ -0,0 +1,13 @@
+/// <reference path="jquery.autosize.d.ts" />
+
+// from a NodeList
+autosize(document.querySelectorAll('textarea'));
+
+// from a single Node
+autosize(document.querySelector('textarea'));
+
+// from a jQuery collection
+autosize($('textarea'));
+
+// from a single element
+autosize(document.getElementById('my-textarea'));
\ No newline at end of file
diff --git a/jquery.autosize/jquery.autosize.d.ts b/jquery.autosize/jquery.autosize.d.ts
index 5b9f9adfb3..508677b4a1 100644
--- a/jquery.autosize/jquery.autosize.d.ts
+++ b/jquery.autosize/jquery.autosize.d.ts
@@ -1,21 +1,19 @@
-// Type definitions for jquery.autosize (un-versioned)
+// Type definitions for jquery.autosize 3.0.7
 // Project: http://www.jacklmoore.com/autosize/
 // Definitions by: Aaron T. King <https://github.com/kingdango>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 /// <reference path="../jquery/jquery.d.ts" />
-
-interface AutosizeOptions {
-	className?: string;
-	append?: string;
-	callback?: Function;
+declare module autosize {
+    interface AutosizeStatic {
+        (el: Element): void;
+        (el: NodeList): void;
+        (el: JQuery): void;
+    }
 }
 
-interface Autosize {
-	(): JQuery;
-	(options: AutosizeOptions): JQuery;
-}
+declare var autosize: autosize.AutosizeStatic;
 
-interface JQuery {
-	autosize: Autosize;
-}
\ No newline at end of file
+declare module 'autosize' {
+    export = autosize;
+}
diff --git a/jquery.fileupload/jquery.fileupload.d.ts b/jquery.fileupload/jquery.fileupload.d.ts
index 0ac8b98f96..3774cb6e1c 100644
--- a/jquery.fileupload/jquery.fileupload.d.ts
+++ b/jquery.fileupload/jquery.fileupload.d.ts
@@ -5,7 +5,6 @@
 
 /// <reference path="../jquery/jquery.d.ts"/>
 
-
 // Interface options for the plugin 
 interface JQueryFileInputOptions {
 
@@ -152,13 +151,15 @@ interface JQueryFileInputOptions {
 
 }
 
-interface JQueryFileUpload {
-
+interface JQueryFileUpload extends JQuery  {
     contentType:string;
 }
 
-interface JQuery
-{
+interface JQuery {
     // Interface to the main method of jQuery File Upload
     fileupload(settings: JQueryFileInputOptions): JQueryFileUpload;
-}
\ No newline at end of file
+}
+
+interface JQuerySupport {
+    fileInput?: boolean;
+}
diff --git a/jquery.pjax/jquery.pjax.d.ts b/jquery.pjax/jquery.pjax.d.ts
index a3abee6488..1bd465b1ee 100644
--- a/jquery.pjax/jquery.pjax.d.ts
+++ b/jquery.pjax/jquery.pjax.d.ts
@@ -32,6 +32,11 @@ interface PjaxSettings extends JQueryAjaxSettings {
      * Whether to replaceState the URL. Defaults to false.
      */
     replace?: boolean;
+    
+    /**
+     * How many requests to cache. Defaults to 20.
+     */
+     maxCacheLength?: number;
 }
 
 interface JQuery {
diff --git a/jquery/jquery-tests.ts b/jquery/jquery-tests.ts
index 3853a8d5f9..1a9a6dd269 100644
--- a/jquery/jquery-tests.ts
+++ b/jquery/jquery-tests.ts
@@ -119,6 +119,11 @@ function test_ajax() {
     }).done(function (msg) {
         alert("Data Saved: " + msg);
     });
+    $.ajax({
+        method: "POST",
+        url: "some.php",
+        data: { name: "John", location: "Boston" }
+    });
     $.ajax({
         url: "test.html",
         cache: false
diff --git a/jquery/jquery.d.ts b/jquery/jquery.d.ts
index 465323931b..dc5c4ebb68 100644
--- a/jquery/jquery.d.ts
+++ b/jquery/jquery.d.ts
@@ -105,6 +105,10 @@ interface JQueryAjaxSettings {
      * Specify the callback function name for a JSONP request. This value will be used instead of the random name automatically generated by jQuery. It is preferable to let jQuery generate a unique name as it'll make it easier to manage the requests and provide callbacks and error handling. You may want to specify the callback when you want to enable better browser caching of GET requests. As of jQuery 1.5, you can also use a function for this setting, in which case the value of jsonpCallback is set to the return value of that function.
      */
     jsonpCallback?: any;
+    /**
+     * The HTTP method to use for the request (e.g. "POST", "GET", "PUT"). (version added: 1.9.0)
+     */
+    method?: string;
     /**
      * A mime type to override the XHR mime type. (version added: 1.5.1)
      */
diff --git a/jqueryui/jqueryui.d.ts b/jqueryui/jqueryui.d.ts
index 26e2d6cdcb..10a4e7159c 100644
--- a/jqueryui/jqueryui.d.ts
+++ b/jqueryui/jqueryui.d.ts
@@ -507,7 +507,7 @@ declare module JQueryUI {
 
     interface ProgressbarOptions {
         disabled?: boolean;
-        value?: number;
+        value?: number | boolean;
     }
 
     interface ProgressbarUIParams {
diff --git a/karma/karma-tests.ts b/karma/karma-tests.ts
new file mode 100644
index 0000000000..b70e7273be
--- /dev/null
+++ b/karma/karma-tests.ts
@@ -0,0 +1,26 @@
+/// <reference path="karma.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import gulp = require('gulp');
+import karma = require('karma');
+
+function runKarma(singleRun: boolean): void {
+  karma.server.start({
+    configFile: __dirname + '/karma.conf.js',
+    singleRun: singleRun
+  });
+}
+
+gulp.task('test:unit:karma', ['build:test:unit'], () => runKarma(true));
+
+
+karma.server.start({port: 9876}, (exitCode) => {
+  console.log('Karma has exited with ' + exitCode);
+  process.exit(exitCode);
+});
+
+
+karma.runner.run({port: 9876}, (exitCode) => {
+  console.log('Karma has exited with ' + exitCode);
+  process.exit(exitCode);
+});
diff --git a/karma/karma.d.ts b/karma/karma.d.ts
new file mode 100644
index 0000000000..c66e6fe06a
--- /dev/null
+++ b/karma/karma.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for karma v0.12.37
+// Project: https://github.com/karma-runner/karma
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module 'karma' {
+    // See Karma public API https://karma-runner.github.io/0.12/dev/public-api.html
+
+    interface IKarmaServer {
+        start(options?: any, callback?: (exitCode: number) => void): void;
+    }
+
+    interface IKarmaRunner {
+        run(options?: any, callback?: (exitCode: number) => void): void;
+    }
+
+    interface IKarma {
+        server: IKarmaServer;
+        runner: IKarmaRunner;
+    }
+
+    var karma: IKarma;
+    export = karma;
+}
diff --git a/knex/knex-test.ts b/knex/knex-test.ts
index 39b441d6b0..d15786736d 100644
--- a/knex/knex-test.ts
+++ b/knex/knex-test.ts
@@ -198,6 +198,7 @@ knex('books').insert({title: 'Slaughterhouse Five'});
 knex('coords').insert([{x: 20}, {y: 30},  {x: 10, y: 20}]);
 
 knex.insert([{title: 'Great Gatsby'}, {title: 'Fahrenheit 451'}], 'id').into('books');
+knex.insert([{title: 'Great Gatsby'}, {title: 'Fahrenheit 451'}], ['id', 'title']).into('books');
 
 knex('books')
   .returning('id')
@@ -207,17 +208,20 @@ knex('books')
   .returning('id')
   .insert([{title: 'Great Gatsby'}, {title: 'Fahrenheit 451'}]);
 
-knex('books')
-  .where('published_date', '<', 2000)
-  .update({
-    status: 'archived'
-  });
+knex('books').where('published_date', '<', 2000).update({status: 'archived'});
+knex('books').where('published_date', '<', 2000).update({status: 'archived'}, 'id');
+knex('books').where('published_date', '<', 2000).update({status: 'archived'}, ['id', 'title']);
 
 knex('books').update('title', 'Slaughterhouse Five');
+knex('books').update('title', 'Slaughterhouse Five', 'id');
+knex('books').update('title', 'Slaughterhouse Five', ['id', 'title']);
 
-knex('accounts')
-  .where('activated', false)
-  .del();
+knex('accounts').where('activated', false).del();
+knex('accounts').where('activated', false).del('id');
+knex('accounts').where('activated', false).del(['id', 'title']);
+knex('accounts').where('activated', false).delete();
+knex('accounts').where('activated', false).delete('id');
+knex('accounts').where('activated', false).delete(['id', 'title']);
 
 var someExternalMethod: Function;
 
diff --git a/knex/knex.d.ts b/knex/knex.d.ts
index c4408aecb3..5300cd3c47 100644
--- a/knex/knex.d.ts
+++ b/knex/knex.d.ts
@@ -131,13 +131,13 @@ declare module "knex" {
     debug(enabled?: boolean): QueryBuilder;
     pluck(column: string): QueryBuilder;
 
-    insert(data: any, returning?: string): QueryBuilder;
-    update(data: any, returning?: string): QueryBuilder;
-    update(columnName: string, value: Value, returning?: string): QueryBuilder;
+    insert(data: any, returning?: string | string[]): QueryBuilder;
+    update(data: any, returning?: string | string[]): QueryBuilder;
+    update(columnName: string, value: Value, returning?: string | string[]): QueryBuilder;
     returning(column: string): QueryBuilder;
 
-    del(returning?: string): QueryBuilder;
-    delete(returning?: string): QueryBuilder;
+    del(returning?: string | string[]): QueryBuilder;
+    delete(returning?: string | string[]): QueryBuilder;
     truncate(): QueryBuilder;
 
     transacting(trx: Transaction): QueryBuilder;
diff --git a/kue/kue-tests.ts b/kue/kue-tests.ts
new file mode 100644
index 0000000000..0a990ee7b1
--- /dev/null
+++ b/kue/kue-tests.ts
@@ -0,0 +1,96 @@
+/// <reference path="../node/node.d.ts" />
+/// <reference path="kue.d.ts" />
+
+import kue = require('kue');
+
+// create our job queue
+
+var jobs = kue.createQueue();
+
+// start redis with $ redis-server
+
+// create some jobs at random,
+// usually you would create these
+// in your http processes upon
+// user input etc.
+
+function create() {
+  var name = [ 'tobi', 'loki', 'jane', 'manny' ][ Math.random() * 4 | 0 ];
+  var job  = jobs.create( 'video conversion', {
+    title: 'converting ' + name + '\'s to avi', user: 1, frames: 200
+  });
+
+  job.on('complete', function() {
+    console.log(" Job complete");
+  }).on('failed', function() {
+    console.log(" Job failed");
+  }).on('progress', function(progress: number) {
+    process.stdout.write('\r  job #' + job.id + ' ' + progress + '% complete');
+  });
+
+  job.save();
+
+  setTimeout( create, Math.random() * 2000 | 0 );
+}
+
+create();
+
+// process video conversion jobs, 1 at a time.
+
+jobs.process('video conversion', 1, function(job: kue.Job, done: Function) {
+  var frames: number = job.data.frames;
+
+  function next(i: number) {
+    // pretend we are doing some work
+    convertFrame(i, function(err: Error) {
+      if (err) return done(err);
+      // report progress, i/frames complete
+      job.progress(i, frames);
+      if (i >= frames) done();
+      else next(i + Math.random() * 10);
+    } );
+  }
+
+  next(0);
+} );
+
+function convertFrame(i: number, fn: Function) {
+  setTimeout(fn, Math.random() * 50);
+}
+
+// one minute
+
+var minute = 60000;
+
+var email = jobs.create('email', {
+  title: 'Account renewal required', to: 'tj@learnboost.com', template: 'renewal-email'
+}).delay(minute)
+  .priority('high')
+  .save();
+
+
+email.on('promotion', function() {
+  console.log('renewal job promoted');
+} );
+
+email.on('complete', function() {
+  console.log('renewal job completed' );
+} );
+
+jobs.create('email', {
+  title: 'Account expired', to: 'tj@learnboost.com', template: 'expired-email'
+} ).delay( minute * 10 )
+  .priority('high')
+  .save();
+
+jobs.promote();
+
+jobs.process('email', 10, function(job: kue.Job, done: Function) {
+  setTimeout(function() {
+    done();
+  }, Math.random() * 5000);
+});
+
+// start the UI
+kue.app.listen(3000);
+console.log('UI started on port 3000');
\ No newline at end of file
diff --git a/kue/kue.d.ts b/kue/kue.d.ts
new file mode 100644
index 0000000000..1b3fff2277
--- /dev/null
+++ b/kue/kue.d.ts
@@ -0,0 +1,149 @@
+// Type definitions for kue 0.9.x
+// Project: https://github.com/Automattic/kue
+// Definitions by: Nicholas Penree <http://github.com/drudge>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+/// <reference path="../redis/redis.d.ts" />
+/// <reference path="../express/express.d.ts" />
+
+declare module "kue" {
+  import events = require('events');
+  import express = require('express');
+  import redis = require('redis');
+
+  export class Queue extends events.EventEmitter {
+    name: string;
+    id: string;
+    promoter: any;
+    workers: Worker[];
+    shuttingDown: boolean;
+    client: redis.RedisClient;
+    testMode: TestMode;
+
+    static singleton: Queue;
+
+    constructor(options: Object);
+    create(type: string, data: Object): Job;
+    createJob(type: string, data: Object): Job;
+    promote(ms?: number): void;
+    setupTimer(): void;
+    checkJobPromotion(ms: number): void;
+    checkActiveJobTtl(ttlOptions: Object): void;
+    watchStuckJobs(ms: number): void;
+    setting(name: string, fn: Function): Queue;
+    process(type: string, n?: number, fn?: Function): void;
+    shutdown(timeout: number, type: string, fn: Function): Queue;
+    types(fn: Function): Queue;
+    state(string: string, fn: Function): Queue;
+    workTime(fn: Function): Queue;
+    cardByType(type: string, state: string, fn: Function): Queue;
+    card(state: string, fn: Function): Queue;
+    complete(fn: Function): Queue;
+    failed(fn: Function): Queue;
+    inactive(fn: Function): Queue;
+    active(fn: Function): Queue;
+    delayed(fn: Function): Queue;
+    completeCount(type: string, fn: Function): Queue;
+    failedCount(type: string, fn: Function): Queue;
+    inactiveCount(type: string, fn: Function): Queue;
+    activeCount(type: string, fn: Function): Queue;
+    delayedCount(type: string, fn: Function): Queue;
+  }
+
+  interface Priorities {
+    low: number;
+    normal: number;
+    medium: number;
+    high: number;
+    critical: number;
+  }
+
+  export class Job extends events.EventEmitter {
+    public id: number;
+    public type: string;
+    public data: any;
+    public client: redis.RedisClient;
+    private _max_attempts;
+
+    static priorities: Priorities;
+    static disableSearch: boolean;
+    static jobEvents: boolean;
+    static get(id: number, fn: Function): void;
+    static remove(id: number, fn?: Function): void;
+    static removeBadJob(id: number): void;
+    static log(id: number, fn: Function): void;
+    static range(from: number, to: number, order: string, fn: Function): void;
+    static rangeByState(state: string, from: number, to: number, order: string, fn: Function): void;
+    static rangeByType(type: string, state: string, from: number, to: number, order: string, fn: Function): void;
+
+    constructor(type: string, data?: any);
+    toJSON(): Object;
+    log(str: string): Job;
+    set(key: string, val: string, fn?: Function): Job;
+    get(key: string, fn?: Function): Job;
+    progress(complete: number, total: number, data?: any): Job;
+    delay(ms:number|Date): Job;
+    removeOnComplete(param: any): void;
+    backoff(param: any): void;
+    ttl(param: any): void;
+    private _getBackoffImpl(): void;
+    priority(level: string|number): Job;
+    attempt(fn: Function): Job;
+    reattempt(attempt: number, fn?: Function): void;
+    attempts(n: number): Job;
+    searchKeys(keys: string[]|string): Job;
+    remove(fn?: Function): Job;
+    state(state: string, fn?: Function): Job;
+    error(err: Error): Job;
+    complete(fn?: Function): Job;
+    failed(fn?: Function): Job;
+    inactive(fn?: Function): Job;
+    active(fn?: Function): Job;
+    delayed(fn?: Function): Job;
+    save(fn?: Function): Job;
+    update(fn?: Function): Job;
+    subscribe(fn?: Function): Job;
+  }
+
+  class Worker extends events.EventEmitter {
+    queue: Queue;
+    type: string;
+    client: redis.RedisClient;
+    job: Job;
+
+    constructor(queue: Queue, type: string);
+    start(fn: Function): Worker;
+    error(err: Error, job: Job): Worker;
+    failed(job: Job, theErr: Object, fn?: Function): Worker;
+    process(job: Job, fn: Function): Worker;
+    private zpop(key: string, fn: Function): void;
+    private getJob(fn: Function): void;
+    idle(): Worker;
+    shutdown(timeout: number, fn: Function): void;
+    emitJobEvent(event: Object, job: Job, arg1: any, arg2: any): void;
+    resume(): boolean;
+  }
+
+  interface Redis {
+    configureFactory(options: Object, queue: Queue): void;
+    createClient(): redis.RedisClient;
+    createClientFactory(options: Object): redis.RedisClient;
+    client(): redis.RedisClient;
+    pubsubClient(): redis.RedisClient;
+    reset(): void;
+  }
+
+  interface TestMode {
+    jobs: Job[];
+    enter(): void;
+    exit(): void;
+    clear(): void;
+  }
+
+  export var app: express.Application;
+  export var redis: Redis;
+  export var workers: Worker[];
+
+  export function createQueue(options?: Object): Queue;
+}
\ No newline at end of file
diff --git a/lodash/lodash-tests.ts b/lodash/lodash-tests.ts
index c7e6bf0241..3a1c51f183 100644
--- a/lodash/lodash-tests.ts
+++ b/lodash/lodash-tests.ts
@@ -239,14 +239,18 @@ result = <number[]>_([1, 2, 3]).take(function (num) {
 result = <IFoodOrganic[]>_(foodsOrganic).take('organic').value();
 result = <IFoodType[]>_(foodsType).take({ 'type': 'fruit' }).value();
 
-result = <number[]>_.flatten([1, [2], [3, [[4]]]]);
-result = <any[]>_.flatten([1, [2], [3, [[4]]]], true);
-var result: any
-result = <string[]>_.flatten(stoogesQuotes, 'quotes');
+result = <Array<number>>_.flatten([[1, 2], [3, 4]]);
+result = <Array<number>>_.flatten([[1, 2], [3, 4], 5, 6]);
+result = <Array<number|Array<Array<number>>>>_.flatten([1, [2], [3, [[4]]]]);
+
+result = <Array<number>>_.flatten([1, [2], [[3]]], true);
+result = <Array<number>>_.flatten<number>([1, [2], [3, [[4]]]], true);
+result = <Array<number|boolean>>_.flatten<number|boolean>([1, [2], [3, [[false]]]], true);
+
+result = <_.LoDashArrayWrapper<number>>_([[1, 2], [3, 4], 5, 6]).flatten();
+result = <_.LoDashArrayWrapper<number|Array<Array<number>>>>_([1, [2], [3, [[4]]]]).flatten();
 
-result = <_.LoDashArrayWrapper<number>>_([1, [2], [3, [[4]]]]).flatten();
 result = <_.LoDashArrayWrapper<number>>_([1, [2], [3, [[4]]]]).flatten(true);
-result = <_.LoDashArrayWrapper<string>>_(stoogesQuotes).flatten('quotes');
 
 result = <number>_.indexOf([1, 2, 3, 1, 2, 3], 2);
 result = <number>_.indexOf([1, 2, 3, 1, 2, 3], 2, 3);
@@ -363,14 +367,19 @@ result = <string[]>_.at(['moe', 'larry', 'curly'], 0, 2);
 
 result = <boolean>_.contains([1, 2, 3], 1);
 result = <boolean>_.contains([1, 2, 3], 1, 2);
-result = <boolean>_.contains({ 'name': 'moe', 'age': 40 }, 'moe');
+result = <boolean>_.contains({ 'moe': 30, 'larry': 40, 'curly': 67 }, 40);
 result = <boolean>_.contains('curly', 'ur');
 
 result = <boolean>_.include([1, 2, 3], 1);
 result = <boolean>_.include([1, 2, 3], 1, 2);
-result = <boolean>_.include({ 'name': 'moe', 'age': 40 }, 'moe');
+result = <boolean>_.include({ 'moe': 30, 'larry': 40, 'curly': 67 }, 40);
 result = <boolean>_.include('curly', 'ur');
 
+result = <boolean>_.includes([1, 2, 3], 1);
+result = <boolean>_.includes([1, 2, 3], 1, 2);
+result = <boolean>_.includes({ 'moe': 30, 'larry': 40, 'curly': 67 }, 40);
+result = <boolean>_.includes('curly', 'ur');
+
 result = <_.Dictionary<number>>_.countBy([4.3, 6.1, 6.4], function (num) { return Math.floor(num); });
 result = <_.Dictionary<number>>_.countBy([4.3, 6.1, 6.4], function (num) { return this.floor(num); }, Math);
 result = <_.Dictionary<number>>_.countBy(['one', 'two', 'three'], 'length');
diff --git a/lodash/lodash.d.ts b/lodash/lodash.d.ts
index b4eaf75091..fcf4685770 100644
--- a/lodash/lodash.d.ts
+++ b/lodash/lodash.d.ts
@@ -769,171 +769,40 @@ declare module _ {
         take<W>(whereValue: W): LoDashArrayWrapper<T>;
     }
 
+    interface MaybeNestedList<T> extends List<T|List<T>> { }
+    interface RecursiveList<T> extends List<T|RecursiveList<T>> { }
+
     //_.flatten
     interface LoDashStatic {
         /**
-        * Flattens a nested array (the nesting can be to any depth). If isShallow is truey, the
-        * array will only be flattened a single level. If a callback is provided each element of
-        * the array is passed through the callback before flattening. The callback is bound to
-        * thisArg and invoked with three arguments; (value, index, array).
-        *
-        * If a property name is provided for callback the created "_.pluck" style callback will
-        * return the property value of the given element.
-        *
-        * If an object is provided for callback the created "_.where" style callback will return
-        * true for elements that have the properties of the given object, else false.
-        * @param array The array to flatten.
-        * @param shallow If true then only flatten one level, optional, default = false.
-        * @return `array` flattened.
-        **/
-        flatten<T>(array: Array<any>, isShallow?: boolean): T[];
+         * Flattens a nested array.
+         *
+         * @param array The array to flatten.
+         * @return `array` flattened.
+         **/
+        flatten<T>(array: MaybeNestedList<T>): T[];
 
         /**
-        * @see _.flatten
-        **/
-        flatten<T>(array: List<any>, isShallow?: boolean): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<T>(
-            array: Array<any>,
-            isShallow: boolean,
-            callback: ListIterator<any, T>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<T>(
-            array: List<any>,
-            isShallow: boolean,
-            callback: ListIterator<any, T>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<T>(
-            array: Array<any>,
-            callback: ListIterator<any, T>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<T>(
-            array: List<any>,
-            callback: ListIterator<any, T>,
-            thisArg?: any): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<W, T>(
-            array: Array<any>,
-            isShallow: boolean,
-            whereValue: W): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<W, T>(
-            array: List<any>,
-            isShallow: boolean,
-            whereValue: W): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<W, T>(
-            array: Array<any>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<W, T>(
-            array: List<any>,
-            whereValue: W): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<T>(
-            array: Array<any>,
-            isShallow: boolean,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<T>(
-            array: List<any>,
-            isShallow: boolean,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<T>(
-            array: Array<any>,
-            pluckValue: string): T[];
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<T>(
-            array: List<any>,
-            pluckValue: string): T[];
+         * Flattens a nested array. If isDeep is true the array is recursively flattened, otherwise it is only
+         * flattened a single level.
+         *
+         * @param array The array to flatten.
+         * @param deep Specify a deep flatten.
+         * @return `array` flattened.
+         **/
+        flatten<T>(array: RecursiveList<T>, isDeep: boolean): List<T> | RecursiveList<T>;
     }
 
     interface LoDashArrayWrapper<T> {
         /**
-        * @see _.flatten
-        **/
-        flatten<Flat>(isShallow?: boolean): LoDashArrayWrapper<Flat>;
+         * @see _.flatten
+         **/
+        flatten<T>(): LoDashArrayWrapper<any>;
 
         /**
         * @see _.flatten
         **/
-        flatten<Flat>(
-            isShallow: boolean,
-            callback: ListIterator<T, Flat>,
-            thisArg?: any): LoDashArrayWrapper<Flat>;
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<Flat>(
-            callback: ListIterator<T, Flat>,
-            thisArg?: any): LoDashArrayWrapper<Flat>;
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<Flat>(
-            isShallow: boolean,
-            pluckValue: string): LoDashArrayWrapper<Flat>;
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<Flat>(
-            pluckValue: string): LoDashArrayWrapper<Flat>;
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<Flat, W>(
-            isShallow: boolean,
-            whereValue: W): LoDashArrayWrapper<Flat>;
-
-        /**
-        * @see _.flatten
-        **/
-        flatten<Flat, W>(
-            whereValue: W): LoDashArrayWrapper<Flat>;
+        flatten<T>(isShallow: boolean): LoDashArrayWrapper<any>;
     }
 
     //_.indexOf
@@ -2198,11 +2067,11 @@ declare module _ {
         /**
         * @see _.contains
         * @param dictionary The dictionary to iterate over.
-        * @param key The key in the dictionary to search for.
+        * @param value The value in the dictionary to search for.
         **/
         contains<T>(
             dictionary: Dictionary<T>,
-            key: string,
+            value: T,
             fromIndex?: number): boolean;
 
         /**
@@ -2236,7 +2105,7 @@ declare module _ {
         **/
         include<T>(
             dictionary: Dictionary<T>,
-            key: string,
+            value: T,
             fromIndex?: number): boolean;
 
         /**
@@ -2246,6 +2115,38 @@ declare module _ {
             searchString: string,
             targetString: string,
             fromIndex?: number): boolean;
+
+        /**
+        * @see _.contains
+        **/
+        includes<T>(
+            collection: Array<T>,
+            target: T,
+            fromIndex?: number): boolean;
+
+        /**
+        * @see _.contains
+        **/
+        includes<T>(
+            collection: List<T>,
+            target: T,
+            fromIndex?: number): boolean;
+
+        /**
+        * @see _.contains
+        **/
+        includes<T>(
+            dictionary: Dictionary<T>,
+            value: T,
+            fromIndex?: number): boolean;
+
+        /**
+        * @see _.contains
+        **/
+        includes(
+            searchString: string,
+            targetString: string,
+            fromIndex?: number): boolean;
     }
 
     //_.countBy
@@ -2494,6 +2395,25 @@ declare module _ {
             collection: Dictionary<T>,
             whereValue: W): boolean;
     }
+    
+    interface LoDashStatic {
+	/**
+	* Fills elements of array with value from start up to, but not including, end.
+	*
+	* Note: This method mutates array.
+	*
+	* @param array (Array): The array to fill.
+	* @param value (*): The value to fill array with.
+	* @param [start=0] (number): The start position.
+	* @param [end=array.length] (number): The end position.
+	* @return (Array): Returns array.
+	**/
+	fill<T>(
+	    array: Array<any>,
+	    value: any,
+	    start?: number,
+	    end?: number): Array<any>;
+    }
 
     //_.filter
     interface LoDashStatic {
diff --git a/luaparse/luaparse-tests.ts b/luaparse/luaparse-tests.ts
new file mode 100644
index 0000000000..af10d12d64
--- /dev/null
+++ b/luaparse/luaparse-tests.ts
@@ -0,0 +1,10 @@
+/// <reference path="luaparse.d.ts" />
+
+import luaparse = require('luaparse');
+
+var luacode: string = '-- this is hello world in lua.\nprint(\'hello world\')';
+var ast: Object = luaparse.parse(luacode);
+console.log(JSON.stringify(ast));
+
+ast = luaparse.parse(luacode, {comments: false});
+console.log(JSON.stringify(ast));
diff --git a/luaparse/luaparse.d.ts b/luaparse/luaparse.d.ts
new file mode 100644
index 0000000000..311bf651dc
--- /dev/null
+++ b/luaparse/luaparse.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for luaparse
+// Project: https://github.com/oxyc/luaparse
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "luaparse" {
+	export function parse(code: string, options?: Object): Object;
+}
diff --git a/maker.js/makerjs-tests.ts b/maker.js/makerjs-tests.ts
index 742b9a10eb..33869213d8 100644
--- a/maker.js/makerjs-tests.ts
+++ b/maker.js/makerjs-tests.ts
@@ -12,12 +12,10 @@ function test() {
 	
 	function testRoot() {
 		makerjs.extendObject({abc:123}, {xyz:789});
-		makerjs.findById<MakerJs.IPath>(model.paths, 'a');
 		makerjs.isModel({});
 		makerjs.isPath({});
 		makerjs.isPoint([]);
 		makerjs.pathType.Circle;
-		makerjs.removeById<MakerJs.IModel>(models, 'x');
 		makerjs.round(44.44444, .01);
 		makerjs.unitType.Millimeter;
 	}
@@ -54,29 +52,31 @@ function test() {
 	}
 	
 	function testModel(){
+		makerjs.model.convertUnits(model, makerjs.unitType.Centimeter);
 		makerjs.model.mirror(model, false, true);
 		makerjs.model.move(makerjs.model.originate(model, [9,9]), [0,0]);
+		makerjs.model.originate(model);
 		makerjs.model.rotate(makerjs.model.scale(model, 6), 45, [0,0]);
 	}
 
 	function testModels(): MakerJs.IModel[] {
 		return [
-			new makerjs.models.BoltCircle('b', 7, 7, 7, 7),
-			new makerjs.models.BoltRectangle('c', 2, 2, 2),
-			new makerjs.models.ConnectTheDots('c', true, [ [0,0], [1,1] ]),
-			new makerjs.models.GoldenRectangle('g', 7),
-			new makerjs.models.Oval('g', 7, 7),
-			new makerjs.models.OvalArc('o', 6, 4, 2, 12),
-			new makerjs.models.Polygon('p', 7, 5),
-			new makerjs.models.Rectangle('r', 8, 9),
-			new makerjs.models.Ring('r', 7, 7),
-			new makerjs.models.RoundRectangle('r', 2, 2, 0),
-			new makerjs.models.SCurve('s', 5, .9),
-			new makerjs.models.Square('s', 8)
+			new makerjs.models.BoltCircle(7, 7, 7, 7),
+			new makerjs.models.BoltRectangle(2, 2, 2),
+			new makerjs.models.ConnectTheDots(true, [ [0,0], [1,1] ]),
+			new makerjs.models.Oval(7, 7),
+			new makerjs.models.OvalArc(6, 4, 2, 12),
+			new makerjs.models.Polygon(7, 5),
+			new makerjs.models.Rectangle(8, 9),
+			new makerjs.models.Ring(7, 7),
+			new makerjs.models.RoundRectangle(2, 2, 0),
+			new makerjs.models.SCurve(5, .9),
+			new makerjs.models.Square(8)
 		];
 	}
 	
 	function testPath() {	
+		makerjs.path.intersection(paths.circle, paths.arc).intersectionPoints;
 		makerjs.path.mirror(paths.arc, true, true);
 		makerjs.path.moveRelative(paths.circle, [0,0]);
 		makerjs.path.rotate(paths.line, 5, [0,0]);
@@ -85,9 +85,9 @@ function test() {
 	
 	function testPaths() {
 		return {	
-			arc: new makerjs.paths.Arc('a', [0,0], 7, 0, 180),
-			circle: new MakerJs.paths.Circle('c', [0,0], 5),
-			line: new makerjs.paths.Line('l', [0,0], [1,1])
+			arc: new makerjs.paths.Arc([0,0], 7, 0, 180),
+			circle: new MakerJs.paths.Circle([0,0], 5),
+			line: new makerjs.paths.Line([0,0], [1,1])
 		};
 	}
 	
@@ -104,13 +104,9 @@ function test() {
 		makerjs.point.zero();
 	}
 	
-	function testTools() {	
-		makerjs.tools.breakPath(paths.line, .7)[0].newPath.cssStyle;
-		makerjs.tools.bridgeGaps([p1, p2], [p1, p2]);
-		makerjs.tools.gapPath(model, 'a', 7, .7);
-		makerjs.tools.pathIntersection(paths.circle, paths.arc).intersectionPoints;
-		makerjs.tools.solveTriangleASA(4, 4, 4);
-		makerjs.tools.solveTriangleSSS(9, 9, 9);
+	function testSolvers() {	
+		makerjs.solvers.solveTriangleASA(4, 4, 4);
+		makerjs.solvers.solveTriangleSSS(9, 9, 9);
 	}
 	
 	function testUnits() {	
diff --git a/maker.js/makerjs.d.ts b/maker.js/makerjs.d.ts
index dba23aff64..acea3405bf 100644
--- a/maker.js/makerjs.d.ts
+++ b/maker.js/makerjs.d.ts
@@ -50,54 +50,6 @@ declare module MakerJs {
      * @returns The original object after merging.
      */
     function extendObject(target: Object, other: Object): Object;
-    /**
-     * Things that may have an id.
-     * @private
-     */
-    interface IHaveId {
-        id: string;
-    }
-    /**
-     * An item found in an array.
-     * @private
-     */
-    interface IFound<T> {
-        /**
-         * Position of the item within the array.
-         */
-        index: number;
-        /**
-         * The found item.
-         */
-        item: T;
-    }
-    /**
-     * Search within an array to find an item by its id property.
-     *
-     * Examples: find a path with id of 'abc'
-     * ```
-     * var found: IFound<IPath> = findById<IPath>(someModel.paths, 'abc');   //typescript
-     * var found = findById(someModel.paths, 'abc');   //javascript
-     * ```
-     *
-     * @param arr Array to search.
-     * @param id Id of the item to find.
-     * @returns object with item and its position.
-     */
-    function findById<T extends IHaveId>(arr: T[], id: string): IFound<T>;
-    /**
-     * Search within an array to find an item by its id property, then remove it from the array.
-     *
-     * Examples: remove a model with id of 'xyz'
-     * ```
-     * removeById<IModel>(someModel.models, 'xyz');   //typescript
-     * removeById(someModel.models, 'xyz');   //javascript
-     * ```
-     *
-     * @param arr Array to search.
-     * @param id Id of the item to find and remove.
-     */
-    function removeById<T extends IHaveId>(arr: T[], id: string): void;
     /**
      * An x-y point in a two-dimensional space.
      * Implemented as an array with 2 elements. The first element is x, the second element is y.
@@ -133,7 +85,7 @@ declare module MakerJs {
     /**
      * A line, curved line or other simple two dimensional shape.
      */
-    interface IPath extends IHaveId {
+    interface IPath {
         /**
          * The type of the path, e.g. "line", "circle", or "arc". These strings are enumerated in pathType.
          */
@@ -158,8 +110,8 @@ declare module MakerJs {
      *
      * Examples:
      * ```
-     * var line: IPathLine = { type: 'line', id: 'myline', origin: [0, 0], end: [1, 1] };   //typescript
-     * var line = { type: 'line', id: 'myline', origin: [0, 0], end: [1, 1] };   //javascript
+     * var line: IPathLine = { type: 'line', origin: [0, 0], end: [1, 1] };   //typescript
+     * var line = { type: 'line', origin: [0, 0], end: [1, 1] };   //javascript
      * ```
      */
     interface IPathLine extends IPath {
@@ -173,8 +125,8 @@ declare module MakerJs {
      *
      * Examples:
      * ```
-     * var circle: IPathCircle = { type: 'circle', id: 'mycircle', origin: [0, 0], radius: 7 };   //typescript
-     * var circle = { type: 'circle', id: 'mycircle', origin: [0, 0], radius: 7 };   //javascript
+     * var circle: IPathCircle = { type: 'circle', origin: [0, 0], radius: 7 };   //typescript
+     * var circle = { type: 'circle', origin: [0, 0], radius: 7 };   //javascript
      * ```
      */
     interface IPathCircle extends IPath {
@@ -188,8 +140,8 @@ declare module MakerJs {
      *
      * Examples:
      * ```
-     * var arc: IPathArc = { type: 'arc', id: 'myarc', origin: [0, 0], radius: 7, startAngle: 0, endAngle: 45 };   //typescript
-     * var arc = { type: 'arc', id: 'myarc', origin: [0, 0], radius: 7, startAngle: 0, endAngle: 45 };   //javascript
+     * var arc: IPathArc = { type: 'arc', origin: [0, 0], radius: 7, startAngle: 0, endAngle: 45 };   //typescript
+     * var arc = { type: 'arc', origin: [0, 0], radius: 7, startAngle: 0, endAngle: 45 };   //javascript
      * ```
      */
     interface IPathArc extends IPathCircle {
@@ -220,15 +172,15 @@ declare module MakerJs {
         /**
          * Key is the type of a path, value is a function which accepts a path object a point object as its parameters.
          */
-        [type: string]: (pathValue: IPath, origin: IPoint) => void;
+        [type: string]: (id: string, pathValue: IPath, origin: IPoint) => void;
     }
     /**
      * String-based enumeration of all paths types.
      *
      * Examples: use pathType instead of string literal when creating a circle.
      * ```
-     * var circle: IPathCircle = { type: pathType.Circle, id: 'mycircle', origin: [0, 0], radius: 7 };   //typescript
-     * var circle = { type: pathType.Circle, id: 'mycircle', origin: [0, 0], radius: 7 };   //javascript
+     * var circle: IPathCircle = { type: pathType.Circle, origin: [0, 0], radius: 7 };   //typescript
+     * var circle = { type: pathType.Circle, origin: [0, 0], radius: 7 };   //javascript
      * ```
      */
     var pathType: {
@@ -236,19 +188,47 @@ declare module MakerJs {
         Circle: string;
         Arc: string;
     };
+    /**
+     * An intersection of two paths.
+     */
+    interface IPathIntersection {
+        /**
+         * Array of points where the two paths intersected. The length of the array may be either 1 or 2 points.
+         */
+        intersectionPoints: IPoint[];
+        /**
+         * This Array property will only be defined if the first parameter passed to pathIntersection is either an Arc or a Circle.
+         * It contains the angles of intersection relative to the first path parameter.
+         * The length of the array may be either 1 or 2.
+         */
+        path1Angles?: number[];
+        /**
+         * This Array property will only be defined if the second parameter passed to pathIntersection is either an Arc or a Circle.
+         * It contains the angles of intersection relative to the second path parameter.
+         * The length of the array may be either 1 or 2.
+         */
+        path2Angles?: number[];
+    }
+    interface IPathMap {
+        [id: string]: IPath;
+    }
+    interface IModelMap {
+        [id: string]: IModel;
+    }
     /**
      * A model is a composite object which may contain an array of paths, or an array of models recursively.
      *
      * Example:
      * ```
-     * var m = { id: 'mymodel',
-     *   paths: [
-     *     { type: 'line', id: 'l1', origin: [0, 0], end: [1, 1] },
-     *     { type: 'line', id: 'l2', origin: [0, 0], end: [-1, -1] }
-     *   ] };
+     * var m = {
+     *   paths: {
+     *     "line1": { type: 'line', origin: [0, 0], end: [1, 1] },
+     *     "line2": { type: 'line', origin: [0, 0], end: [-1, -1] }
+     *   }
+     * };
      * ```
      */
-    interface IModel extends IHaveId {
+    interface IModel {
         /**
          * Optional origin location of this model.
          */
@@ -260,11 +240,11 @@ declare module MakerJs {
         /**
          * Optional array of path objects in this model.
          */
-        paths?: IPath[];
+        paths?: IPathMap;
         /**
          * Optional array of models within this model.
          */
-        models?: IModel[];
+        models?: IModelMap;
         /**
          * Optional unit system of this model. See UnitType for possible values.
          */
@@ -279,9 +259,6 @@ declare module MakerJs {
      */
     function isModel(item: any): boolean;
 }
-/**
- * Module for angle functions.
- */
 declare module MakerJs.angle {
     /**
      * Ensures an angle is not greater than 360
@@ -329,9 +306,6 @@ declare module MakerJs.angle {
      */
     function mirror(angleInDegrees: number, mirrorX: boolean, mirrorY: boolean): number;
 }
-/**
- * Module for point functions.
- */
 declare module MakerJs.point {
     /**
      * Add two points together and return the result as a new point object.
@@ -414,9 +388,6 @@ declare module MakerJs.point {
      */
     function zero(): IPoint;
 }
-/**
- * Module for path functions.
- */
 declare module MakerJs.path {
     /**
      * Create a clone of a path, mirrored on either or both x and y axes.
@@ -454,9 +425,6 @@ declare module MakerJs.path {
      */
     function scale(pathToScale: IPath, scaleValue: number): IPath;
 }
-/**
- * Module for IPath creation shortcuts.
- */
 declare module MakerJs.paths {
     /**
      * Class for arc path.
@@ -468,13 +436,12 @@ declare module MakerJs.paths {
      * @param endAngle The end angle of the arc.
      */
     class Arc implements IPathArc {
-        id: string;
         origin: IPoint;
         radius: number;
         startAngle: number;
         endAngle: number;
         type: string;
-        constructor(id: string, origin: IPoint, radius: number, startAngle: number, endAngle: number);
+        constructor(origin: IPoint, radius: number, startAngle: number, endAngle: number);
     }
     /**
      * Class for circle path.
@@ -484,11 +451,10 @@ declare module MakerJs.paths {
      * @param radius The radius of the circle.
      */
     class Circle implements IPathCircle {
-        id: string;
         origin: IPoint;
         radius: number;
         type: string;
-        constructor(id: string, origin: IPoint, radius: number);
+        constructor(origin: IPoint, radius: number);
     }
     /**
      * Class for line path.
@@ -498,16 +464,12 @@ declare module MakerJs.paths {
      * @param end The end point of the line.
      */
     class Line implements IPathLine {
-        id: string;
         origin: IPoint;
         end: IPoint;
         type: string;
-        constructor(id: string, origin: IPoint, end: IPoint);
+        constructor(origin: IPoint, end: IPoint);
     }
 }
-/**
- * Module for model functions.
- */
 declare module MakerJs.model {
     /**
      * Moves all of a model's children (models and paths, recursively) in reference to a single common origin. Useful when points between children need to connect to each other.
@@ -551,10 +513,15 @@ declare module MakerJs.model {
      * @returns The original model (for chaining).
      */
     function scale(modelToScale: IModel, scaleValue: number, scaleOrigin?: boolean): IModel;
+    /**
+     * Convert a model to match a different unit system.
+     *
+     * @param modeltoConvert The model to convert.
+     * @param destUnitType The unit system.
+     * @returns The scaled model (for chaining).
+     */
+    function convertUnits(modeltoConvert: IModel, destUnitType: string): IModel;
 }
-/**
- * Module for unit conversion functions.
- */
 declare module MakerJs.units {
     /**
      * Get a conversion ratio between a source unit and a destination unit.
@@ -565,9 +532,6 @@ declare module MakerJs.units {
      */
     function conversionScale(srcUnitType: string, destUnitType: string): number;
 }
-/**
- * Module for measure functions.
- */
 declare module MakerJs.measure {
     /**
      * Total angle of an arc between its start and end angles.
@@ -606,9 +570,6 @@ declare module MakerJs.measure {
      */
     function modelExtents(modelToMeasure: IModel): IMeasure;
 }
-/**
- * Module for exporter functions.
- */
 declare module MakerJs.exporter {
     /**
      * @private
@@ -640,28 +601,28 @@ declare module MakerJs.exporter {
          * @param fixPoint Optional function to modify a point prior to export. Function parameter is a point; function must return a point.
          * @param fixPath Optional function to modify a path prior to output. Function parameters are path and offset point; function must return a path.
          */
-        constructor(map: IPathOriginFunctionMap, fixPoint?: (pointToFix: IPoint) => IPoint, fixPath?: (pathToFix: IPath, origin: IPoint) => IPath, beginModel?: (modelContext: IModel) => void, endModel?: (modelContext: IModel) => void);
+        constructor(map: IPathOriginFunctionMap, fixPoint?: (pointToFix: IPoint) => IPoint, fixPath?: (pathToFix: IPath, origin: IPoint) => IPath, beginModel?: (id: string, modelContext: IModel) => void, endModel?: (modelContext: IModel) => void);
         /**
          * Export a path.
          *
          * @param pathToExport The path to export.
          * @param offset The offset position of the path.
          */
-        exportPath(pathToExport: IPath, offset: IPoint): void;
+        exportPath(id: string, pathToExport: IPath, offset: IPoint): void;
         /**
          * Export a model.
          *
          * @param modelToExport The model to export.
          * @param offset The offset position of the model.
          */
-        exportModel(modelToExport: IModel, offset: IPoint): void;
+        exportModel(modelId: string, modelToExport: IModel, offset: IPoint): void;
         /**
          * Export an object.
          *
          * @param item The object to export. May be a path, an array of paths, a model, or an array of models.
          * @param offset The offset position of the object.
          */
-        exportItem(itemToExport: any, origin: IPoint): void;
+        exportItem(itemId: string, itemToExport: any, origin: IPoint): void;
     }
 }
 declare module MakerJs.exporter {
@@ -674,9 +635,36 @@ declare module MakerJs.exporter {
     interface IDXFRenderOptions extends IExportOptions {
     }
 }
-/**
- * Module for kit functions.
- */
+declare module MakerJs.solvers {
+    /**
+     * Solves for the angle of a triangle when you know lengths of 3 sides.
+     *
+     * @param length1 Length of side of triangle, opposite of the angle you are trying to find.
+     * @param length2 Length of any other side of the triangle.
+     * @param length3 Length of the remaining side of the triangle.
+     * @returns Angle opposite of the side represented by the first parameter.
+     */
+    function solveTriangleSSS(length1: number, length2: number, length3: number): number;
+    /**
+     * Solves for the length of a side of a triangle when you know length of one side and 2 angles.
+     *
+     * @param oppositeAngleInDegrees Angle which is opposite of the side you are trying to find.
+     * @param lengthOfSideBetweenAngles Length of one side of the triangle which is between the provided angles.
+     * @param otherAngleInDegrees An other angle of the triangle.
+     * @returns Length of the side of the triangle which is opposite of the first angle parameter.
+     */
+    function solveTriangleASA(oppositeAngleInDegrees: number, lengthOfSideBetweenAngles: number, otherAngleInDegrees: number): number;
+}
+declare module MakerJs.path {
+    /**
+     * Find the point(s) where 2 paths intersect.
+     *
+     * @param path1 First path to find intersection.
+     * @param path2 Second path to find intersection.
+     * @result IPathIntersection object, with points(s) of intersection (and angles, when a path is an arc or circle); or null if the paths did not intersect.
+     */
+    function intersection(path1: IPath, path2: IPath): IPathIntersection;
+}
 declare module MakerJs.kit {
     /**
      * Describes a parameter and its limits.
@@ -793,11 +781,6 @@ declare module MakerJs.exporter {
     }
 }
 declare module MakerJs.exporter {
-    /**
-     * The default stroke width in millimeters.
-     * @private
-     */
-    var svgDefaultStrokeWidth: number;
     function toSVG(modelToExport: IModel, options?: ISVGRenderOptions): string;
     function toSVG(pathsToExport: IPath[], options?: ISVGRenderOptions): string;
     function toSVG(pathToExport: IPath, options?: ISVGRenderOptions): string;
@@ -806,9 +789,13 @@ declare module MakerJs.exporter {
      */
     interface ISVGRenderOptions extends IExportOptions {
         /**
-         * SVG stroke width of paths. This is in the same unit system as the units property.
+         * Optional attributes to add to the root svg tag.
          */
-        strokeWidth?: number;
+        svgAttrs?: IXmlTagAttrs;
+        /**
+         * SVG stroke width of paths. This may have a unit type suffix, if not, the value will be in the same unit system as the units property.
+         */
+        strokeWidth?: string;
         /**
          * SVG color of the rendered paths.
          */
@@ -835,174 +822,66 @@ declare module MakerJs.exporter {
         viewBox: boolean;
     }
 }
-/**
- * Module for primitive model classes.
- */
 declare module MakerJs.models {
     class BoltCircle implements IModel {
-        id: string;
-        paths: IPath[];
-        constructor(id: string, boltRadius: number, holeRadius: number, boltCount: number, firstBoltAngleInDegrees?: number);
+        paths: IPathMap;
+        constructor(boltRadius: number, holeRadius: number, boltCount: number, firstBoltAngleInDegrees?: number);
     }
 }
 declare module MakerJs.models {
     class BoltRectangle implements IModel {
-        id: string;
-        paths: IPath[];
-        constructor(id: string, width: number, height: number, holeRadius: number);
+        paths: IPathMap;
+        constructor(width: number, height: number, holeRadius: number);
     }
 }
 declare module MakerJs.models {
     class ConnectTheDots implements IModel {
-        id: string;
-        paths: IPath[];
-        constructor(id: string, isClosed: boolean, points: IPoint[]);
-    }
-}
-declare module MakerJs.models {
-    class Rectangle extends ConnectTheDots {
-        id: string;
-        constructor(id: string, width: number, height: number);
-    }
-}
-declare module MakerJs.models {
-    class GoldenRectangle extends Rectangle {
-        id: string;
-        constructor(id: string, width: number);
-        static GoldenRatio: number;
+        paths: IPathMap;
+        constructor(isClosed: boolean, points: IPoint[]);
     }
 }
 declare module MakerJs.models {
     class RoundRectangle implements IModel {
-        id: string;
-        paths: IPath[];
-        constructor(id: string, width: number, height: number, radius: number);
+        paths: IPathMap;
+        constructor(width: number, height: number, radius: number);
     }
 }
 declare module MakerJs.models {
     class Oval extends RoundRectangle {
-        id: string;
-        constructor(id: string, width: number, height: number);
+        constructor(width: number, height: number);
     }
 }
 declare module MakerJs.models {
     class OvalArc implements IModel {
-        id: string;
-        paths: IPath[];
-        constructor(id: string, startAngle: number, endAngle: number, sweepRadius: number, slotRadius: number);
+        paths: IPathMap;
+        constructor(startAngle: number, endAngle: number, sweepRadius: number, slotRadius: number);
     }
 }
 declare module MakerJs.models {
     class Polygon extends ConnectTheDots {
-        id: string;
-        constructor(id: string, numberOfSides: number, radius: number, firstCornerAngleInDegrees?: number);
+        constructor(numberOfSides: number, radius: number, firstCornerAngleInDegrees?: number);
         static getPoints(numberOfSides: number, radius: number, firstCornerAngleInDegrees?: number): IPoint[];
     }
 }
+declare module MakerJs.models {
+    class Rectangle extends ConnectTheDots {
+        constructor(width: number, height: number);
+    }
+}
 declare module MakerJs.models {
     class Ring implements IModel {
-        id: string;
-        paths: IPath[];
-        constructor(id: string, outerRadius: number, innerRadius: number);
+        paths: IPathMap;
+        constructor(outerRadius: number, innerRadius: number);
     }
 }
 declare module MakerJs.models {
     class SCurve implements IModel {
-        id: string;
-        paths: IPath[];
-        constructor(id: string, width: number, height: number);
+        paths: IPathMap;
+        constructor(width: number, height: number);
     }
 }
 declare module MakerJs.models {
     class Square extends Rectangle {
-        id: string;
-        constructor(id: string, side: number);
+        constructor(side: number);
     }
 }
-/**
- * Module for various functions.
- */
-declare module MakerJs.tools {
-    /**
-     * A path which has been broken.
-     */
-    interface IBrokenPath {
-        /**
-         * The new path after breaking the source path.
-         */
-        newPath: IPath;
-        /**
-         * The point where the break ocurred.
-         */
-        newPoint: IPoint;
-    }
-    function breakPath(path: IPath, breakAt?: number): IBrokenPath[];
-    /**
-     * Break a path and create a gap within it. Useful when connecting models together.
-     *
-     * @param modelToGap Model which will have a gap in one of its paths.
-     * @param pathId String id of the path in which to create a gap.
-     * @param gapLength Number length of the gap.
-     * @breakAt Number between 0 and 1 (default .5) where the gap will be centered along the path.
-     */
-    function gapPath(modelToGap: IModel, pathId: string, gapLength: number, breakAt?: number): IPoint[];
-    /**
-     * Given 2 pairs of points, will return lines that connect the first pair to the second.
-     *
-     * @param gap1 First array of 2 point objects.
-     * @param gap2 Second array of 2 point objects.
-     * @returns Array containing 2 lines.
-     */
-    function bridgeGaps(gap1: IPoint[], gap2: IPoint[]): IPathLine[];
-}
-declare module MakerJs.tools {
-    /**
-     * Solves for the angle of a triangle when you know lengths of 3 sides.
-     *
-     * @param length1 Length of side of triangle, opposite of the angle you are trying to find.
-     * @param length2 Length of any other side of the triangle.
-     * @param length3 Length of the remaining side of the triangle.
-     * @returns Angle opposite of the side represented by the first parameter.
-     */
-    function solveTriangleSSS(length1: number, length2: number, length3: number): number;
-    /**
-     * Solves for the length of a side of a triangle when you know length of one side and 2 angles.
-     *
-     * @param oppositeAngleInDegrees Angle which is opposite of the side you are trying to find.
-     * @param lengthOfSideBetweenAngles Length of one side of the triangle which is between the provided angles.
-     * @param otherAngleInDegrees An other angle of the triangle.
-     * @returns Length of the side of the triangle which is opposite of the first angle parameter.
-     */
-    function solveTriangleASA(oppositeAngleInDegrees: number, lengthOfSideBetweenAngles: number, otherAngleInDegrees: number): number;
-}
-declare module MakerJs.tools {
-    /**
-     * An intersection of two paths.
-     */
-    interface IPathIntersection {
-        /**
-         * Array of points where the two paths intersected. The length of the array may be either 1 or 2 points.
-         */
-        intersectionPoints: IPoint[];
-        /**
-         * This Array property will only be defined if the first parameter passed to pathIntersection is either an Arc or a Circle.
-         * It contains the angles of intersection relative to the first path parameter.
-         * The length of the array may be either 1 or 2.
-         */
-        path1Angles?: number[];
-        /**
-         * This Array property will only be defined if the second parameter passed to pathIntersection is either an Arc or a Circle.
-         * It contains the angles of intersection relative to the second path parameter.
-         * The length of the array may be either 1 or 2.
-         */
-        path2Angles?: number[];
-    }
-    /**
-     * Find the point(s) where 2 paths intersect.
-     *
-     * @param path1 First path to find intersection.
-     * @param path2 Second path to find intersection.
-     * @result IPathIntersection object, with points(s) of intersection (and angles, when a path is an arc or circle); or null if the paths did not intersect.
-     */
-    function pathIntersection(path1: IPath, path2: IPath): IPathIntersection;
-}
diff --git a/maquette/maquette-tests.ts b/maquette/maquette-tests.ts
index 9f4621593b..9d05b30050 100644
--- a/maquette/maquette-tests.ts
+++ b/maquette/maquette-tests.ts
@@ -51,6 +51,8 @@ var result = cache.result([1], calculate);
 
 // h
 
+h("div",{onclick: (ev:MouseEvent) => true})
+
 var vnode = h("div", [
   "text",
   null,
@@ -64,20 +66,28 @@ var vnode = h("div", [
 
 // mapping
 
-var createTarget = function(source:any) {
+interface Target {
+  source: number;
+  updateCount: number;
+  alreadyPresent: boolean;
+}
+
+var createTarget = function(source:number): Target {
   return {
     source: source,
-    updateCount: 0
+    updateCount: 0,
+    alreadyPresent: false
   };
 };
 
-var updateTarget = function(source: any, target:any) {
+var updateTarget = function(source: number, target:Target) {
+  target.updateCount++;
 };
 
 var permutations = [[1,2], [2,1]];
 for (var i=0;i<permutations.length;i++) {
   for (var j=0;j<permutations.length;j++) {
-    var mapping = maquette.createMapping(function(key){return key;}, createTarget, updateTarget);
+    var mapping = maquette.createMapping(function(source){return source;}, createTarget, updateTarget);
     mapping.map(permutations[i]);
     mapping.results.forEach(function(target) {target.alreadyPresent = true;});
     mapping.map(permutations[j]);
diff --git a/maquette/maquette.d.ts b/maquette/maquette.d.ts
index 84456f2acc..3270fd5477 100644
--- a/maquette/maquette.d.ts
+++ b/maquette/maquette.d.ts
@@ -3,55 +3,116 @@
 // Definitions by: Johan Gorter <https://github.com/johan-gorter>
 // Definitions: https://github.com/johan-gorter/DefinitelyTyped
 
-  /**
-   * @callback enterAnimationCallback
-   * @param {Element} element - Element that was just added to the DOM.
-   * @param {Object} properties - The properties object that was supplied to the {@link module:maquette.h} method
-   */
-
-  /**
-   * @callback exitAnimationCallback
-   * @param {Element} element - Element that ought to be removed from to the DOM.
-   * @param {function} removeElement - Function that removes the element from the DOM. 
-   * This argument is supplied purely for convenience. 
-   * You may use this function to remove the element when the animation is done.
-   * @param {Object} properties - The properties object that was supplied to the {@link module:maquette.h} method that rendered this {@link VNode} the previous time.
-   */
-
-  /**
-   * @callback updateAnimationCallback
-   * @param {Element} element - Element that was modified in the DOM.
-   * @param {Object} properties - The last properties object that was supplied to the {@link module:maquette.h} method
-   * @param {Object} previousProperties - The previous properties object that was supplied to the {@link module:maquette.h} method
-   */
-   
-  /**
-   * @callback afterCreateCallback
-   * @param {Element} element - The element that was added to the DOM.
-   * @param {Object} projectionOptions - The projection options that were used see {@link module:maquette.createProjector}.
-   * @param {string} vnodeSelector - The selector passed to the {@link module:maquette.h} function.
-   * @param {Object} properties - The properties passed to the {@link module:maquette.h} function.
-   * @param {VNode[]} children - The children that were created.
-   * @param {Object} properties - The last properties object that was supplied to the {@link module:maquette.h} method
-   * @param {Object} previousProperties - The previous properties object that was supplied to the {@link module:maquette.h} method
-   */
-
-  /**
-   * @callback afterUpdateCallback
-   * @param {Element} element - The element that may have been updated in the DOM.
-   * @param {Object} projectionOptions - The projection options that were used see {@link module:maquette.createProjector}.
-   * @param {string} vnodeSelector - The selector passed to the {@link module:maquette.h} function.
-   * @param {Object} properties - The properties passed to the {@link module:maquette.h} function.
-   * @param {VNode[]} children - The children for this node.
-   */
-
-
   /**
    * The main object in maquette is the maquette object. 
    * It is either bound to `window.maquette` or it can be obtained using {@link http://browserify.org/|browserify} or {@link http://requirejs.org/|requirejs}.
    */
 declare module maquette {
 
+  // Needed for typescript pre-1.5?
+  interface Touch {
+    clientX: number;
+    clientY: number;
+    identifier: number;
+    pageX: number;
+    pageY: number;
+    screenX: number;
+    screenY: number;
+    target: EventTarget;
+  }
+  interface TouchList {
+    length: number;
+    item(index: number): Touch;
+    [index: number]: Touch;
+  }
+  interface TouchEvent extends UIEvent {
+    altKey: boolean;
+    changedTouches: TouchList;
+    ctrlKey: boolean;
+    metaKey: boolean;
+    shiftKey: boolean;
+    targetTouches: TouchList;
+    touches: TouchList;
+  }
+
+
+  export interface VNodeProperties {
+    enterAnimation?: ((element: Element, properties?: VNodeProperties) => void) | string;
+    exitAnimation?: ((element: Element, removeElement: () => void, properties?: VNodeProperties) => void) | string;
+    updateAnimation?: (element: Element, properties?: VNodeProperties, previousProperties?: VNodeProperties) => void;
+    afterCreate?: (element: Element, projectionOptions: ProjectionOptions, vnodeSelector: string, properties: VNodeProperties,
+      children: VNode[]) => void;
+    afterUpdate?: (element: Element, projectionOptions: ProjectionOptions, vnodeSelector: string, properties: VNodeProperties,
+      children: VNode[]) => void;
+    key?: Object;
+    classes?: {[index:string]: boolean};
+    styles?: {[index:string]: string};
+    
+    // From Element
+    ontouchcancel?: (ev?: TouchEvent) => boolean|void;
+    ontouchend?: (ev?: TouchEvent) => boolean|void;
+    ontouchmove?: (ev?: TouchEvent) => boolean|void;
+    ontouchstart?: (ev?: TouchEvent) => boolean|void;
+    // From HTMLFormElement
+    action?: string;
+    encoding?: string;
+    enctype?: string;
+    method?: string;
+    name?: string;
+    target?: string;    
+    // From HTMLElement
+    onblur?: (ev?: FocusEvent) => boolean|void;
+    onchange?: (ev?: Event) => boolean|void;
+    onclick?: (ev?: MouseEvent) => boolean|void;
+    ondblclick?: (ev?: MouseEvent) => boolean|void;
+    onfocus?: (ev?: FocusEvent) => boolean|void;
+    oninput?: (ev?: Event) => boolean|void;
+    onkeydown?: (ev?: KeyboardEvent) => boolean|void;
+    onkeypress?: (ev?: KeyboardEvent) => boolean|void;
+    onkeyup?: (ev?: KeyboardEvent) => boolean|void;
+    onload?: (ev?: Event) => boolean|void;
+    onmousedown?: (ev?: MouseEvent) => boolean|void;
+    onmouseenter?: (ev?: MouseEvent) => boolean|void;
+    onmouseleave?: (ev?: MouseEvent) => boolean|void;
+    onmousemove?: (ev?: MouseEvent) => boolean|void;
+    onmouseout?: (ev?: MouseEvent) => boolean|void;
+    onmouseover?: (ev?: MouseEvent) => boolean|void;
+    onmouseup?: (ev?: MouseEvent) => boolean|void;
+    onmousewheel?: (ev?: MouseWheelEvent) => boolean|void;
+    onscroll?: (ev?: UIEvent) => boolean|void;
+    onsubmit?: (ev?: Event) => boolean|void;
+    spellcheck?: boolean;
+    tabIndex?: number;
+    title?: string;
+    accessKey?: string;
+    id?: string;
+    // From HTMLInputElement
+    autocomplete?: string;
+    checked?: boolean;
+    placeholder?: string;
+    readOnly?: boolean;
+    src?: string;
+    value?: string;
+    // From HTMLImageElement
+    alt?: string;	
+    srcset?: string;
+    
+    // Everything else (uncommon or custom properties and attributes)
+    [index: string]: Object;
+  }
+
+  export interface ProjectionOptions {
+    transitions?: {
+      enter: (element: Element, properties: VNodeProperties, enterAnimation: string) => void;
+      exit: (element: Element, properties: VNodeProperties, exitAnimation: string, removeElement: () => void) => void; 
+    }
+  }
+
+  // The following line is not possible in Typescript, hence the workaround in the two lines below
+  // export type VNodeChild = string|VNode|Array<VNodeChild>
+  export interface VNodeChildren extends Array<VNodeChild> {} // A bit of a hack to create a recursive type
+  export type VNodeChild = string|VNode|VNodeChildren;
+
   export var dom: MaquetteDom;
 
     /**
@@ -59,7 +120,7 @@ declare module maquette {
      * In practice, caching of {@link VNode} trees is not needed, because achieving 60 frames per second is almost never a problem.
      * @returns {CalculationCache}
      */
-  export function createCache(): CalculationCache;
+  export function createCache<Result>(): CalculationCache<Result>;
   
     /**
      * Creates a {@link Mapping} instance that keeps an array of result objects synchronized with an array of source objects.
@@ -68,58 +129,71 @@ declare module maquette {
      * @param {function} updateResult - `function(source, target, index)` that updates a result to an updated source.
      * @returns {Mapping} 
      */
-  export function createMapping(getSourceKey: (source: any) => any, createResult: (source:any, index:number) => any, updateResult: (source: any, target: any, index: number) => void): Mapping;
+  export function createMapping<Source, Target>(
+    getSourceKey: (source: Source) => (string|number), 
+    createResult: (source: Source, index:number) => Target, 
+    updateResult: (source: Source, target: Target, index: number) => void): Mapping<Source, Target>;
 
     /**
      * Creates a {@link Projector} instance using the provided projectionOptions.
-     * @param {Object} [projectionOptions] - Options that influence how the DOM is rendered and updated.
-     * @param {Object} projectionOptions.transitions - A transition strategy to invoke when 
+     * @param {Object} projectionOptions - Options that influence how the DOM is rendered and updated.
+     * projectionOptions.transitions - A transition strategy to invoke when 
      * enterAnimation and exitAnimation properties are provided as strings.
      * The module `cssTransitions` in the provided `css-transitions.js` file provides such a strategy. 
      * A transition strategy is not needed when enterAnimation and exitAnimation properties are provided as functions.
      * @returns {Projector}
      */
-  export function createProjector(options? : any) : Projector;
+  export function createProjector(projectionOptions? : ProjectionOptions) : Projector;
   
     /**
-     * The `h` method is used to create a virtual DOM node. 
-     * This function is largely inspired by the mercuryjs and mithril frameworks.
+     * Creates a virtual DOM node, used to render a real DOM later. 
      * The `h` stands for (virtual) hyperscript.
      * 
-     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. 
-     * It is formatted as follows: `tagname.cssclass1.cssclass2#id`. 
-     * @param {Object} [properties] - An object literal containing properties that will be placed on the DOM node.
-     * @param {function} properties.<b>*</b> - Properties with functions values like `onclick:handleClick` are registered as event handlers
-     * @param {String} properties.<b>*</b> - Properties with string values, like `href:"/"` are used as attributes
-     * @param {object} properties.<b>*</b> - All non-string values are put on the DOM node as properties
-     * @param {Object} properties.key - Used to uniquely identify a DOM node among siblings. 
-     * A key is required when there are more children with the same selector and these children are added or removed dynamically.
-     * @param {Object} properties.classes - An object literal like `{important:true}` which allows css classes, like `important` to be added and removed dynamically.
-     * @param {Object} properties.styles - An object literal like `{height:"100px"}` which allows styles to be changed dynamically. All values must be strings.
-     * @param {(string|enterAnimationCallback)} properties.enterAnimation - The animation to perform when this node is added to an already existing parent. 
-     * {@link http://maquettejs.org/docs/animations.html|More about animations}.
-     * When this value is a string, you must pass a `projectionOptions.transitions` object when creating the projector {@link module:maquette.createProjector}. 
-     * @param {(string|exitAnimationCallback)} properties.exitAnimation - The animation to perform when this node is removed while its parent remains.
-     * When this value is a string, you must pass a `projectionOptions.transitions` object when creating the projector {@link module:maquette.createProjector}. 
-     * {@link http://maquettejs.org/docs/animations.html|More about animations}.
-     * @param {updateAnimationCallback} properties.updateAnimation - The animation to perform when the properties of this node change. 
-     * This also includes attributes, styles, css classes. This callback is also invoked when node contains only text and that text changes.
-     * {@link http://maquettejs.org/docs/animations.html|More about animations}.
-     * @param {afterCreateCallback} properties.afterCreate - Callback that is executed after this node is added to the DOM. Childnodes and properties have already been applied.
-     * @param {afterUpdateCallback} properties.afterCreate - Callback that is executed every time this node may have been updated. Childnodes and properties have already been updated. 
-     * @param {Object[]} [children] - An array of virtual DOM nodes to add as child nodes. 
-     * This array may contain nested arrays, `null` or `undefined` values.
-     * Nested arrays are flattened, `null` and `undefined` will be skipped.
+     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`. 
+     * @param {Object} properties - An object literal containing attributes, properties, event handlers and more be placed on the DOM node.
+     * @param {Array<VNodeChild>} children - An array of virtual DOM nodes and strings to add as child nodes. May contain nested arrays, null or undefined.
      * 
-     * @returns {VNode} A VNode object, used to render a real DOM later. NOTE: There are {@link http://maquettejs.org/docs/rules.html|three basic rules} you should be aware of when updating the virtual DOM.
+     * @returns {VNode} A VNode object, used to render a real DOM later.
      */
-  export function h(selector: string, properties?: any, children?: Array<string|VNode>): VNode;
+  export function h(selector: string, properties: VNodeProperties, children: Array<VNodeChild>): VNode;
+    /**
+     * Creates a virtual DOM node, used to render a real DOM later. 
+     * The `h` stands for (virtual) hyperscript.
+     * 
+     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`. 
+     * @param {Array<VNodeChild>} children - An array of virtual DOM nodes and strings to add as child nodes. May contain nested arrays, null or undefined.
+     * 
+     * @returns {VNode} A VNode object, used to render a real DOM later.
+     */
+  export function h(selector: string, children: Array<VNodeChild>): VNode;
+    /**
+     * Creates a virtual DOM node, used to render a real DOM later. 
+     * The `h` stands for (virtual) hyperscript.
+     * 
+     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`. 
+     * @param {Object} properties - An object literal containing attributes, properties, event handlers and more be placed on the DOM node.
+     * 
+     * @returns {VNode} A VNode object, used to render a real DOM later.
+     */
+  export function h(selector: string, properties: VNodeProperties): VNode;
+    /**
+     * Creates a virtual DOM node, used to render a real DOM later. 
+     * The `h` stands for (virtual) hyperscript.
+     * 
+     * @param {string} selector - Contains the tagName, id and fixed css classnames in CSS selector format. It is formatted as follows: `tagname.cssclass1.cssclass2#id`. 
+     * 
+     * @returns {VNode} A VNode object, used to render a real DOM later.
+     */
+  export function h(selector: string): VNode;
 
   /**
    * A virtual representation of a DOM Node. Maquette assumes that {@link VNode} objects are never modified externally.
    * Instances of {@link VNode} can be created using {@link module:maquette.h}.
    */
   export interface VNode {
+    vnodeSelector: string;
+    properties: VNodeProperties;
+    children: Array<VNode>;
   }
 
   // Not used anywhere in the maquette sourcecode, but it is a widely used pattern.
@@ -133,7 +207,7 @@ declare module maquette {
    * This object can be used to bypass both rendering and diffing of a virtual DOM subtree.
    * Instances of {@link CalculationCache} can be created using {@link module:maquette.createCache}.
    */
-  export interface CalculationCache {
+  export interface CalculationCache<Result> {
         /**
          * Manually invalidates the cached outcome.
          */
@@ -146,7 +220,7 @@ declare module maquette {
          * These objects are assumed to be immutable primitive values.
          * @param {function} calculation - Function that takes zero arguments and returns an object (A {@link VNode} assumably) that can be cached.
          */
-    result(inputs: Array<any>, calculation: () => any):any;
+    result(inputs: Array<Object>, calculation: () => Result):Result;
   }
 
   /**
@@ -156,17 +230,17 @@ declare module maquette {
    * A {@link Mapping} can be used to keep an array of components (objects with a `renderMaquette` method) synchronized with an array of data.
    * Instances of {@link Mapping} can be created using {@link module:maquette.createMapping}.
    */
-  export interface Mapping {
+  export interface Mapping<Source, Target> {
         /**
          * The array of results. These results will be synchronized with the latest array of sources that were provided using {@link Mapping#map}.
          * @type {Object[]}
          */
-    results: Array<any>;
+    results: Array<Target>;
         /**
          * Maps a new array of sources and updates {@link Mapping#results}.
          * @param {Object[]} newSources - The new array of sources.
          */
-    map(newSources: Array<any>): void;
+    map(newSources: Array<Source>): void;
   }
 
   /**
@@ -181,7 +255,7 @@ declare module maquette {
        * @param {Object} projectionOptions - Options to be used to create and update the projection, see {@link module:maquette.createProjector}. 
        * @returns {Projection} The {@link Projection} that was created.
        */
-    append(parentNode: Element, vnode: VNode, projectionOptions?: any): Projection;
+    append(parentNode: Element, vnode: VNode, projectionOptions?: ProjectionOptions): Projection;
       /**
        * Creates a real DOM tree from a {@link VNode}. The {@link Projection} object returned will contain the resulting DOM Node under the {@link Projection#domNode} property. 
        * This is a low-level method. Users wil typically use a {@link Projector} instead. 
@@ -189,7 +263,7 @@ declare module maquette {
        * @param {Object} projectionOptions - Options to be used to create and update the projection, see {@link module:maquette.createProjector}. 
        * @returns {Projection} The {@link Projection} which contains the DOM Node that was created.
        */
-    create(vnode: VNode, projectionOptions?: any): Projection;
+    create(vnode: VNode, projectionOptions?: ProjectionOptions): Projection;
       /**
        * Inserts a new DOM node which is generated from a {@link VNode}. 
        * This is a low-level method. Users wil typically use a {@link Projector} instead. 
@@ -250,7 +324,7 @@ declare module maquette {
          * @param {Element} parentNode - The parent node for the new childNode.
          * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
          */
-    append(parentNode: Element, renderMaquette: () => VNode): void;
+    append(parentNode: Element, renderMaquetteFunction: () => VNode): void;
         /**
          * Scans the document for `<script>` tags with `type="text/hyperscript"`.
          * The content of these scripts are registered as `renderMaquette` functions.
@@ -259,14 +333,14 @@ declare module maquette {
          * @param {Element} rootNode - Element to start scanning at, example: `document.body`.
          * @param {Object} parameters - Variables to expose to the scripts. format: `{var1:value1, var2: value2}`
          */
-    evaluateHyperscript(rootNode: Element, parameters: any): void;
+    evaluateHyperscript(rootNode: Element, parameters: {[index: string]: Object}): void;
         /**
          * Inserts a new DOM node using the result from the provided `renderMaquetteFunction`.
          * The `renderMaquetteFunction` will be invoked again to update the DOM when needed.
          * @param {Element} beforeNode - The node that the DOM Node is inserted before.
          * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
          */
-    insertBefore(beforeNode: Element, renderMaquette: () => VNode): void;
+    insertBefore(beforeNode: Element, renderMaquetteFunction: () => VNode): void;
         /**
          * Merges a new DOM node using the result from the provided `renderMaquetteFunction` with an existing DOM Node.
          * This means that the virtual DOM and real DOM have one overlapping element. 
@@ -275,14 +349,14 @@ declare module maquette {
          * @param {Element} domNode - The existing element to adopt as the root of the new virtual DOM. Existing attributes and childnodes are preserved.  
          * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
          */
-    merge(domNode: Element, renderMaquette: () => VNode): void;
+    merge(domNode: Element, renderMaquetteFunction: () => VNode): void;
         /**
          * Replaces an existing DOM node with the result from the provided `renderMaquetteFunction`.
          * The `renderMaquetteFunction` will be invoked again to update the DOM when needed.
          * @param {Element} domNode - The DOM node to replace.
          * @param {function} renderMaquetteFunction - Function with zero arguments that returns a {@link VNode} tree.
          */
-    replace(domNode: Element, renderMaquette: () => VNode): void;
+    replace(domNode: Element, renderMaquetteFunction: () => VNode): void;
         /**
          * Resumes the projector. Use this method to resume rendering after stop was called or an error occurred during rendering.
          */
diff --git a/marionette/marionette.d.ts b/marionette/marionette.d.ts
index 4a2bfac108..be684d9a8d 100644
--- a/marionette/marionette.d.ts
+++ b/marionette/marionette.d.ts
@@ -1128,6 +1128,9 @@ declare module Marionette {
          * Add multiple regions as a {name: definition, name2: def2} object literal.
          */
         addRegions(regions: any): any;
+        
+	/** Returns a region from the layout view */
+        getRegion(name: string): Region;
 
         /**
          * Renders the view.
diff --git a/merge2/merge2-tests.ts b/merge2/merge2-tests.ts
new file mode 100644
index 0000000000..bba0dd0a34
--- /dev/null
+++ b/merge2/merge2-tests.ts
@@ -0,0 +1,64 @@
+/// <reference path="merge2.d.ts" />
+/// <reference path="../gulp/gulp.d.ts" />
+
+import gulp = require('gulp');
+import merge2 = require('merge2');
+
+gulp.task('app-js', () =>
+  merge2(
+      gulp.src('static/src/tpl/*.html'),
+      gulp.src([
+        'static/src/js/app.js',
+        'static/src/js/locale_zh-cn.js',
+        'static/src/js/router.js',
+        'static/src/js/tools.js',
+        'static/src/js/services.js',
+        'static/src/js/filters.js',
+        'static/src/js/directives.js',
+        'static/src/js/controllers.js'
+      ])
+    )
+    .pipe(gulp.dest('static/dist/js/'))
+);
+
+
+var stream1 = gulp.src('*.html');
+var stream2 = gulp.src('*.html');
+var stream3 = gulp.src('*.html');
+var stream4 = gulp.src('*.html');
+var stream5 = gulp.src('*.html');
+var stream6 = gulp.src('*.html');
+var stream7 = gulp.src('*.html');
+
+
+var stream = merge2([stream1, stream2], stream3, {end: false})
+//...
+stream.add(stream4, stream5);
+//..
+stream.end();
+
+
+// equal to merge2([stream1, stream2], stream3)
+var stream = merge2();
+stream.add([stream1, stream2]);
+stream.add(stream3);
+
+
+// merge order:
+//   1. merge `stream1`;
+//   2. merge `stream2` and `stream3` in parallel after `stream1` merged;
+//   3. merge 'stream4' after `stream2` and `stream3` merged;
+var stream = merge2(stream1, [stream2, stream3], stream4);
+
+// merge order:
+//   1. merge `stream5` and `stream6` in parallel after `stream4` merged;
+//   2. merge 'stream7' after `stream5` and `stream6` merged;
+stream.add([stream5, stream6], stream7);
+
+
+// nest merge
+// equal to merge2(stream1, stream2, stream6, stream3, [stream4, stream5]);
+var streamA = merge2(stream1, stream2);
+var streamB = merge2(stream3, [stream4, stream5]);
+var stream = merge2(streamA, streamB);
+streamA.add(stream6);
diff --git a/merge2/merge2.d.ts b/merge2/merge2.d.ts
new file mode 100644
index 0000000000..ebf1df758f
--- /dev/null
+++ b/merge2/merge2.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for merge2 v0.3.6
+// Project: https://github.com/teambition/merge2
+// Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module 'merge2' {
+    interface IOptions {
+        end?: boolean;
+        objectMode?: boolean;
+    }
+
+    interface IMerge2Stream extends NodeJS.ReadWriteStream {
+      add(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream | IOptions>>): IMerge2Stream;
+    }
+
+    function merge2(...args: Array<NodeJS.ReadWriteStream | IMerge2Stream | Array<NodeJS.ReadWriteStream | IMerge2Stream> | IOptions>): IMerge2Stream;
+
+    export = merge2;
+}
diff --git a/mixpanel/mixpanel.d.ts b/mixpanel/mixpanel.d.ts
index 8c84206588..8db3b34a49 100644
--- a/mixpanel/mixpanel.d.ts
+++ b/mixpanel/mixpanel.d.ts
@@ -26,7 +26,7 @@ interface Mixpanel
 
     unregister(propertyName:string):void;
 
-    identify(id:string):void;
+    identify(id?:string):void;
 
     get_distinct_id():string;
 
diff --git a/natural/natural-tests.ts b/natural/natural-tests.ts
new file mode 100644
index 0000000000..22ba29c5a7
--- /dev/null
+++ b/natural/natural-tests.ts
@@ -0,0 +1,262 @@
+// Type definitions for Natural 0.2.1
+// Project: https://github.com/NaturalNode/natural
+// Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="natural.d.ts" />
+
+import natural = require('natural');
+
+// Tokenizers
+var tokenizer = new natural.WordTokenizer();
+console.log(tokenizer.tokenize("your dog has fleas."));
+
+tokenizer = new natural.TreebankWordTokenizer();
+console.log(tokenizer.tokenize("my dog hasn't any fleas."));
+// [ 'my', 'dog', 'has', 'n\'t', 'any', 'fleas', '.' ]
+
+tokenizer = new natural.RegexpTokenizer({pattern: /\-/});
+console.log(tokenizer.tokenize("flea-dog"));
+// [ 'flea', 'dog' ]
+
+tokenizer = new natural.WordPunctTokenizer();
+console.log(tokenizer.tokenize("my dog hasn't any fleas."));
+// [ 'my',  'dog',  'hasn',  '\'',  't',  'any',  'fleas',  '.' ]
+
+// String Distance
+console.log(natural.JaroWinklerDistance("dixon","dicksonx"))
+console.log(natural.JaroWinklerDistance('not', 'same'));
+
+console.log(natural.LevenshteinDistance("ones","onez"));
+console.log(natural.LevenshteinDistance('one', 'one'));
+
+console.log(natural.LevenshteinDistance("ones","onez", {
+    insertion_cost: 1,
+    deletion_cost: 1,
+    substitution_cost: 1
+}));
+
+console.log(natural.DiceCoefficient('thing', 'thing'));
+console.log(natural.DiceCoefficient('not', 'same'));
+
+// Stemmers
+console.log(natural.PorterStemmer.stem("words")); // stem a single word
+console.log(natural.PorterStemmerRu.stem("падший"));
+console.log(natural.PorterStemmerEs.stem("jugaría"));
+console.log(natural.PorterStemmerFa.stem("jugaría"));
+console.log(natural.PorterStemmerFr.stem("jugaría"));
+console.log(natural.PorterStemmerIt.stem("jugaría"));
+console.log(natural.PorterStemmerNo.stem("jugaría"));
+console.log(natural.PorterStemmerPt.stem("jugaría"));
+
+// Classifiers
+var classifier = new natural.BayesClassifier();
+
+classifier.addDocument('i am long qqqq', 'buy');
+classifier.addDocument('buy the q\'s', 'buy');
+classifier.addDocument('short gold', 'sell');
+classifier.addDocument('sell gold', 'sell');
+
+classifier.train();
+console.log(classifier.classify('i am short silver'));
+console.log(classifier.classify('i am long copper'));
+console.log(classifier.getClassifications('i am long copper'));
+classifier.addDocument(['sell', 'gold'], 'sell');
+classifier.events.on('trainedWithDocument', function (obj: any) {
+   console.log(obj);
+});
+classifier.save('classifier.json', function(err, classifier) {
+    // the classifier is saved to the classifier.json file!
+});
+natural.BayesClassifier.load('classifier.json', null, function(err, classifier) {
+    console.log(classifier.classify('long SUNW'));
+    console.log(classifier.classify('short SUNW'));
+});
+var classifier = new natural.BayesClassifier();
+classifier.addDocument(['sell', 'gold'], 'sell');
+classifier.addDocument(['buy', 'silver'], 'buy');
+var raw = JSON.stringify(classifier);
+var restoredClassifier = natural.BayesClassifier.restore(JSON.parse(raw));
+console.log(restoredClassifier.classify('i should sell that'));
+
+// Phonetics
+var metaphone = natural.Metaphone, soundEx = natural.SoundEx;
+
+var wordA = 'phonetics';
+var wordB = 'fonetix';
+if(metaphone.compare(wordA, wordB))
+    console.log('they sound alike!');
+console.log(metaphone.process('phonetics'));
+console.log(metaphone.process('phonetics', 3));
+var dm = natural.DoubleMetaphone;
+
+var encodings = dm.process('Matrix');
+console.log(encodings[0]);
+console.log(encodings[1]);
+if(soundEx.compare(wordA, wordB))
+    console.log('they sound alike!');
+
+// Inflectors
+var nounInflector = new natural.NounInflector();
+console.log(nounInflector.pluralize('radius'));
+console.log(nounInflector.singularize('beers'));
+var countInflector = natural.CountInflector;
+console.log(countInflector.nth(1));
+console.log(countInflector.nth(111));
+var verbInflector = new natural.PresentVerbInflector();
+console.log(verbInflector.singularize('become'));
+console.log(verbInflector.pluralize('becomes'));
+var NGrams = natural.NGrams;
+console.log(NGrams.bigrams('some words here'));
+console.log(NGrams.bigrams(['some',  'words',  'here']));
+console.log(NGrams.trigrams('some other words here'));
+console.log(NGrams.trigrams(['some',  'other', 'words',  'here']));
+console.log(NGrams.ngrams('some other words here for you', 4));
+console.log(NGrams.ngrams(['some', 'other', 'words', 'here', 'for',
+    'you'], 4));
+console.log(NGrams.ngrams('some other words here for you', 4, '[start]', '[end]'));
+console.log(NGrams.ngrams('some other words here for you', 4, null, '[end]'));
+var NGramsZH = natural.NGramsZH;
+console.log(NGramsZH.bigrams('中文测试'));
+console.log(NGramsZH.bigrams(['中',  '文',  '测', '试']));
+console.log(NGramsZH.trigrams('中文测试'));
+console.log(NGramsZH.trigrams(['中',  '文', '测',  '试']));
+console.log(NGramsZH.ngrams('一个中文测试', 4));
+console.log(NGramsZH.ngrams(['一', '个', '中', '文', '测',
+    '试'], 4));
+var TfIdf = natural.TfIdf,
+    tfidf = new TfIdf();
+
+tfidf.addDocument('this document is about node.');
+tfidf.addDocument('this document is about ruby.');
+tfidf.addDocument('this document is about ruby and node.');
+tfidf.addDocument('this document is about node. it has node examples');
+
+console.log('node --------------------------------');
+tfidf.tfidfs('node', function(i, measure) {
+    console.log('document #' + i + ' is ' + measure);
+});
+
+console.log('ruby --------------------------------');
+tfidf.tfidfs('ruby', function(i, measure) {
+    console.log('document #' + i + ' is ' + measure);
+});
+console.log(tfidf.tfidf('node', 0));
+console.log(tfidf.tfidf('node', 1));
+var tfidf = new TfIdf();
+tfidf.addFileSync('data_files/one.txt');
+tfidf.addFileSync('data_files/two.txt');
+tfidf.addDocument('this document is about node.');
+tfidf.addDocument('this document is about ruby.');
+tfidf.addDocument('this document is about ruby and node.');
+
+tfidf.tfidfs('node ruby', function(i, measure) {
+    console.log('document #' + i + ' is ' + measure);
+});
+tfidf.addDocument(['document', 'about', 'node']);
+tfidf.addDocument(['document', 'about', 'ruby']);
+tfidf.addDocument(['document', 'about', 'ruby', 'node']);
+tfidf.addDocument(['document', 'about', 'node', 'node', 'examples']);
+
+tfidf.tfidfs(['node', 'ruby'], function(i, measure) {
+    console.log('document #' + i + ' is ' + measure);
+});
+tfidf.listTerms(0 /*document index*/).forEach(function(item) {
+    console.log(item.term + ': ' + item.tfidf);
+});
+var tfidf = new TfIdf();
+tfidf.addDocument('document one', 'un');
+tfidf.addDocument('document Two', 'deux');
+var s = JSON.stringify(tfidf);
+// save "s" to disk, database or otherwise
+
+// assuming you pulled "s" back out of storage.
+var tfidf = new TfIdf(JSON.parse(s));
+
+// Tries
+var Trie = natural.Trie;
+
+var trie = new Trie();
+
+// Add one string at a time
+trie.addString("test");
+
+// Or add many strings
+trie.addStrings(["string1", "string2", "string3"]);
+console.log(trie.contains("test")); // true
+console.log(trie.contains("asdf")); // false
+console.log(trie.findPrefix("tester"));     // ['test', 'er']
+console.log(trie.findPrefix("string4"));    // [null, '4']
+console.log(trie.findPrefix("string3"));    // ['string3', '']
+trie.addString("tes");
+trie.addString("est");
+console.log(trie.findMatchesOnPath("tester")); // ['tes', 'test'];
+console.log(trie.keysWithPrefix("string")); // ["string1", "string2", "string3"]
+trie.contains("TEST"); // false
+
+var ciTrie = new Trie(false);
+ciTrie.addString("test");
+ciTrie.contains("TEsT"); // true
+
+// Digraph
+
+var EdgeWeightedDigraph = natural.EdgeWeightedDigraph;
+var digraph = new EdgeWeightedDigraph();
+digraph.add(5,4,0.35);
+digraph.add(5,1,0.32);
+digraph.add(1,3,0.29);
+digraph.add(6,2,0.40);
+digraph.add(3,6,0.52);
+digraph.add(6,4,0.93);
+console.log(digraph.v());
+console.log(digraph.e());
+
+// ShortestPathTree
+
+var ShortestPathTree = natural.ShortestPathTree;
+var spt = new ShortestPathTree(digraph, 5);
+console.log(spt.getDistTo(4));
+console.log(spt.hasDistTo(4));
+console.log(spt.hasDistTo(5));
+console.log(spt.pathTo(4));
+
+var ShortestPathTree = natural.ShortestPathTree;
+var spt = new ShortestPathTree(digraph, 5);
+console.log(spt.getDistTo(4));
+console.log(spt.hasDistTo(4));
+console.log(spt.hasDistTo(5));
+console.log(spt.pathTo(4));
+
+// WordNet
+
+var wordnet = new natural.WordNet();
+
+wordnet.lookup('node', function(results) {
+    results.forEach(function(result) {
+        console.log('------------------------------------');
+        console.log(result.synsetOffset);
+        console.log(result.pos);
+        console.log(result.lemma);
+        console.log(result.synonyms);
+        console.log(result.pos);
+        console.log(result.gloss);
+    });
+});
+var wordnet = new natural.WordNet();
+
+wordnet.get(4424418, 'n', function(result) {
+    console.log('------------------------------------');
+    console.log(result.lemma);
+    console.log(result.pos);
+    console.log(result.gloss);
+    console.log(result.synonyms);
+});
+var wordnet = new natural.WordNet('/my/wordnet/dict');
+
+// Spellcheck
+
+var corpus = ['something', 'soothing'];
+var spellcheck = new natural.Spellcheck(corpus);
+spellcheck.isCorrect('cat'); // false
+spellcheck.getCorrections('soemthing', 1); // ['something']
+spellcheck.getCorrections('soemthing', 2); // ['something', 'soothing']
diff --git a/natural/natural.d.ts b/natural/natural.d.ts
new file mode 100644
index 0000000000..d559f38012
--- /dev/null
+++ b/natural/natural.d.ts
@@ -0,0 +1,182 @@
+// Type definitions for Natural 0.2.1
+// Project: https://github.com/NaturalNode/natural
+// Definitions by: Dylan R. E. Moonfire <https://github.com/dmoonfire/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts"/>
+
+declare module "natural" {
+  import events = require("events");
+
+  class WordTokenizer {
+    tokenize(text: string): string[];
+  }
+  class AggressiveTokenizer {
+    tokenize(text: string): string[];
+  }
+  class TreebankWordTokenizer {
+    tokenize(text: string): string[];
+  }
+  interface RegexTokenizerOptions {
+    pattern: RegExp;
+    discardEmpty?: boolean;
+  }
+  class RegexpTokenizer {
+    constructor(options: RegexTokenizerOptions);
+    tokenize(text: string): string[];
+  }
+  class WordPunctTokenizer {
+    tokenize(text: string): string[];
+  }
+
+  function JaroWinklerDistance(s1: string, s2: string, dt?: number): number;
+  function LevenshteinDistance(source: string, target: string, options?: any): number;
+  function DiceCoefficient(str1: string, str2: string): number;
+
+  interface Stemmer {
+    stem(token: string): string;
+  }
+  var PorterStemmer: {
+    stem(token: string): string;
+  }
+  var PorterStemmerRu: {
+    stem(token: string): string;
+  }
+  var PorterStemmerEs: {
+    stem(token: string): string;
+  }
+  var PorterStemmerFa: {
+    stem(token: string): string;
+  }
+  var PorterStemmerFr: {
+    stem(token: string): string;
+  }
+  var PorterStemmerIt: {
+    stem(token: string): string;
+  }
+  var PorterStemmerNo: {
+    stem(token: string): string;
+  }
+  var PorterStemmerPt: {
+    stem(token: string): string;
+  }
+
+  interface BayesClassifierCallback { (err: any, classifier: any): void }
+  class BayesClassifier {
+    events: events.EventEmitter;
+    addDocument(text: string, stem: string): void;
+    addDocument(text: string[], stem: string): void;
+    train(): void;
+    classify(observation: string): string;
+    getClassifications(observation: string): string[];
+    save(filename: string, callback: BayesClassifierCallback): void;
+    static load(filename: string, stemmer: Stemmer, callback: BayesClassifierCallback): void;
+    static restore(classifier: any, stemmer?: Stemmer): BayesClassifier;
+  }
+
+  var Metaphone: {
+    compare(stringA: string, stringB: string): boolean;
+    process(token: string, maxLength?: number): string;
+  };
+  var SoundEx: {
+    compare(stringA: string, stringB: string): boolean;
+    process(token: string, maxLength?: number): string;
+  };
+  var DoubleMetaphone: {
+    compare(stringA: string, stringB: string): boolean;
+    process(token: string, maxLength?: number): string[];
+  };
+
+  class NounInflector {
+    pluralize(token: string): string;
+    singularize(token: string): string;
+  }
+  var CountInflector: {
+    nth(i: number): string;
+  }
+  class PresentVerbInflector {
+    pluralize(token: string): string;
+    singularize(token: string): string;
+  }
+  var NGrams: {
+    bigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
+    bigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
+    trigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
+    trigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
+    ngrams(sequence: string, n: number, startSymbol?: string, endSymbol?: string): string[][];
+    ngrams(sequence: string[], n: number, startSymbol?: string, endSymbol?: string): string[][];
+  }
+  var NGramsZH: {
+    bigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
+    bigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
+    trigrams(sequence: string, startSymbol?: string, endSymbol?: string): string[][];
+    trigrams(sequence: string[], startSymbol?: string, endSymbol?: string): string[][];
+    ngrams(sequence: string, n: number, startSymbol?: string, endSymbol?: string): string[][];
+    ngrams(sequence: string[], n: number, startSymbol?: string, endSymbol?: string): string[][];
+  }
+
+  interface TfIdfCallback { (i: number, measure: number): void }
+  interface TfIdfTerm {
+    term: string;
+    tfidf: number;
+  }
+  class TfIdf {
+    constructor(deserialized?: any);
+    addDocument(document: string, key?: string, restoreCache?: boolean): void;
+    addDocument(document: string[], key?: string, restoreCache?: boolean): void;
+    addFileSync(path: string, encoding?: string, key?: string, restoreCache?: boolean): void;
+    tfidf(terms: string, d: number): void;
+    tfidfs(terms: string, callback: TfIdfCallback): void;
+    tfidfs(terms: string[], callback: TfIdfCallback): void;
+    listTerms(d: number): TfIdfTerm[];
+  }
+
+  class Trie {
+    constructor(caseSensitive?: boolean);
+    addString(text: string): boolean;
+    addStrings(strings: string[]): void;
+    contains(token: string): boolean;
+    findPrefix(text: string): string[];
+    findMatchesOnPath(text: string): string[];
+    keysWithPrefix(text: string): string[];
+  }
+
+  class EdgeWeightedDigraph {
+    add(start: number, end: number, weight: number): void;
+    v(): number;
+    e(): number;
+  }
+  class ShortestPathTree {
+    constructor(diagraph: EdgeWeightedDigraph, startVertex: number);
+    getDistTo(vertex: number): number;
+    hasDistTo(vertex: number): boolean;
+    pathTo(vertex: number): number[];
+  }
+  class LongestPathTree {
+    constructor(diagraph: EdgeWeightedDigraph, startVertex: number);
+    getDistTo(vertex: number): number;
+    hasDistTo(vertex: number): boolean;
+    pathTo(vertex: number): number[];
+  }
+
+  interface WordNetLookupResults {
+    synsetOffset: number;
+    pos: string;
+    lemma: string;
+    synonyms: string[];
+    gloss: string;
+  }
+  interface WordNetLookupCallback { (results: WordNetLookupResults[]): void }
+  interface WordNetGetCallback { (results: WordNetLookupResults): void }
+  class WordNet {
+    constructor(filename?: string);
+    lookup(word: string, callback: WordNetLookupCallback): void;
+    get(synsetOffset: number, pos: string, callback: WordNetGetCallback): void;
+  }
+
+  class Spellcheck {
+    constructor(wordlist: string[]);
+    isCorrect(word: string): boolean;
+    getCorrections(word: string, maxDistance?: number): string[];
+  }
+}
diff --git a/nock/nock-tests.ts b/nock/nock-tests.ts
index 00227dfaff..bc936a05b8 100644
--- a/nock/nock-tests.ts
+++ b/nock/nock-tests.ts
@@ -45,6 +45,9 @@ inst = inst.merge(str, data);
 inst = inst.merge(str, obj);
 inst = inst.merge(str, regex);
 
+inst = inst.query(obj);
+inst = inst.query(bool);
+
 inst = inst.intercept(str, str);
 inst = inst.intercept(str, str, str);
 inst = inst.intercept(str, str, obj);
diff --git a/nock/nock.d.ts b/nock/nock.d.ts
index b6803ca890..3cd92e65af 100644
--- a/nock/nock.d.ts
+++ b/nock/nock.d.ts
@@ -45,6 +45,9 @@ declare module "nock" {
 			merge(path: string, data?: Object): Scope;
 			merge(path: string, regex?: RegExp): Scope;
 
+			query(params: any): Scope;
+			query(acceptAnyParams: boolean): Scope;
+
 			intercept(path: string, verb: string, body?: string, options?: any): Scope;
 			intercept(path: string, verb: string, body?: Object, options?: any): Scope;
 			intercept(path: string, verb: string, body?: RegExp, options?: any): Scope;
@@ -55,7 +58,7 @@ declare module "nock" {
 			replyWithFile(responseCode: number, fileName: string): Scope;
 
 			defaultReplyHeaders(headers: Object): Scope;
-			
+
 			matchHeader(name: string, value: string): Scope;
 			matchHeader(name: string, regex: RegExp): Scope;
 			matchHeader(name: string, fn: (value: string) => boolean): Scope;
diff --git a/node/node-0.10.d.ts b/node/node-0.10.d.ts
index 5c095596c4..2f3824462d 100644
--- a/node/node-0.10.d.ts
+++ b/node/node-0.10.d.ts
@@ -910,6 +910,7 @@ declare module "fs" {
     }
     export interface WriteStream extends stream.Writable {
         close(): void;
+        bytesWritten: number;
     }
 
     export function rename(oldPath: string, newPath: string, callback?: (err?: NodeJS.ErrnoException) => void): void;
diff --git a/node/node.d.ts b/node/node.d.ts
index 2865aedd4e..4eecc773ca 100644
--- a/node/node.d.ts
+++ b/node/node.d.ts
@@ -539,6 +539,8 @@ declare module "http" {
 		destroy(): void;
 	}
 
+    export var METHODS: string[];
+
     export var STATUS_CODES: {
         [errorCode: number]: string;
         [errorCode: string]: string;
@@ -1054,6 +1056,7 @@ declare module "fs" {
     }
     export interface WriteStream extends stream.Writable {
         close(): void;
+        bytesWritten: number;
     }
 
     /**
@@ -1624,7 +1627,9 @@ declare module "crypto" {
     }
     export function getDiffieHellman(group_name: string): DiffieHellman;
     export function pbkdf2(password: string, salt: string, iterations: number, keylen: number, callback: (err: Error, derivedKey: Buffer) => any): void;
+    export function pbkdf2(password: string, salt: string, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => any): void;
     export function pbkdf2Sync(password: string, salt: string, iterations: number, keylen: number) : Buffer;
+    export function pbkdf2Sync(password: string, salt: string, iterations: number, keylen: number, digest: string) : Buffer;
     export function randomBytes(size: number): Buffer;
     export function randomBytes(size: number, callback: (err: Error, buf: Buffer) =>void ): void;
     export function pseudoRandomBytes(size: number): Buffer;
diff --git a/prelude-ls/prelude-ls-tests.ts b/prelude-ls/prelude-ls-tests.ts
index b6e50e2256..dc36e9913b 100644
--- a/prelude-ls/prelude-ls-tests.ts
+++ b/prelude-ls/prelude-ls-tests.ts
@@ -1,104 +1,137 @@
+/// <reference path="./prelude-ls.d.ts" />
+
 import prelude = require("prelude-ls");
 
-prelude.id(5);  //=> 5
-prelude.id({}); //=> {}
+var five: number = prelude.id(5);  //=> 5
+var emptyObj: Object = prelude.id({}); //=> {}
 
-prelude.isType("Undefined", void 8); //=> true
+var expectBool: boolean = prelude.isType("Undefined", void 8); //=> true
 prelude.isType("Boolean", true);     //=> true
 prelude.isType("Number", 1);         //=> true
 prelude.isType("String", "hi");      //=> true
 prelude.isType("Object", {});        //=> true
 prelude.isType("Array", []);         //=> true
 
-prelude.replicate(4, 3);   //=> [3, 3, 3, 3]
-prelude.replicate(4, "a"); //=> ["a", "a", "a", "a"]
+var numberArray: Array<number> = prelude.replicate(4, 3);   //=> [3, 3, 3, 3]
+var strArray: Array<string> =
+  prelude.replicate(4, "a"); //=> ["a", "a", "a", "a"]
 prelude.replicate(0, "a"); //=> []
 
 
 // List
 
-prelude.each(x => x.push("boom"), [["a"], ["b"], ["c"]]);
+var eachRes: Array<Array<string>> =
+  prelude.each(x => x.push("boom"), [["a"], ["b"], ["c"]]);
 //=> [["a", "boom"], ["b", "boom"], ["c", "boom"]]
 
-prelude.map(x => x * 2, [1, 2, 3, 4, 5]);         //=> [2, 4, 6, 8, 10]
+var mapRes: Array<string> =
+  prelude.map(x => x.toString(), [1, 2, 3, 4, 5]) //=> ["1", "2", "3", "4", "5"]
+
 prelude.map(x => x.toUpperCase(), ["ha", "ma"]); //=> ["HA", "MA"]
 prelude.map(x => x.num, [{num: 3}, {num: 1}]);    //=> [3, 1]
 
-prelude.compact([0, 1, false, true, "", "ha"]) //=> [1, true, "ha"]
+var compactRes: Array<any> =
+  prelude.compact([0, 1, false, true, "", "ha"]) //=> [1, true, "ha"]
 
-prelude.filter(x => x < 3, [1, 2, 3, 4, 5]); //=> [1, 2]
+var filterRes: Array<number> =
+  prelude.filter(x => x < 3, [1, 2, 3, 4, 5]); //=> [1, 2]
 prelude.filter(prelude.even, [3, 4, 0]);     //=> [4, 0]
 
-prelude.reject(prelude.odd, [1, 2, 3, 4, 5]); //=> [2, 4]
+var rejectRes: Array<number> =
+  prelude.reject(prelude.odd, [1, 2, 3, 4, 5]); //=> [2, 4]
 
-prelude.partition(x => x > 60, [49, 58, 76, 43, 88, 77, 90]); //=> [[76, 88, 77, 90], [49, 58, 43]]
+var partitionRes: Array<Array<number>> =
+  prelude.partition(x => x > 60, [49, 58, 76, 43, 88, 77, 90]);
+  //=> [[76, 88, 77, 90], [49, 58, 43]]
 
-prelude.find(prelude.odd, [2, 4, 6, 7, 8, 9, 10]); //=> 7
+var findRes: number = prelude.find(prelude.odd, [2, 4, 6, 7, 8, 9, 10]); //=> 7
 
-prelude.head([1, 2, 3, 4, 5]); //=> 1
+var headRes: number = prelude.head([1, 2, 3, 4, 5]); //=> 1
 
-prelude.tail([1, 2, 3, 4, 5]); //=> [2, 3, 4, 5]
+var tailRes: Array<number> = prelude.tail([1, 2, 3, 4, 5]); //=> [2, 3, 4, 5]
 
-prelude.last([1, 2, 3, 4, 5]); //=> 5
+var lastRes: number = prelude.last([1, 2, 3, 4, 5]); //=> 5
 
-prelude.initial([1, 2, 3, 4, 5]); //=> [1, 2, 3, 4]
+var initialRes: Array<number> =
+  prelude.initial([1, 2, 3, 4, 5]); //=> [1, 2, 3, 4]
 
-prelude.empty([]); //=> true
+var emptyRes: boolean = prelude.empty([]); //=> true
 
-prelude.reverse([1, 2, 3]); //=> [3, 2, 1]
+var reverseRes: Array<number> = prelude.reverse([1, 2, 3]); //=> [3, 2, 1]
 
-prelude.unique([1, 1, 1, 3, 3, 6, 7, 8]); //=> [1, 3, 6, 7, 8]
+var uniqueRes: Array<number> =
+  prelude.unique([1, 1, 1, 3, 3, 6, 7, 8]); //=> [1, 3, 6, 7, 8]
 
-prelude.uniqueBy(x => x.length, ["and", "here", "are", "some", "words"]); //=> ["and", "here", "words"]
+var uniqueByRes: Array<string> =
+  prelude.uniqueBy(x => x.length, ["and", "here", "are", "some", "words"]); //=> ["and", "here", "words"]
 
-prelude.fold(x => y => x + y, 0, [1, 2, 3, 4, 5]); //=> 15
-var product = prelude.fold<number, number>(x => y => x * y, 1);
+var foldRes: number =
+  prelude.fold(x => y => x + y, 0, [1, 2, 3, 4, 5]); //=> 15
 
-prelude.fold1(x => y => x + y, [1, 2, 3]); //=> 6
+var fold1Res: number =
+  prelude.fold1(x => y => x + y, [1, 2, 3]); //=> 6
 
-prelude.foldr(x => y => x - y, 9, [1, 2, 3, 4]); //=> 7
-prelude.foldr(x => y => x + y, "e", ["a", "b", "c", "d"]); //=> "abcde"
+var foldrRes: number =
+  prelude.foldr(x => y => x - y, 9, [1, 2, 3, 4]); //=> 7
 
-prelude.foldr1(x => y => x - y, [1, 2, 3, 4, 9]); //=> 7
+var foldrStrRes: string =
+  prelude.foldr(x => y => x + y, "e", ["a", "b", "c", "d"]); //=> "abcde"
 
-prelude.unfoldr(x => x === 0 ? null : [x, x - 1], 10);
-//=> [10, 9, 8, 7, 6, 5, 4, 3, 2, 1]
+var foldr1Res: number =
+  prelude.foldr1(x => y => x - y, [1, 2, 3, 4, 9]); //=> 7
 
-prelude.concat([[1], [2, 3], [4]]); //=> [1, 2, 3, 4]
+var unfoldrRes: Array<number> =
+  prelude.unfoldr(x => x === 0 ? null : [x, x - 1], 10);
+  //=> [10, 9, 8, 7, 6, 5, 4, 3, 2, 1]
 
-prelude.concatMap(x => ["hoge", x, x + 2], [1, 2, 3]); //=> ["hoge", 1, 3, "hoge", 2, 4, "hoge", 3, 5]
+var concatRes: Array<number> =
+  prelude.concat([[1], [2, 3], [4]]); //=> [1, 2, 3, 4]
 
-prelude.flatten([1, [[2], 3], [4, [[5]]]]); //=> [1, 2, 3, 4, 5]
+var concatMapRes: Array<any> =
+  prelude.concatMap(x => ["hoge", x, x + 2], [1, 2, 3]);
+  //=> ["hoge", 1, 3, "hoge", 2, 4, "hoge", 3, 5]
 
-prelude.difference([1, 2, 3], [1]);                  //=> [2, 3]
+var flattenRes: Array<number> =
+  prelude.flatten([1, [[2], 3], [4, [[5]]]]); //=> [1, 2, 3, 4, 5]
+
+var differenceRes: Array<number> =
+  prelude.difference([1, 2, 3], [1]);                  //=> [2, 3]
 prelude.difference([1, 2, 3, 4, 5], [5, 2, 10], [9]); //=> [1, 3, 4]
 
-prelude.intersection([2, 3], [9, 8], [12, 1], [99]);                     //=> []
-prelude.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1], [-1, 0, 1, 2]); //=> [1, 2]
-prelude.intersection([1, 2, 3], [2, 1, 3], [3, 1, 2]);                   //=> [1, 2, 3]
+prelude.intersection([2, 3], [9, 8], [12, 1], [99]); //=> []
+var intersectionRes: Array<number> =
+  prelude.intersection([1, 2, 3], [101, 2, 1, 10], [2, 1], [-1, 0, 1, 2]);
+//=> [1, 2]
+prelude.intersection([1, 2, 3], [2, 1, 3], [3, 1, 2]); //=> [1, 2, 3]
 
-prelude.union([1, 5, 7], [3, 5], []); //=> [1, 5, 7, 3]
+var unionRes: Array<number> =
+  prelude.union([1, 5, 7], [3, 5], []); //=> [1, 5, 7, 3]
 
-prelude.countBy(prelude.floor, [4.2, 6.1, 6.4]);         //=> {4: 1, 6: 2}
+var countByRes: Object = prelude.countBy(prelude.floor, [4.2, 6.1, 6.4]);
+//=> {4: 1, 6: 2}
 prelude.countBy(x => x.length, ["one", "two", "three"]); //=> {3: 2, 5: 1}
 
-prelude.groupBy(prelude.floor, [4.2, 6.1, 6.4]);         //=> {4: [4.2], 6: [6.1, 6.4]}
-prelude.groupBy(x => x.length, ["one", "two", "three"]); //=> {3: ["one", "two"], 5: ["three"]}
+var groupByRes: Object = prelude.groupBy(prelude.floor, [4.2, 6.1, 6.4]);
+//=> {4: [4.2], 6: [6.1, 6.4]}
+prelude.groupBy(x => x.length, ["one", "two", "three"]);
+//=> {3: ["one", "two"], 5: ["three"]}
 
-prelude.andList([true, 2 + 2 == 4]);  //=> true
+var andListRes: boolean = prelude.andList([true, 2 + 2 == 4]);  //=> true
 prelude.andList([true, true, false]); //=> false
 prelude.andList([]);                  //=> true
 
-prelude.orList([false, false, true, false]); //=> true
+var orListRes: boolean = prelude.orList([false, false, true, false]); //=> true
 prelude.orList([]);                          //=> false
 
-prelude.any(prelude.even, [3, 5, 7, 8, 9]); //=> true
+var anyRes: boolean = prelude.any(prelude.even, [3, 5, 7, 8, 9]); //=> true
 prelude.any(prelude.even, []);              //=> false
 
-prelude.all(prelude.isType("String"), ["ha", "ma", "la"]); //=> true
+var allRes: boolean = prelude.all(prelude.isType("String"), ["ha", "ma", "la"]);
+//=> true
 prelude.all(prelude.isType("String"), []);                 //=> true
 
-prelude.sort([3, 1, 5, 2, 4, 6]); //=> [1, 2, 3, 4, 5, 6]
+var sortRes: Array<number> = prelude.sort([3, 1, 5, 2, 4, 6]);
+//=> [1, 2, 3, 4, 5, 6]
 
 var f = (x: string) => (y: string) =>
     x.length > y.length ?
@@ -107,11 +140,18 @@ var f = (x: string) => (y: string) =>
       -1
   :
       0;
-prelude.sortWith(f, ["three", "one", "two"]); //=> ["one", "two", "three"]
 
-prelude.sortBy(x => x.length, ["there", "hey", "a", "ha"]); //=> ["a", "ha", "hey", "there"]
+var sortWithRes: Array<string> = prelude.sortWith(f, ["three", "one", "two"]);
+//=> ["one", "two", "three"]
 
-var table = [{
+var sortByRes: Array<string> =
+  prelude.sortBy(x => x.length, ["there", "hey", "a", "ha"]);
+  //=> ["a", "ha", "hey", "there"]
+
+var table: Array<{
+  id: number;
+  name: string;
+}> = [{
   id: 1,
   name: "george"
 }, {
@@ -122,82 +162,107 @@ var table = [{
    name: "donald"
 }];
 prelude.sortBy(x => x.name, table);
-//=> [{"id": 3, "name": "donald"}, {"id": 1, "name": "george"}, {"id": 2, "name": "mike"}]
+//=> [{"id": 3, "name": "donald"},
+//    {"id": 1, "name": "george"},
+//    {"id": 2, "name": "mike"}]
 
-prelude.sum([1, 2, 3, 4, 5]); //=> 15
+var sumRes: number = prelude.sum([1, 2, 3, 4, 5]); //=> 15
 prelude.sum([]);              //=> 0
 
-prelude.product([1, 2, 3]); //=> 6
+var productRes: number = prelude.product([1, 2, 3]); //=> 6
 prelude.product([]);        //=> 1
 
-prelude.mean([1, 2, 3, 4, 5]); //=> 3
+var meanRes: number = prelude.mean([1, 2, 3, 4, 5]); //=> 3
 
-prelude.maximum([4, 1, 9, 3]); //=> 9
+var maximumRes: number = prelude.maximum([4, 1, 9, 3]); //=> 9
 
-prelude.minimum(["c", "e", "a", "d", "b"]); //=> "a"
+var minimumRes: string = prelude.minimum(["c", "e", "a", "d", "b"]); //=> "a"
 
-prelude.maximumBy(x => x.length, ["hi", "there", "I", "am", "looooong"]); //=> "looooong"
+var maximumByRes: string =
+  prelude.maximumBy(x => x.length, ["hi", "there", "I", "am", "looooong"]);
+  //=> "looooong"
 
-prelude.maximumBy(x => x.length, ["hi", "there", "I", "am", "looooong"]); //=> "looooong"
+var scanRes: Array<number> = prelude.scan(x => y => x + y, 0, [1, 2, 3]);
+//=> [0, 1, 3, 6]
 
-prelude.scan(x => y => x + y, 0, [1, 2, 3]); //=> [0, 1, 3, 6]
+var scan1Res: Array<number> = prelude.scan1(x => y => x + y, [1, 2, 3]);
+//=> [1, 3, 6]
 
-prelude.scan1(x => y => x + y, [1, 2, 3]); //=> [1, 3, 6]
+var scanrRes: Array<number> = prelude.scanr(x => y => x + y, 0, [1, 2, 3]);
+//=> [6, 5, 3, 0]
 
-prelude.scanr(x => y => x + y, 0, [1, 2, 3]); //=> [6, 5, 3, 0]
+var scanr1Res: Array<number> = prelude.scanr1(x => y => x + y, [1, 2, 3]);
+//=> [6, 5, 3]
 
-prelude.scanr1(x => y => x + y, [1, 2, 3]); //=> [6, 5, 3]
+var sliceRes: Array<number> = prelude.slice(2, 4, [1, 2, 3, 4, 5]); //=> [3, 4]
 
-prelude.slice(2, 4, [1, 2, 3, 4, 5]); //=> [3, 4]
+var takeRes: Array<number> = prelude.take(2, [1, 2, 3, 4, 5]); //=> [1, 2]
 
-prelude.take(2, [1, 2, 3, 4, 5]); //=> [1, 2]
+var dropRes: Array<number> = prelude.drop(2, [1, 2, 3, 4, 5]); //=> [3, 4, 5]
 
-prelude.drop(2, [1, 2, 3, 4, 5]); //=> [3, 4, 5]
+var splitAtRes: Array<Array<number>> =
+  prelude.splitAt(2, [1, 2, 3, 4, 5]); //=> [[1, 2], [3, 4, 5]]
 
-prelude.splitAt(2, [1, 2, 3, 4, 5]); //=> [[1, 2], [3, 4, 5]]
+var takeWhileRes: Array<number> =
+  prelude.takeWhile(prelude.odd, [1, 3, 5, 4, 8, 7, 9]); //=> [1, 3, 5]
 
-prelude.takeWhile(prelude.odd, [1, 3, 5, 4, 8, 7, 9]); //=> [1, 3, 5]
-
-prelude.dropWhile(prelude.even, [2, 4, 5, 6]); //=> [5, 6]
+var dropWhileRes: Array<number> =
+  prelude.dropWhile(prelude.even, [2, 4, 5, 6]); //=> [5, 6]
 
+var spanRes: Array<Array<number>> =
 prelude.span(prelude.even, [2, 4, 5, 6]); //=> [[2, 4], [5, 6]]
 
-prelude.breakList(x => x == 3, [1, 2, 3, 4, 5]); //=> [[1, 2], [3, 4, 5]]
+var breakListRes: Array<Array<number>> =
+  prelude.breakList(x => x == 3, [1, 2, 3, 4, 5]); //=> [[1, 2], [3, 4, 5]]
 
-prelude.zip([1, 2, 3], [4, 5, 6]); //=> [[1, 4], [2, 5], [3, 6]]
+var zipRes: Array<Array<number>> = prelude.zip([1, 2, 3], [4, 5, 6]);
+//=> [[1, 4], [2, 5], [3, 6]]
 
-prelude.zipWith(x => y => x + y, [1, 2, 3], [4, 5, 6]); //=> [5, 7, 9]
+var zipWithRes: Array<number> =
+  prelude.zipWith(x => y => x + y, [1, 2, 3], [4, 5, 6]); //=> [5, 7, 9]
 
+var zipAllRes: Array<Array<number>> =
 prelude.zipAll([1, 2, 3], [4, 5, 6], [7, 8, 9]); //=> [[1, 4, 7], [2, 5, 8], [3, 6, 9]]
 
+var zipAllWithRes: Array<number> =
 prelude.zipAllWith((a, b, c) => a + b + c, [1, 2, 3], [3, 2, 1], [1, 1, 1]); //=> [5, 5, 5]
 
-prelude.at(2, [1, 2, 3, 4]); //=> 3
+var atRes: number = prelude.at(2, [1, 2, 3, 4]); //=> 3
 prelude.at(-3, [1, 2, 3, 4]); //=> 2
 
-prelude.elemIndex("a", ["c", "a", "b", "a"]); //=> 1
+var elemIndexRes: number = prelude.elemIndex("a", ["c", "a", "b", "a"]); //=> 1
 
-prelude.elemIndices("a", ["c", "a", "b", "a"]); //=> [1, 3]
+var elemIndicesRes: Array<number> =
+  prelude.elemIndices("a", ["c", "a", "b", "a"]); //=> [1, 3]
 
-prelude.findIndex(prelude.even, [1, 2, 3, 4]); //=> 1
+var findIndexRes: number = prelude.findIndex(prelude.even, [1, 2, 3, 4]); //=> 1
 
-prelude.findIndices(prelude.even, [1, 2, 3, 4]); //=> [1, 3]
+var findIndicesRes: Array<number> =
+  prelude.findIndices(prelude.even, [1, 2, 3, 4]); //=> [1, 3]
 
 // Obj
 
-prelude.keys({a: 2, b: 3, c: 9}); //=> ["a", "b", "c"]
+var keysRes: Array<string> = prelude.keys({a: 2, b: 3, c: 9});
+//=> ["a", "b", "c"]
 
-prelude.values({a: 2, b: 3, c: 9}); //=> [2, 3, 9]
+var valuesRes: Array<number> = prelude.values({a: 2, b: 3, c: 9});
+//=> [2, 3, 9]
 
-prelude.pairsToObj<string | number>([["a", "b"], ["c", "d"], ["e", 1]]); //=> {a: "b", c: "d", e: 1}
+var pairsToObjRes: Object =
+  prelude.pairsToObj<string | number>([["a", "b"], ["c", "d"], ["e", 1]]); //=> {a: "b", c: "d", e: 1}
 
-prelude.objToPairs({a: "b", c: "d", e: 1}); //=> [["a", "b"], ["c", "d"], ["e", 1]]
+var objToPairsRes: Array<Array<string | number>> =
+  prelude.objToPairs({a: "b", c: "d", e: 1});
+  //=> [["a", "b"], ["c", "d"], ["e", 1]]
 
-prelude.listsToObj(["a", "b", "c"], [1, 2, 3]); //=> {a: 1, b: 2, c: 3}
+var listsToObjRes: Object =
+  prelude.listsToObj(["a", "b", "c"], [1, 2, 3]); //=> {a: 1, b: 2, c: 3}
 
-prelude.objToLists({a: 1, b: 2, c: 3}); //=> [["a", "b", "c"], [1, 2, 3]]
+var objToListsRes  =
+  prelude.objToLists({a: 1, b: 2, c: 3});
+  //=> [["a", "b", "c"], [1, 2, 3]]
 
-prelude.Obj.empty({}); //=> true
+var objEmptyRes: boolean = prelude.Obj.empty({}); //=> true
 
 var count = 4;
 prelude.Obj.each(x => count += x, {a: 1, b: 2, c: 3});
@@ -272,94 +337,100 @@ prelude.Str.breakStr(x => x === "h", "mmmmmhmm"); //=> ["mmmmm", "hmm"]
 
 // Func
 
-prelude.apply((x, y) => x + y, [2, 3]); //=> 5
+var applyRes: number = prelude.apply((x, y) => x + y, [2, 3]); //=> 5
 
 var add = (x: number, y: number) => x + y;
 var addCurried = prelude.curry(add);
 var addFour = addCurried(4);
 addFour(2); //=> 6
 
-var invertedPower = prelude.flip<number, number, number>(x => y => Math.pow(x, y));
-invertedPower(2)(3); //=> 9
+var flipRes: (x: number) => (y: number) => number
+  = prelude.flip<number, number, number>(x => y => Math.pow(x, y));
 
-prelude.fix((fib: (n: number) => number) => (n: number) => n <= 1 ? 1 : fib(n - 1) + fib(n - 2))(9); //=> 55
+var fixRes: number = prelude.fix(
+  (fib: (n: number) => number) => (n: number) =>
+    n <= 1
+      ? 1
+      : fib(n - 1) + fib(n - 2)
+)(9); //=> 55
 
-var sameLength = prelude.over<string, number, boolean>((x, y) => x == y, x => x.length);
+var sameLength: (x: string, y: string) => boolean
+  = prelude.over<string, number, boolean>((x, y) => x == y, x => x.length);
 sameLength('hi', 'me');    //=> true
 sameLength('one', 'boom'); //=> false
 
 // Num
 
 prelude.max(3, 1);     //=> 3
-prelude.max("a", "c"); //=> "c"
+var maxRes: string = prelude.max("a", "c"); //=> "c"
 
-prelude.min(3, 1);     //=> 1
+var minRes: number = prelude.min(3, 1);     //=> 1
 prelude.min("a", "c"); //=> "a"
 
-prelude.negate(3);  //=> -3
+var negateRes: number = prelude.negate(3);  //=> -3
 prelude.negate(-2); //=>  2
 
-prelude.abs(-2); //=> 2
+var absRes: number = prelude.abs(-2); //=> 2
 prelude.abs(2);  //=> 2
 
-prelude.signum(-5); //=> -1
+var signumRes: number = prelude.signum(-5); //=> -1
 prelude.signum(0);  //=>  0
 prelude.signum(9);  //=>  1
 
-prelude.quot(-20, 3); //=> -6
+var quotRes: number = prelude.quot(-20, 3); //=> -6
 
-prelude.rem(-20, 3); //=> -2
+var remRes: number = prelude.rem(-20, 3); //=> -2
 
-prelude.div(-20, 3); //=> -7
+var divRes: number = prelude.div(-20, 3); //=> -7
 
-prelude.mod(-20, 3); //=> 1
+var modRes: number = prelude.mod(-20, 3); //=> 1
 
-prelude.recip(4); //=> 0.25
+var recipRes: number = prelude.recip(4); //=> 0.25
 
-prelude.pi; //=> 3.141592653589793
+var piRes: number = prelude.pi; //=> 3.141592653589793
 
-prelude.tau; //=> 6.283185307179586
+var tauRes: number = prelude.tau; //=> 6.283185307179586
 
-prelude.exp(1); //=> 2.718281828459045
+var expRes: number = prelude.exp(1); //=> 2.718281828459045
 
-prelude.sqrt(4); //=> 2
+var sqrtRes: number = prelude.sqrt(4); //=> 2
 
-prelude.ln(10); //=> 2.302585092994046
+var lnRes: number = prelude.ln(10); //=> 2.302585092994046
 
-prelude.pow(-2, 2); //=> 4
+var powRes: number = prelude.pow(-2, 2); //=> 4
 
-prelude.sin(prelude.pi / 2); //=> 1
+var sinRes: number = prelude.sin(prelude.pi / 2); //=> 1
 
-prelude.cos(prelude.pi); //=> -1
+var cosRes: number = prelude.cos(prelude.pi); //=> -1
 
-prelude.tan(prelude.pi / 4); //=> 1
+var aTanRes: number = prelude.tan(prelude.pi / 4); //=> 1
 
-prelude.asin(0); //=> 0
+var asinRes: number = prelude.asin(0); //=> 0
 
-prelude.acos(1); //=> 0
+var acosRes: number = prelude.acos(1); //=> 0
 
 prelude.atan(0); //=> 0
 
-prelude.atan2(1, 0); //=> 1.5707963267948966
+var atanRes: number = prelude.atan2(1, 0); //=> 1.5707963267948966
 
-prelude.truncate(-1.5); //=> -1
+var truncateRes: number = prelude.truncate(-1.5); //=> -1
 prelude.truncate(1.5);  //=>  1
 
-prelude.round(0.6); //=> 1
+var roundRes: number = prelude.round(0.6); //=> 1
 prelude.round(0.5); //=> 1
 prelude.round(0.4); //=> 0
 
-prelude.ceiling(0.1); //=> 1
+var ceilingRes: number = prelude.ceiling(0.1); //=> 1
 
-prelude.floor(0.9); //=> 0
+var floorRes: number = prelude.floor(0.9); //=> 0
 
-prelude.isItNaN(prelude.sqrt(-1)); //=> true
+var isItNanRes: boolean = prelude.isItNaN(prelude.sqrt(-1)); //=> true
 
-prelude.even(4); //=> true
+var evenRes: boolean = prelude.even(4); //=> true
 prelude.even(0); //=> true
 
-prelude.odd(3); //=> true
+var oddRes: boolean = prelude.odd(3); //=> true
 
-prelude.gcd(12, 18); //=> 6
+var gcdRes: number = prelude.gcd(12, 18); //=> 6
 
-prelude.lcm(12, 18); //=> 36
\ No newline at end of file
+var lcmRes: number = prelude.lcm(12, 18); //=> 36
\ No newline at end of file
diff --git a/prelude-ls/prelude-ls.d.ts b/prelude-ls/prelude-ls.d.ts
index 848077c822..053ed53a4a 100644
--- a/prelude-ls/prelude-ls.d.ts
+++ b/prelude-ls/prelude-ls.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Aya Morisawa <https://github.com/AyaMorisawa>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
+// Change [0]: 2015/06/14 - Marcelo Camargo <https://github.com/haskellcamargo>
+
 declare module "prelude-ls" {
 	module PreludeLS {
 		export function id<A>(x: A): A;
@@ -14,8 +16,8 @@ declare module "prelude-ls" {
 		
 		// List
 		
-		export function each<A>(f: (x: A) => void): (xs: A[]) => void;
-		export function each<A>(f: (x: A) => void, xs: A[]): void;
+		export function each<A>(f: (x: A) => void): (xs: A[]) => A[];
+		export function each<A>(f: (x: A) => void, xs: A[]): A[];
 		export function map<A, B>(f: (x: A) => B): (xs: A[]) => B[];
 		export function map<A, B>(f: (x: A) => B, xs: A[]): B[];
 		export function compact<A>(xs: A[]): A[];
@@ -25,11 +27,11 @@ declare module "prelude-ls" {
 		export function reject<A>(f: (x: A) => boolean, xs: A[]): A[];
 		export function partition<A>(f: (x: A) => Boolean): (xs: A[]) => [A[], A[]];
 		export function partition<A>(f: (x: A) => Boolean, xs: A[]): [A[], A[]];
-		export function find<A>(f: (x: A) => Boolean): (xs: A[]) => (A | void);
-		export function find<A>(f: (x: A) => Boolean, xs: A[]): (A | void);
-		export function head<A>(xs: A[]): (A | void);
+		export function find<A>(f: (x: A) => Boolean): (xs: A[]) => A;
+		export function find<A>(f: (x: A) => Boolean, xs: A[]): A;
+		export function head<A>(xs: A[]): A;
 		export function tail<A>(xs: A[]): A[];
-		export function last<A>(xs: A[]): (A | void);
+		export function last<A>(xs: A[]): A;
 		export function initial<A>(xs: A[]): A[];
 		export function empty<A>(xs: A[]): boolean;
 		export function reverse<A>(xs: A[]): A[];
@@ -58,8 +60,8 @@ declare module "prelude-ls" {
 		export function concatMap<A, B>(f: (x: A) => B[], xs: A[]): B[];
 		export function flatten(xs: any[]): any[];
 		export function difference<A>(...xss: A[][]): A[];
-		export function intersection<A>(...xss: A[]): A[];
-		export function union<A>(...xss: A[]): A[];
+		export function intersection<A>(...xss: A[][]): A[];
+		export function union<A>(...xss: A[][]): A[];
 		export function countBy<A, B>(f: (x: A) => B): (xs: A[]) => any;
 		export function countBy<A, B>(f: (x: A) => B, xs: A[]): any;
 		export function groupBy<A, B>(f: (x: A) => B): (xs: A[]) => any;
@@ -73,11 +75,11 @@ declare module "prelude-ls" {
 		export function sort<A>(xs: A[]): A[];
 		export function sortWith<A>(f: (x: A) => (y: A) => number): (xs: A[]) => A[];
 		export function sortWith<A>(f: (x: A) => (y: A) => number, xs: A[]): A[];
-		export function sortBy<A, B>(f: (x: A) => B): (xs: A[]) => A;
-		export function sortBy<A, B>(f: (x: A) => B, xs: A[]): A;
-		export function sum(xs: number[]): number[];
-		export function product(xs: number[]): number[];
-		export function mean(xs: number[]): number[];
+		export function sortBy<A, B>(f: (x: A) => B): (xs: A[]) => A[];
+		export function sortBy<A, B>(f: (x: A) => B, xs: A[]): A[];
+		export function sum(xs: number[]): number;
+		export function product(xs: number[]): number;
+		export function mean(xs: number[]): number;
 		export function maximum<A>(xs: A[]): A;
 		export function minimum<A>(xs: A[]): A;
 		export function maximumBy<A, B>(f: (x: A) => B): (xs: A[]) => A;
diff --git a/random-string/random-string-tests.ts b/random-string/random-string-tests.ts
new file mode 100644
index 0000000000..2b278a4f5e
--- /dev/null
+++ b/random-string/random-string-tests.ts
@@ -0,0 +1,11 @@
+/// <reference path="random-string.d.ts" />
+
+import randomString = require('random-string');
+
+console.log(randomString());
+console.log(randomString({
+  length: 20,
+  numeric: true,
+  letters: true,
+  special: true
+}));
diff --git a/random-string/random-string.d.ts b/random-string/random-string.d.ts
new file mode 100644
index 0000000000..f9bcddb1bc
--- /dev/null
+++ b/random-string/random-string.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for random-string
+// Project: https://github.com/valiton/node-random-string
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "random-string" {
+	function randomString(opts?: Object): string;
+	export = randomString;
+}
diff --git a/react-router/legacy/react-router-0.12-test.d.ts b/react-router/legacy/react-router-0.12-test.d.ts
new file mode 100644
index 0000000000..bf6e2e2728
--- /dev/null
+++ b/react-router/legacy/react-router-0.12-test.d.ts
@@ -0,0 +1,6 @@
+///<reference path='../../react/legacy/react-0.12.d.ts' />
+
+declare module 'react-0.12' {
+    var exports: React.Exports;
+    export = exports;
+}
diff --git a/react-router/legacy/react-router-0.12-test.ts b/react-router/legacy/react-router-0.12-test.ts
new file mode 100644
index 0000000000..e896c80f7e
--- /dev/null
+++ b/react-router/legacy/react-router-0.12-test.ts
@@ -0,0 +1,347 @@
+///<reference path='react-router-0.12-test.d.ts' />
+///<reference path="react-router-0.12.d.ts" />
+"use strict";
+
+import React = require('react-0.12');
+import Router = ReactRouter;
+
+// Mixin
+class NavigationTest<T extends Router.Navigation> {
+    v: T;
+    
+    makePath() {
+        var v1: string = this.v.makePath('to');
+        var v2: string = this.v.makePath('to', {id: 1});
+        var v3: string = this.v.makePath('to', {id: 1}, {type: 'json'});
+    }
+    makeHref() {
+        var v1: string = this.v.makeHref('to');
+        var v2: string = this.v.makeHref('to', {id: 1});
+        var v3: string = this.v.makeHref('to', {id: 1}, {type: 'json'});
+    }
+    transitionTo() {
+        var v1: void = this.v.transitionTo('to');
+        var v2: void = this.v.transitionTo('to', {id: 1});
+        var v3: void = this.v.transitionTo('to', {id: 1}, {type: 'json'});
+    }
+    replaceWith() {
+        var v1: void = this.v.replaceWith('to');
+        var v2: void = this.v.replaceWith('to', {id: 1});
+        var v3: void = this.v.replaceWith('to', {id: 1}, {type: 'json'});
+    }
+    goBack() {
+        var v1: void = this.v.goBack();
+    }
+}
+
+class StateTest<T extends Router.State> {
+    v: T;
+    
+    getPath() {
+        var v1: string = this.v.getPath();
+    }
+    
+    getRoutes() {
+        var v1: Router.Route[] = this.v.getRoutes();
+    }
+    
+    getPathname() {
+        var v1: string = this.v.getPathname();
+    }
+    
+    getParams() {
+        var v1: {} = this.v.getParams();
+    }
+    
+    getQuery() {
+        var v1: {} = this.v.getQuery();
+    }
+    
+    isActive() {
+        var v1: boolean = this.v.isActive('to');
+        var v2: boolean = this.v.isActive('to', {id: 1});
+        var v3: boolean = this.v.isActive('to', {id: 1}, {type: 'json'});
+    }
+}
+
+class RouteHandlerMixinTest<T extends Router.RouteHandlerMixin> {
+    v: T;
+    
+    getRouteDepth() {
+        var v1: number = this.v.getRouteDepth();
+    }
+    
+    createChildRouteHandler() {
+        var v1: Router.RouteHandler = this.v.createChildRouteHandler({ref: 'hoge'});
+    }
+}
+
+
+// Location
+class LocationTest<T extends Router.LocationBase> {
+    v: T;
+    
+    push() {
+        var v1: void = this.v.push('path/to/hoge');
+    }
+    
+    replace() {
+        var v1: void = this.v.replace('path/to/hoge');
+    }
+    
+    pop() {
+        var v1: void = this.v.pop();
+    }
+    
+    getCurrentPath() {
+        var v1: void = this.v.getCurrentPath();
+    }
+}
+new LocationTest<Router.HashLocation>();
+new LocationTest<Router.HistoryLocation>();
+new LocationTest<Router.RefreshLocation>();
+
+class LocationListenerTest<T extends Router.LocationListener> {
+    v: T;
+    
+    addChangeListener() {
+        var v1: void = this.v.addChangeListener(() => console.log(1));
+    }
+    
+    removeChangeListener() {
+        var v1: void = this.v.removeChangeListener(() => console.log(1));
+    }
+}
+new LocationListenerTest<Router.HashLocation>();
+new LocationListenerTest<Router.HistoryLocation>();
+
+
+// Behavior
+class ScrollBehaviorTest<T extends Router.ScrollBehaviorBase> {
+    v: T;
+    
+    updateScrollPosition() {
+        var v1: void = this.v.updateScrollPosition({x: 33, y: 102}, 'scrollTop');
+    }
+}
+new ScrollBehaviorTest<Router.ImitateBrowserBehavior>();
+new ScrollBehaviorTest<Router.ScrollToTopBehavior>();
+
+
+// Component
+class DefaultRouteTest {
+    v: Router.DefaultRoute;
+    
+    props() {
+        var name: string = this.v.props.name;
+        var handler: React.ComponentClass<any> = this.v.props.handler;
+    }
+    
+    createElement() {
+        var Handler: React.ComponentClass<any>;
+        React.createElement(Router.DefaultRoute, null);
+        React.createElement(Router.DefaultRoute, {name: 'name', handler: Handler});
+    }
+}
+
+class LinkTest {
+    v: Router.Link;
+    
+    constructor() {
+        new NavigationTest<Router.Link>();
+        new StateTest<Router.Link>();
+    }
+    
+    props() {
+        var activeClassName: string = this.v.props.activeClassName;
+        var to: string = this.v.props.to;
+        var params: {} = this.v.props.params;
+        var query: {} = this.v.props.query;
+        var onClick: Function = this.v.props.onClick;
+    }
+    
+    getHref() {
+        var v1: string = this.v.getHref();
+    }
+    
+    getClassName() {
+        var v1: string = this.v.getClassName();
+    }
+    
+    createElement() {
+        React.createElement(Router.Link, null);
+        React.createElement(Router.Link, {to: 'home'});
+        React.createElement(Router.Link, {
+            activeClassName: 'name',
+            to: 'home',
+            params: {},
+            query: {},
+            onClick: () => console.log(1)
+        });
+    }
+}
+
+class NotFoundRouteTest {
+    v: Router.NotFoundRoute;
+    
+    props() {
+        var name: string = this.v.props.name;
+        var handler: React.ComponentClass<any> = this.v.props.handler;
+    }
+    
+    createElement() {
+        var Handler: React.ComponentClass<any>;
+        React.createElement(Router.NotFoundRoute, null);
+        React.createElement(Router.NotFoundRoute, {handler: Handler});
+        React.createElement(Router.NotFoundRoute, {handler: Handler, name: "home"});
+    }
+}
+
+class RedirectTest {
+    v: Router.Redirect;
+    
+    props() {
+        var path: string = this.v.props.path;
+        var from: string = this.v.props.from;
+        var to: string = this.v.props.to;
+    }
+    
+    createElement() {
+        React.createElement(Router.Redirect, null);
+        React.createElement(Router.Redirect, {});
+        React.createElement(Router.Redirect, {path: 'a', from: 'a', to: 'b'});
+    }
+}
+
+class RouteTest {
+    v: Router.Route;
+    
+    props() {
+        var name: string = this.v.props.name;
+        var path: string = this.v.props.path;
+        var handler: React.ComponentClass<any> = this.v.props.handler;
+        var ignoreScrollBehavior: boolean = this.v.props.ignoreScrollBehavior;
+    }
+    
+    createElement() {
+        var Handler: React.ComponentClass<any>;
+        React.createElement(Router.Route, null);
+        React.createElement(Router.Route, {});
+        React.createElement(Router.Route, {name: "home", path: "/", handler: Handler, ignoreScrollBehavior: true});
+    }
+}
+
+class RouteHandlerTest {
+    v: Router.RouteHandler;
+    
+    constructor() {
+        new RouteHandlerMixinTest<Router.RouteHandler>();
+    }
+    
+    createElement() {
+        React.createElement(Router.RouteHandler, null);
+        React.createElement(Router.RouteHandler, {});
+    }
+}
+
+
+// History
+class HistoryTest {
+    v: Router.History;
+    
+    length() {
+        var v1: number = this.v.length;
+    }
+    
+    back() {
+        var v1: void = this.v.back();
+    }
+}
+
+
+// Router
+class CreateTest {
+    v: Router.Router;
+    
+    constructor() {
+        // React.createElement() version
+        this.v = Router.create({
+            routes: React.createElement(Router.Route, null)
+        });
+        this.v = Router.create({
+            routes: React.createElement(Router.Route, null),
+            location: Router.HistoryLocation,
+            scrollBehavior: Router.ImitateBrowserBehavior
+        });
+        
+        // React.createFactory() version
+        this.v = Router.create({
+            routes: React.createFactory(Router.Route)()
+        });
+        this.v = Router.create({
+            routes: React.createFactory(Router.Route)(),
+            location: Router.HistoryLocation,
+            scrollBehavior: Router.ImitateBrowserBehavior
+        });
+    }
+    
+    run() {
+        this.v.run((Handler) => console.log(Handler));
+        this.v.run((Handler, state) => console.log(Handler, state));
+    }
+}
+
+class RunTest {
+    constructor() {
+        // React.createElement() version
+        var v1: Router.Router = Router.run(React.createElement(Router.Route, null), (Handler) => {
+            React.render(React.createElement(Handler, null), document.body);
+        });
+        var v2: Router.Router = Router.run(React.createElement(Router.Route, null), Router.HistoryLocation, (Handler, state) => {
+            React.render(React.createElement(Handler, null), document.body);
+        });
+        
+        // React.createFactory() version
+        var v3: Router.Router = Router.run(React.createFactory(Router.Route)(), (Handler) => {
+            React.render(React.createElement(Handler, null), document.body);
+        });
+        var v4: Router.Router = Router.run(React.createFactory(Router.Route)(), Router.HistoryLocation, (Handler, state) => {
+            React.render(React.createElement(Handler, null), document.body);
+        });
+    }
+}
+
+
+// Transition
+class TransitionTest {
+    constructor() {
+        var v1: Router.TransitionStaticLifecycle = {
+            willTransitionTo: (transition, params, query, callback) => {
+                transition.abort();
+                transition.redirect('to');
+                transition.redirect('to', {id: 1});
+                transition.redirect('to', {id: 1}, {type: 'json'});
+                transition.retry();
+            },
+            willTransitionFrom: (transition, component, callback) => {}
+        };
+        var v2: Router.TransitionStaticLifecycle = {
+            willTransitionTo: (transition, params, query) => {},
+            willTransitionFrom: (transition, component) => {}
+        };
+        var v3: Router.TransitionStaticLifecycle = {
+            willTransitionTo: (transition, params) => {},
+            willTransitionFrom: (transition) => {}
+        };
+        var v4: Router.TransitionStaticLifecycle = {
+            willTransitionTo: (transition) => {},
+            willTransitionFrom: () => {}
+        };
+        var v5: Router.TransitionStaticLifecycle = {
+            willTransitionTo: () => {}
+        };
+        var v6: Router.TransitionStaticLifecycle = {
+            willTransitionFrom: () => {}
+        };
+    }
+}
diff --git a/react-router/legacy/react-router-0.12.d.ts b/react-router/legacy/react-router-0.12.d.ts
new file mode 100644
index 0000000000..79763db11a
--- /dev/null
+++ b/react-router/legacy/react-router-0.12.d.ts
@@ -0,0 +1,277 @@
+// Type definitions for React Router 0.12.0
+// Project: https://github.com/rackt/react-router
+// Definitions by: Yuichi Murata <https://github.com/mrk21>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+///<reference path='../../react/legacy/react-0.12.d.ts' />
+
+declare module ReactRouter {
+    //
+    // Mixin
+    // ----------------------------------------------------------------------
+    interface Navigation {
+        makePath(to: string, params?: {}, query?: {}): string;
+        makeHref(to: string, params?: {}, query?: {}): string;
+        transitionTo(to: string, params?: {}, query?: {}): void;
+        replaceWith(to: string, params?: {}, query?: {}): void;
+        goBack(): void;
+    }
+    
+    interface RouteHandlerMixin {
+        getRouteDepth(): number;
+        createChildRouteHandler(props: {}): RouteHandler;
+    }
+    
+    interface State {
+        getPath(): string;
+        getRoutes(): Route[];
+        getPathname(): string;
+        getParams(): {};
+        getQuery(): {};
+        isActive(to: string, params?: {}, query?: {}): boolean;
+    }
+    
+    var Navigation: Navigation;
+    var State: State;
+    var RouteHandlerMixin: RouteHandlerMixin;
+    
+    
+    //
+    // Component
+    // ----------------------------------------------------------------------
+    // DefaultRoute
+    interface DefaultRouteProp {
+        name?: string;
+        handler: React.ComponentClass<any>;
+    }
+    interface DefaultRoute extends React.ReactElement<DefaultRouteProp> {
+        __react_router_default_route__: any; // dummy
+    }
+    interface DefaultRouteClass extends React.ComponentClass<DefaultRouteProp> {
+        __react_router_default_route__: any; // dummy
+    }
+    
+    // Link
+    interface LinkProp {
+        activeClassName?: string;
+        to: string;
+        params?: {};
+        query?: {};
+        onClick?: Function;
+    }
+    interface Link extends React.ReactElement<LinkProp>, Navigation, State {
+        __react_router_link__: any; // dummy
+        
+        getHref(): string;
+        getClassName(): string;
+    }
+    interface LinkClass extends React.ComponentClass<LinkProp> {
+        __react_router_link__: any; // dummy
+    }
+    
+    // NotFoundRoute
+    interface NotFoundRouteProp {
+        name?: string;
+        handler: React.ComponentClass<any>;
+    }
+    interface NotFoundRoute extends React.ReactElement<NotFoundRouteProp> {
+        __react_router_not_found_route__: any; // dummy
+    }
+    interface NotFoundRouteClass extends React.ComponentClass<NotFoundRouteProp> {
+        __react_router_not_found_route__: any; // dummy
+    }
+    
+    // Redirect
+    interface RedirectProp {
+        path?: string;
+        from?: string;
+        to?: string;
+    }
+    interface Redirect extends React.ReactElement<RedirectProp> {
+        __react_router_redirect__: any; // dummy
+    }
+    interface RedirectClass extends React.ComponentClass<RedirectProp> {
+        __react_router_redirect__: any; // dummy
+    }
+    
+    // Route
+    interface RouteProp {
+        name?: string;
+        path?: string;
+        handler?: React.ComponentClass<any>;
+        ignoreScrollBehavior?: boolean;
+    }
+    interface Route extends React.ReactElement<RouteProp> {
+        __react_router_route__: any; // dummy
+    }
+    interface RouteClass extends React.ComponentClass<RouteProp> {
+        __react_router_route__: any; // dummy
+    }
+    
+    // RouteHandler
+    interface RouteHandlerProp {}
+    interface RouteHandler extends React.ReactElement<RouteHandlerProp>, RouteHandlerMixin {
+        __react_router_route_handler__: any; // dummy
+    }
+    interface RouteHandlerClass extends React.ReactElement<RouteHandlerProp> {
+        __react_router_route_handler__: any; // dummy
+    }
+    
+    var DefaultRoute: DefaultRouteClass;
+    var Link: LinkClass;
+    var NotFoundRoute: NotFoundRouteClass;
+    var Redirect: RedirectClass;
+    var Route: RouteClass;
+    var RouteHandler: RouteHandlerClass;
+    
+    
+    //
+    // Location
+    // ----------------------------------------------------------------------
+    interface LocationBase {
+        push(path: string): void;
+        replace(path: string): void;
+        pop(): void;
+        getCurrentPath(): void;
+    }
+    
+    interface LocationListener {
+        addChangeListener(listener: Function): void;
+        removeChangeListener(listener: Function): void;
+    }
+    
+    interface HashLocation extends LocationBase, LocationListener {}
+    interface HistoryLocation extends LocationBase, LocationListener {}
+    interface RefreshLocation extends LocationBase {}
+    
+    var HashLocation: HashLocation;
+    var HistoryLocation: HistoryLocation;
+    var RefreshLocation: RefreshLocation;
+    
+    
+    //
+    // Behavior
+    // ----------------------------------------------------------------------
+    interface ScrollBehaviorBase {
+        updateScrollPosition(position: {x: number; y: number;}, actionType: string): void;
+    }
+    interface ImitateBrowserBehavior extends ScrollBehaviorBase {}
+    interface ScrollToTopBehavior extends ScrollBehaviorBase {}
+    
+    var ImitateBrowserBehavior: ImitateBrowserBehavior;
+    var ScrollToTopBehavior: ScrollToTopBehavior;
+    
+    
+    //
+    // Router
+    // ----------------------------------------------------------------------
+    interface Router extends React.ReactElement<any> {
+        run(callback: RouterRunCallback): void;
+    }
+    
+    interface RouterState {
+        path: string;
+        action: string;
+        pathname: string;
+        params: {};
+        query: {};
+        routes : Route[];
+    }
+    
+    interface RouterCreateOption {
+        routes: React.ReactElement<RouteProp>;
+        location?: LocationBase;
+        scrollBehavior?: ScrollBehaviorBase;
+    }
+    
+    type RouterRunCallback = (Handler: Router, state: RouterState) => void;
+    
+    function create(options: RouterCreateOption): Router;
+    function run(routes: React.ReactElement<RouteProp>, callback: RouterRunCallback): Router;
+    function run(routes: React.ReactElement<RouteProp>, location: LocationBase, callback: RouterRunCallback): Router;
+    
+    
+    //
+    // History
+    // ----------------------------------------------------------------------
+    interface History {
+        back(): void;
+        length: number;
+    }
+    var History: History;
+    
+    
+    //
+    // Transition
+    // ----------------------------------------------------------------------
+    interface Transition {
+        abort(): void;
+        redirect(to: string, params?: {}, query?: {}): void;
+        retry(): void;
+    }
+    
+    interface TransitionStaticLifecycle {
+        willTransitionTo?(
+            transition: Transition,
+            params: {},
+            query: {},
+            callback: Function
+        ): void;
+        
+        willTransitionFrom?(
+            transition: Transition,
+            component: React.ReactElement<any>,
+            callback: Function
+        ): void;
+    }
+}
+
+declare module 'react-router' {
+    export = ReactRouter;
+}
+
+declare module React {
+    interface TopLevelAPI {
+        // for DefaultRoute
+        createElement(
+            type: ReactRouter.DefaultRouteClass,
+            props: ReactRouter.DefaultRouteProp,
+            ...children: ReactNode[]
+        ): ReactRouter.DefaultRoute;
+        
+        // for Link
+        createElement(
+            type: ReactRouter.LinkClass,
+            props: ReactRouter.LinkProp,
+            ...children: ReactNode[]
+        ): ReactRouter.Link;
+        
+        // for NotFoundRoute
+        createElement(
+            type: ReactRouter.NotFoundRouteClass,
+            props: ReactRouter.NotFoundRouteProp,
+            ...children: ReactNode[]
+        ): ReactRouter.NotFoundRoute;
+        
+        // for Redirect
+        createElement(
+            type: ReactRouter.RedirectClass,
+            props: ReactRouter.RedirectProp,
+            ...children: ReactNode[]
+        ): ReactRouter.Redirect;
+        
+        // for Route
+        createElement(
+            type: ReactRouter.RouteClass,
+            props: ReactRouter.RouteProp,
+            ...children: ReactNode[]
+        ): ReactRouter.Route;
+        
+        // for RouteHandler
+        createElement(
+            type: ReactRouter.RouteHandlerClass,
+            props: ReactRouter.RouteHandlerProp,
+            ...children: ReactNode[]
+        ): ReactRouter.RouteHandler;
+    }
+}
diff --git a/react-router/react-router-test.ts b/react-router/react-router-test.ts
index 41b352af36..62180a258e 100644
--- a/react-router/react-router-test.ts
+++ b/react-router/react-router-test.ts
@@ -2,12 +2,13 @@
 "use strict";
 
 import React = require('react');
+import ReactAddons = require('react/addons');
 import Router = require('react-router');
 
 // Mixin
 class NavigationTest<T extends Router.Navigation> {
     v: T;
-    
+
     makePath() {
         var v1: string = this.v.makePath('to');
         var v2: string = this.v.makePath('to', {id: 1});
@@ -35,27 +36,27 @@ class NavigationTest<T extends Router.Navigation> {
 
 class StateTest<T extends Router.State> {
     v: T;
-    
+
     getPath() {
         var v1: string = this.v.getPath();
     }
-    
+
     getRoutes() {
         var v1: Router.Route[] = this.v.getRoutes();
     }
-    
+
     getPathname() {
         var v1: string = this.v.getPathname();
     }
-    
+
     getParams() {
         var v1: {} = this.v.getParams();
     }
-    
+
     getQuery() {
         var v1: {} = this.v.getQuery();
     }
-    
+
     isActive() {
         var v1: boolean = this.v.isActive('to');
         var v2: boolean = this.v.isActive('to', {id: 1});
@@ -63,35 +64,23 @@ class StateTest<T extends Router.State> {
     }
 }
 
-class RouteHandlerMixinTest<T extends Router.RouteHandlerMixin> {
-    v: T;
-    
-    getRouteDepth() {
-        var v1: number = this.v.getRouteDepth();
-    }
-    
-    createChildRouteHandler() {
-        var v1: Router.RouteHandler = this.v.createChildRouteHandler({ref: 'hoge'});
-    }
-}
-
 
 // Location
-class LocationTest<T extends Router.LocationBase> {
+class LocationTest<T extends Router.Location> {
     v: T;
-    
+
     push() {
         var v1: void = this.v.push('path/to/hoge');
     }
-    
+
     replace() {
         var v1: void = this.v.replace('path/to/hoge');
     }
-    
+
     pop() {
         var v1: void = this.v.pop();
     }
-    
+
     getCurrentPath() {
         var v1: void = this.v.getCurrentPath();
     }
@@ -102,11 +91,11 @@ new LocationTest<Router.RefreshLocation>();
 
 class LocationListenerTest<T extends Router.LocationListener> {
     v: T;
-    
+
     addChangeListener() {
         var v1: void = this.v.addChangeListener(() => console.log(1));
     }
-    
+
     removeChangeListener() {
         var v1: void = this.v.removeChangeListener(() => console.log(1));
     }
@@ -118,7 +107,7 @@ new LocationListenerTest<Router.HistoryLocation>();
 // Behavior
 class ScrollBehaviorTest<T extends Router.ScrollBehaviorBase> {
     v: T;
-    
+
     updateScrollPosition() {
         var v1: void = this.v.updateScrollPosition({x: 33, y: 102}, 'scrollTop');
     }
@@ -130,27 +119,30 @@ new ScrollBehaviorTest<Router.ScrollToTopBehavior>();
 // Component
 class DefaultRouteTest {
     v: Router.DefaultRoute;
-    
+
     props() {
         var name: string = this.v.props.name;
         var handler: React.ComponentClass<any> = this.v.props.handler;
     }
-    
+
     createElement() {
         var Handler: React.ComponentClass<any>;
         React.createElement(Router.DefaultRoute, null);
         React.createElement(Router.DefaultRoute, {name: 'name', handler: Handler});
+        
+        ReactAddons.createElement(Router.DefaultRoute, null);
+        ReactAddons.createElement(Router.DefaultRoute, {name: 'name', handler: Handler});
     }
 }
 
 class LinkTest {
     v: Router.Link;
-    
+
     constructor() {
         new NavigationTest<Router.Link>();
         new StateTest<Router.Link>();
     }
-    
+
     props() {
         var activeClassName: string = this.v.props.activeClassName;
         var to: string = this.v.props.to;
@@ -158,15 +150,15 @@ class LinkTest {
         var query: {} = this.v.props.query;
         var onClick: Function = this.v.props.onClick;
     }
-    
+
     getHref() {
         var v1: string = this.v.getHref();
     }
-    
+
     getClassName() {
         var v1: string = this.v.getClassName();
     }
-    
+
     createElement() {
         React.createElement(Router.Link, null);
         React.createElement(Router.Link, {to: 'home'});
@@ -177,69 +169,90 @@ class LinkTest {
             query: {},
             onClick: () => console.log(1)
         });
+        
+        ReactAddons.createElement(Router.Link, null);
+        ReactAddons.createElement(Router.Link, {to: 'home'});
+        ReactAddons.createElement(Router.Link, {
+            activeClassName: 'name',
+            to: 'home',
+            params: {},
+            query: {},
+            onClick: () => console.log(1)
+        });
     }
 }
 
 class NotFoundRouteTest {
     v: Router.NotFoundRoute;
-    
+
     props() {
         var name: string = this.v.props.name;
         var handler: React.ComponentClass<any> = this.v.props.handler;
     }
-    
+
     createElement() {
         var Handler: React.ComponentClass<any>;
         React.createElement(Router.NotFoundRoute, null);
         React.createElement(Router.NotFoundRoute, {handler: Handler});
         React.createElement(Router.NotFoundRoute, {handler: Handler, name: "home"});
+        
+        ReactAddons.createElement(Router.NotFoundRoute, null);
+        ReactAddons.createElement(Router.NotFoundRoute, {handler: Handler});
+        ReactAddons.createElement(Router.NotFoundRoute, {handler: Handler, name: "home"});
     }
 }
 
 class RedirectTest {
     v: Router.Redirect;
-    
+
     props() {
         var path: string = this.v.props.path;
         var from: string = this.v.props.from;
         var to: string = this.v.props.to;
     }
-    
+
     createElement() {
         React.createElement(Router.Redirect, null);
         React.createElement(Router.Redirect, {});
         React.createElement(Router.Redirect, {path: 'a', from: 'a', to: 'b'});
+        
+        ReactAddons.createElement(Router.Redirect, null);
+        ReactAddons.createElement(Router.Redirect, {});
+        ReactAddons.createElement(Router.Redirect, {path: 'a', from: 'a', to: 'b'});
     }
 }
 
 class RouteTest {
     v: Router.Route;
-    
+
     props() {
         var name: string = this.v.props.name;
         var path: string = this.v.props.path;
         var handler: React.ComponentClass<any> = this.v.props.handler;
         var ignoreScrollBehavior: boolean = this.v.props.ignoreScrollBehavior;
     }
-    
+
     createElement() {
         var Handler: React.ComponentClass<any>;
         React.createElement(Router.Route, null);
         React.createElement(Router.Route, {});
         React.createElement(Router.Route, {name: "home", path: "/", handler: Handler, ignoreScrollBehavior: true});
+        
+        ReactAddons.createElement(Router.Route, null);
+        ReactAddons.createElement(Router.Route, {});
+        ReactAddons.createElement(Router.Route, {name: "home", path: "/", handler: Handler, ignoreScrollBehavior: true});
     }
 }
 
 class RouteHandlerTest {
     v: Router.RouteHandler;
-    
-    constructor() {
-        new RouteHandlerMixinTest<Router.RouteHandler>();
-    }
-    
+
     createElement() {
         React.createElement(Router.RouteHandler, null);
         React.createElement(Router.RouteHandler, {});
+        
+        ReactAddons.createElement(Router.RouteHandler, null);
+        ReactAddons.createElement(Router.RouteHandler, {});
     }
 }
 
@@ -247,11 +260,11 @@ class RouteHandlerTest {
 // History
 class HistoryTest {
     v: Router.History;
-    
+
     length() {
         var v1: number = this.v.length;
     }
-    
+
     back() {
         var v1: void = this.v.back();
     }
@@ -261,7 +274,7 @@ class HistoryTest {
 // Router
 class CreateTest {
     v: Router.Router;
-    
+
     constructor() {
         // React.createElement() version
         this.v = Router.create({
@@ -272,7 +285,7 @@ class CreateTest {
             location: Router.HistoryLocation,
             scrollBehavior: Router.ImitateBrowserBehavior
         });
-        
+
         // React.createFactory() version
         this.v = Router.create({
             routes: React.createFactory(Router.Route)()
@@ -283,7 +296,7 @@ class CreateTest {
             scrollBehavior: Router.ImitateBrowserBehavior
         });
     }
-    
+
     run() {
         this.v.run((Handler) => console.log(Handler));
         this.v.run((Handler, state) => console.log(Handler, state));
@@ -299,7 +312,7 @@ class RunTest {
         var v2: Router.Router = Router.run(React.createElement(Router.Route, null), Router.HistoryLocation, (Handler, state) => {
             React.render(React.createElement(Handler, null), document.body);
         });
-        
+
         // React.createFactory() version
         var v3: Router.Router = Router.run(React.createFactory(Router.Route)(), (Handler) => {
             React.render(React.createElement(Handler, null), document.body);
@@ -344,3 +357,63 @@ class TransitionTest {
         };
     }
 }
+
+
+// Context
+class ContextTest {
+    v: Router.Context
+
+    makePath() {
+        var v1: string = this.v.makePath('home');
+        var v2: string = this.v.makePath('home', {p1: 1});
+        var v3: string = this.v.makePath('home', {p1: 1}, {q1: 1});
+    }
+
+    makeHref() {
+        var v1: string = this.v.makeHref('home');
+        var v2: string = this.v.makeHref('home', {p1: 1});
+        var v3: string = this.v.makeHref('home', {p1: 1}, {q1: 1});
+    }
+
+    transitionTo() {
+        var v1: void = this.v.transitionTo('home');
+        var v2: void = this.v.transitionTo('home', {p1: 1});
+        var v3: void = this.v.transitionTo('home', {p1: 1}, {q1: 1});
+    }
+
+    replaceWith() {
+        var v1: void = this.v.replaceWith('home');
+        var v2: void = this.v.replaceWith('home', {p1: 1});
+        var v3: void = this.v.replaceWith('home', {p1: 1}, {q1: 1});
+    }
+
+    goBack() {
+        var v: void = this.v.goBack();
+    }
+
+    getCurrentPath() {
+        var v: string = this.v.getCurrentPath();
+    }
+
+    getCurrentRoutes() {
+        var v: Router.Route[] = this.v.getCurrentRoutes();
+    }
+
+    getCurrentPathname() {
+        var v: string = this.v.getCurrentPathname();
+    }
+
+    getCurrentParams() {
+        var v: {} = this.v.getCurrentParams();
+    }
+
+    getCurrentQuery() {
+        var v: {} = this.v.getCurrentQuery();
+    }
+
+    isActive() {
+        var v1: boolean = this.v.isActive('home');
+        var v2: boolean = this.v.isActive('home', {p1: 1});
+        var v3: boolean = this.v.isActive('home', {p1: 1}, {q1: 1});
+    }
+}
diff --git a/react-router/react-router.d.ts b/react-router/react-router.d.ts
index 58ec9069a4..9d0f63b96e 100644
--- a/react-router/react-router.d.ts
+++ b/react-router/react-router.d.ts
@@ -1,11 +1,224 @@
-// Type definitions for React Router 0.12.0
+// Type definitions for React Router 0.13.3
 // Project: https://github.com/rackt/react-router
-// Definitions by: Yuichi Murata <https://github.com/mrk21>
+// Definitions by: Yuichi Murata <https://github.com/mrk21>, Václav Ostrožlík <https://github.com/vasek17>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-///<reference path='../react/legacy/react-0.12.d.ts' />
+///<reference path='../react/react.d.ts' />
+///<reference path='../react/react-addons.d.ts' />
 
 declare module ReactRouter {
+    //
+    // Transition
+    // ----------------------------------------------------------------------
+    interface Transition {
+        path: string;
+        abortReason: any;
+        retry(): void;
+        abort(reason?: any): void;
+        redirect(to: string, params?: {}, query?: {}): void;
+        cancel(): void;
+        from: (transition: Transition, routes: Route[], components?: React.ReactElement<any>[], callback?: (error?: any) => void) => void;
+        to: (transition: Transition, routes: Route[], params?: {}, query?: {}, callback?: (error?: any) => void) => void;
+    }
+
+    interface TransitionStaticLifecycle {
+        willTransitionTo?(
+            transition: Transition,
+            params: {},
+            query: {},
+            callback: Function
+        ): void;
+
+        willTransitionFrom?(
+            transition: Transition,
+            component: React.ReactElement<any>,
+            callback: Function
+        ): void;
+    }
+
+    //
+    // Route Configuration
+    // ----------------------------------------------------------------------
+    // DefaultRoute
+    interface DefaultRouteProp {
+        name?: string;
+        handler: React.ComponentClass<any>;
+    }
+    interface DefaultRoute extends React.ReactElement<DefaultRouteProp> {}
+    interface DefaultRouteClass extends React.ComponentClass<DefaultRouteProp> {}
+
+    // NotFoundRoute
+    interface NotFoundRouteProp {
+        name?: string;
+        handler: React.ComponentClass<any>;
+    }
+    interface NotFoundRoute extends React.ReactElement<NotFoundRouteProp> {}
+    interface NotFoundRouteClass extends React.ComponentClass<NotFoundRouteProp> {}
+
+    // Redirect
+    interface RedirectProp {
+        path?: string;
+        from?: string;
+        to?: string;
+    }
+    interface Redirect extends React.ReactElement<RedirectProp> {}
+    interface RedirectClass extends React.ComponentClass<RedirectProp> {}
+
+    // Route
+    interface RouteProp {
+        name?: string;
+        path?: string;
+        handler?: React.ComponentClass<any>;
+        ignoreScrollBehavior?: boolean;
+    }
+    interface Route extends React.ReactElement<RouteProp> {}
+    interface RouteClass extends React.ComponentClass<RouteProp> {}
+
+    var DefaultRoute: DefaultRouteClass;
+    var NotFoundRoute: NotFoundRouteClass;
+    var Redirect: RedirectClass;
+    var Route: RouteClass;
+
+    interface CreateRouteOptions {
+        name?: string;
+        path?: string;
+        ignoreScrollBehavior?: boolean;
+        isDefault?: boolean;
+        isNotFound?: boolean;
+        onEnter?: (transition: Transition, params: {}, query: {}, callback: Function) => void;
+        onLeave?: (transition: Transition, wtf: any, callback: Function) => void;
+        handler?: Function;
+        parentRoute?: Route;
+    }
+
+    type CreateRouteCallback = (route: Route) => void;
+
+    function createRoute(callback: CreateRouteCallback): Route;
+    function createRoute(options: CreateRouteOptions | string, callback: CreateRouteCallback): Route;
+    function createDefaultRoute(options?: CreateRouteOptions | string): Route;
+    function createNotFoundRoute(options?: CreateRouteOptions | string): Route;
+
+    interface CreateRedirectOptions extends CreateRouteOptions {
+        path?: string;
+        from?: string;
+        to: string;
+        params?: {};
+        query?: {};
+    }
+    function createRedirect(options: CreateRedirectOptions): Redirect;
+    function createRoutesFromReactChildren(children: Route): Route[];
+
+    //
+    // Components
+    // ----------------------------------------------------------------------
+    // Link
+    interface LinkProp {
+        activeClassName?: string;
+        activeStyle?: {};
+        to: string;
+        params?: {};
+        query?: {};
+        onClick?: Function;
+    }
+    interface Link extends React.ReactElement<LinkProp>, Navigation, State {
+        handleClick(event: any): void;
+        getHref(): string;
+        getClassName(): string;
+        getActiveState(): boolean;
+    }
+    interface LinkClass extends React.ComponentClass<LinkProp> {}
+
+    // RouteHandler
+    interface RouteHandlerProp { }
+    interface RouteHandlerChildContext {
+        routeDepth: number;
+    }
+    interface RouteHandler extends React.ReactElement<RouteHandlerProp> {
+        getChildContext(): RouteHandlerChildContext;
+        getRouteDepth(): number;
+        createChildRouteHandler(props: {}): RouteHandler;
+    }
+    interface RouteHandlerClass extends React.ComponentClass<RouteHandlerProp> {}
+
+    var Link: LinkClass;
+    var RouteHandler: RouteHandlerClass;
+
+
+    //
+    // Top-Level
+    // ----------------------------------------------------------------------
+    interface Router extends React.ReactElement<any> {
+        run(callback: RouterRunCallback): void;
+    }
+
+    interface RouterState {
+        path: string;
+        action: string;
+        pathname: string;
+        params: {};
+        query: {};
+        routes: Route[];
+    }
+
+    interface RouterCreateOption {
+        routes: Route;
+        location?: LocationBase;
+        scrollBehavior?: ScrollBehaviorBase;
+        onError?: (error: any) => void;
+        onAbort?: (error: any) => void;
+    }
+
+    type RouterRunCallback = (Handler: RouteClass, state: RouterState) => void;
+
+    function create(options: RouterCreateOption): Router;
+    function run(routes: Route, callback: RouterRunCallback): Router;
+    function run(routes: Route, location: LocationBase, callback: RouterRunCallback): Router;
+
+
+    //
+    // Location
+    // ----------------------------------------------------------------------
+    interface LocationBase {
+        getCurrentPath(): void;
+        toString(): string;
+    }
+    interface Location extends LocationBase {
+        push(path: string): void;
+        replace(path: string): void;
+        pop(): void;
+    }
+
+    interface LocationListener {
+        addChangeListener(listener: Function): void;
+        removeChangeListener(listener: Function): void;
+    }
+
+    interface HashLocation extends Location, LocationListener { }
+    interface HistoryLocation extends Location, LocationListener { }
+    interface RefreshLocation extends Location { }
+    interface StaticLocation extends LocationBase { }
+    interface TestLocation extends Location, LocationListener { }
+
+    var HashLocation: HashLocation;
+    var HistoryLocation: HistoryLocation;
+    var RefreshLocation: RefreshLocation;
+    var StaticLocation: StaticLocation;
+    var TestLocation: TestLocation;
+
+
+    //
+    // Behavior
+    // ----------------------------------------------------------------------
+    interface ScrollBehaviorBase {
+        updateScrollPosition(position: { x: number; y: number; }, actionType: string): void;
+    }
+    interface ImitateBrowserBehavior extends ScrollBehaviorBase { }
+    interface ScrollToTopBehavior extends ScrollBehaviorBase { }
+
+    var ImitateBrowserBehavior: ImitateBrowserBehavior;
+    var ScrollToTopBehavior: ScrollToTopBehavior;
+
+
     //
     // Mixin
     // ----------------------------------------------------------------------
@@ -16,12 +229,7 @@ declare module ReactRouter {
         replaceWith(to: string, params?: {}, query?: {}): void;
         goBack(): void;
     }
-    
-    interface RouteHandlerMixin {
-        getRouteDepth(): number;
-        createChildRouteHandler(props: {}): RouteHandler;
-    }
-    
+
     interface State {
         getPath(): string;
         getRoutes(): Route[];
@@ -30,167 +238,11 @@ declare module ReactRouter {
         getQuery(): {};
         isActive(to: string, params?: {}, query?: {}): boolean;
     }
-    
+
     var Navigation: Navigation;
     var State: State;
-    var RouteHandlerMixin: RouteHandlerMixin;
-    
-    
-    //
-    // Component
-    // ----------------------------------------------------------------------
-    // DefaultRoute
-    interface DefaultRouteProp {
-        name?: string;
-        handler: React.ComponentClass<any>;
-    }
-    interface DefaultRoute extends React.ReactElement<DefaultRouteProp> {
-        __react_router_default_route__: any; // dummy
-    }
-    interface DefaultRouteClass extends React.ComponentClass<DefaultRouteProp> {
-        __react_router_default_route__: any; // dummy
-    }
-    
-    // Link
-    interface LinkProp {
-        activeClassName?: string;
-        to: string;
-        params?: {};
-        query?: {};
-        onClick?: Function;
-    }
-    interface Link extends React.ReactElement<LinkProp>, Navigation, State {
-        __react_router_link__: any; // dummy
-        
-        getHref(): string;
-        getClassName(): string;
-    }
-    interface LinkClass extends React.ComponentClass<LinkProp> {
-        __react_router_link__: any; // dummy
-    }
-    
-    // NotFoundRoute
-    interface NotFoundRouteProp {
-        name?: string;
-        handler: React.ComponentClass<any>;
-    }
-    interface NotFoundRoute extends React.ReactElement<NotFoundRouteProp> {
-        __react_router_not_found_route__: any; // dummy
-    }
-    interface NotFoundRouteClass extends React.ComponentClass<NotFoundRouteProp> {
-        __react_router_not_found_route__: any; // dummy
-    }
-    
-    // Redirect
-    interface RedirectProp {
-        path?: string;
-        from?: string;
-        to?: string;
-    }
-    interface Redirect extends React.ReactElement<RedirectProp> {
-        __react_router_redirect__: any; // dummy
-    }
-    interface RedirectClass extends React.ComponentClass<RedirectProp> {
-        __react_router_redirect__: any; // dummy
-    }
-    
-    // Route
-    interface RouteProp {
-        name?: string;
-        path?: string;
-        handler?: React.ComponentClass<any>;
-        ignoreScrollBehavior?: boolean;
-    }
-    interface Route extends React.ReactElement<RouteProp> {
-        __react_router_route__: any; // dummy
-    }
-    interface RouteClass extends React.ComponentClass<RouteProp> {
-        __react_router_route__: any; // dummy
-    }
-    
-    // RouteHandler
-    interface RouteHandlerProp {}
-    interface RouteHandler extends React.ReactElement<RouteHandlerProp>, RouteHandlerMixin {
-        __react_router_route_handler__: any; // dummy
-    }
-    interface RouteHandlerClass extends React.ReactElement<RouteHandlerProp> {
-        __react_router_route_handler__: any; // dummy
-    }
-    
-    var DefaultRoute: DefaultRouteClass;
-    var Link: LinkClass;
-    var NotFoundRoute: NotFoundRouteClass;
-    var Redirect: RedirectClass;
-    var Route: RouteClass;
-    var RouteHandler: RouteHandlerClass;
-    
-    
-    //
-    // Location
-    // ----------------------------------------------------------------------
-    interface LocationBase {
-        push(path: string): void;
-        replace(path: string): void;
-        pop(): void;
-        getCurrentPath(): void;
-    }
-    
-    interface LocationListener {
-        addChangeListener(listener: Function): void;
-        removeChangeListener(listener: Function): void;
-    }
-    
-    interface HashLocation extends LocationBase, LocationListener {}
-    interface HistoryLocation extends LocationBase, LocationListener {}
-    interface RefreshLocation extends LocationBase {}
-    
-    var HashLocation: HashLocation;
-    var HistoryLocation: HistoryLocation;
-    var RefreshLocation: RefreshLocation;
-    
-    
-    //
-    // Behavior
-    // ----------------------------------------------------------------------
-    interface ScrollBehaviorBase {
-        updateScrollPosition(position: {x: number; y: number;}, actionType: string): void;
-    }
-    interface ImitateBrowserBehavior extends ScrollBehaviorBase {}
-    interface ScrollToTopBehavior extends ScrollBehaviorBase {}
-    
-    var ImitateBrowserBehavior: ImitateBrowserBehavior;
-    var ScrollToTopBehavior: ScrollToTopBehavior;
-    
-    
-    //
-    // Router
-    // ----------------------------------------------------------------------
-    interface Router extends React.ReactElement<any> {
-        run(callback: RouterRunCallback): void;
-    }
-    
-    interface RouterState {
-        path: string;
-        action: string;
-        pathname: string;
-        params: {};
-        query: {};
-        routes : Route[];
-    }
-    
-    interface RouterCreateOption {
-        routes: React.ReactElement<RouteProp>;
-        location?: LocationBase;
-        scrollBehavior?: ScrollBehaviorBase;
-    }
-    
-    type RouterRunCallback = (Handler: Router, state: RouterState) => void;
-    
-    function create(options: RouterCreateOption): Router;
-    function run(routes: React.ReactElement<RouteProp>, callback: RouterRunCallback): Router;
-    function run(routes: React.ReactElement<RouteProp>, location: LocationBase, callback: RouterRunCallback): Router;
-    
-    
+
+
     //
     // History
     // ----------------------------------------------------------------------
@@ -199,80 +251,103 @@ declare module ReactRouter {
         length: number;
     }
     var History: History;
-    
-    
+
+
     //
-    // Transition
+    // Context
     // ----------------------------------------------------------------------
-    interface Transition {
-        abort(): void;
-        redirect(to: string, params?: {}, query?: {}): void;
-        retry(): void;
-    }
-    
-    interface TransitionStaticLifecycle {
-        willTransitionTo?(
-            transition: Transition,
-            params: {},
-            query: {},
-            callback: Function
-        ): void;
-        
-        willTransitionFrom?(
-            transition: Transition,
-            component: React.ReactElement<any>,
-            callback: Function
-        ): void;
+    interface Context {
+        makePath(to: string, params?: {}, query?: {}): string;
+        makeHref(to: string, params?: {}, query?: {}): string;
+        transitionTo(to: string, params?: {}, query?: {}): void;
+        replaceWith(to: string, params?: {}, query?: {}): void;
+        goBack(): void;
+
+        getCurrentPath(): string;
+        getCurrentRoutes(): Route[];
+        getCurrentPathname(): string;
+        getCurrentParams(): {};
+        getCurrentQuery(): {};
+        isActive(to: string, params?: {}, query?: {}): boolean;
     }
 }
 
-declare module 'react-router' {
-    import Export = ReactRouter;
-    export = Export;
+declare module "react-router" {
+    export = ReactRouter;
 }
 
 declare module React {
-    interface TopLevelAPI {
-        // for DefaultRoute
-        createElement(
-            type: ReactRouter.DefaultRouteClass,
-            props: ReactRouter.DefaultRouteProp,
-            ...children: ReactNode[]
-        ): ReactRouter.DefaultRoute;
-        
-        // for Link
-        createElement(
-            type: ReactRouter.LinkClass,
-            props: ReactRouter.LinkProp,
-            ...children: ReactNode[]
-        ): ReactRouter.Link;
-        
-        // for NotFoundRoute
-        createElement(
-            type: ReactRouter.NotFoundRouteClass,
-            props: ReactRouter.NotFoundRouteProp,
-            ...children: ReactNode[]
-        ): ReactRouter.NotFoundRoute;
-        
-        // for Redirect
-        createElement(
-            type: ReactRouter.RedirectClass,
-            props: ReactRouter.RedirectProp,
-            ...children: ReactNode[]
-        ): ReactRouter.Redirect;
-        
-        // for Route
-        createElement(
-            type: ReactRouter.RouteClass,
-            props: ReactRouter.RouteProp,
-            ...children: ReactNode[]
-        ): ReactRouter.Route;
-        
-        // for RouteHandler
-        createElement(
-            type: ReactRouter.RouteHandlerClass,
-            props: ReactRouter.RouteHandlerProp,
-            ...children: ReactNode[]
-        ): ReactRouter.RouteHandler;
-    }
+  // for DefaultRoute
+  function createElement(
+    type: ReactRouter.DefaultRouteClass,
+    props: ReactRouter.DefaultRouteProp,
+    ...children: React.ReactNode[]): ReactRouter.DefaultRoute;
+
+  // for Link
+  function createElement(
+    type: ReactRouter.LinkClass,
+    props: ReactRouter.LinkProp,
+    ...children: React.ReactNode[]): ReactRouter.Link;
+
+  // for NotFoundRoute
+  function createElement(
+    type: ReactRouter.NotFoundRouteClass,
+    props: ReactRouter.NotFoundRouteProp,
+    ...children: React.ReactNode[]): ReactRouter.NotFoundRoute;
+
+  // for Redirect
+  function createElement(
+    type: ReactRouter.RedirectClass,
+    props: ReactRouter.RedirectProp,
+    ...children: React.ReactNode[]): ReactRouter.Redirect;
+
+  // for Route
+  function createElement(
+    type: ReactRouter.RouteClass,
+    props: ReactRouter.RouteProp,
+    ...children: React.ReactNode[]): ReactRouter.Route;
+
+  // for RouteHandler
+  function createElement(
+    type: ReactRouter.RouteHandlerClass,
+    props: ReactRouter.RouteHandlerProp,
+    ...children: React.ReactNode[]): ReactRouter.RouteHandler;
+}
+
+declare module "react/addons" {
+  // for DefaultRoute
+  function createElement(
+    type: ReactRouter.DefaultRouteClass,
+    props: ReactRouter.DefaultRouteProp,
+    ...children: React.ReactNode[]): ReactRouter.DefaultRoute;
+
+  // for Link
+  function createElement(
+    type: ReactRouter.LinkClass,
+    props: ReactRouter.LinkProp,
+    ...children: React.ReactNode[]): ReactRouter.Link;
+
+  // for NotFoundRoute
+  function createElement(
+    type: ReactRouter.NotFoundRouteClass,
+    props: ReactRouter.NotFoundRouteProp,
+    ...children: React.ReactNode[]): ReactRouter.NotFoundRoute;
+
+  // for Redirect
+  function createElement(
+    type: ReactRouter.RedirectClass,
+    props: ReactRouter.RedirectProp,
+    ...children: React.ReactNode[]): ReactRouter.Redirect;
+
+  // for Route
+  function createElement(
+    type: ReactRouter.RouteClass,
+    props: ReactRouter.RouteProp,
+    ...children: React.ReactNode[]): ReactRouter.Route;
+
+  // for RouteHandler
+  function createElement(
+    type: ReactRouter.RouteHandlerClass,
+    props: ReactRouter.RouteHandlerProp,
+    ...children: React.ReactNode[]): ReactRouter.RouteHandler;
 }
diff --git a/react/react-addons-global.d.ts b/react/react-addons-global.d.ts
index ed6096fa6f..508ae05225 100644
--- a/react/react-addons-global.d.ts
+++ b/react/react-addons-global.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-/// <reference path="react.d.ts" />
+/// <reference path="react-global.d.ts" />
 
 declare module React {
     //
diff --git a/react/react-global.d.ts b/react/react-global.d.ts
new file mode 100644
index 0000000000..3c1a69e439
--- /dev/null
+++ b/react/react-global.d.ts
@@ -0,0 +1,930 @@
+// Type definitions for React v0.13.1 (internal module)
+// Project: http://facebook.github.io/react/
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module React {
+    //
+    // React Elements
+    // ----------------------------------------------------------------------
+
+    type ReactType = ComponentClass<any> | string;
+
+    interface ReactElement<P> {
+        type: string | ComponentClass<P>;
+        props: P;
+        key: string | number;
+        ref: string | ((component: Component<P, any>) => any);
+    }
+
+    interface ClassicElement<P> extends ReactElement<P> {
+        type: string | ClassicComponentClass<P>;
+        ref: string | ((component: ClassicComponent<P, any>) => any);
+    }
+
+    interface DOMElement<P> extends ClassicElement<P> {
+        type: string;
+        ref: string | ((component: DOMComponent<P>) => any);
+    }
+
+    type HTMLElement = DOMElement<HTMLAttributes>;
+    type SVGElement = DOMElement<SVGAttributes>;
+
+    //
+    // Factories
+    // ----------------------------------------------------------------------
+
+    interface Factory<P> {
+        (props?: P, ...children: ReactNode[]): ReactElement<P>;
+    }
+
+    interface ClassicFactory<P> extends Factory<P> {
+        (props?: P, ...children: ReactNode[]): ClassicElement<P>;
+    }
+
+    interface DOMFactory<P> extends ClassicFactory<P> {
+        (props?: P, ...children: ReactNode[]): DOMElement<P>;
+    }
+
+    type HTMLFactory = DOMFactory<HTMLAttributes>;
+    type SVGFactory = DOMFactory<SVGAttributes>;
+    type SVGElementFactory = DOMFactory<SVGElementAttributes>;
+
+    //
+    // React Nodes
+    // http://facebook.github.io/react/docs/glossary.html
+    // ----------------------------------------------------------------------
+
+    type ReactText = string | number;
+    type ReactChild = ReactElement<any> | ReactText;
+
+    // Should be Array<ReactNode> but type aliases cannot be recursive
+    type ReactFragment = {} | Array<ReactChild | any[] | boolean>;
+    type ReactNode = ReactChild | ReactFragment | boolean;
+
+    //
+    // Top Level API
+    // ----------------------------------------------------------------------
+
+    function createClass<P, S>(spec: ComponentSpec<P, S>): ClassicComponentClass<P>;
+
+    function createFactory<P>(type: string): DOMFactory<P>;
+    function createFactory<P>(type: ClassicComponentClass<P> | string): ClassicFactory<P>;
+    function createFactory<P>(type: ComponentClass<P>): Factory<P>;
+
+    function createElement<P>(
+        type: string,
+        props?: P,
+        ...children: ReactNode[]): DOMElement<P>;
+    function createElement<P>(
+        type: ClassicComponentClass<P> | string,
+        props?: P,
+        ...children: ReactNode[]): ClassicElement<P>;
+    function createElement<P>(
+        type: ComponentClass<P>,
+        props?: P,
+        ...children: ReactNode[]): ReactElement<P>;
+
+    function cloneElement<P>(
+        element: DOMElement<P>,
+        props?: P,
+        ...children: ReactNode[]): DOMElement<P>;
+    function cloneElement<P>(
+        element: ClassicElement<P>,
+        props?: P,
+        ...children: ReactNode[]): ClassicElement<P>;
+    function cloneElement<P>(
+        element: ReactElement<P>,
+        props?: P,
+        ...children: ReactNode[]): ReactElement<P>;
+
+    function render<P>(
+        element: DOMElement<P>,
+        container: Element,
+        callback?: () => any): DOMComponent<P>;
+    function render<P, S>(
+        element: ClassicElement<P>,
+        container: Element,
+        callback?: () => any): ClassicComponent<P, S>;
+    function render<P, S>(
+        element: ReactElement<P>,
+        container: Element,
+        callback?: () => any): Component<P, S>;
+
+    function unmountComponentAtNode(container: Element): boolean;
+    function renderToString(element: ReactElement<any>): string;
+    function renderToStaticMarkup(element: ReactElement<any>): string;
+    function isValidElement(object: {}): boolean;
+    function initializeTouchEvents(shouldUseTouch: boolean): void;
+
+    function findDOMNode<TElement extends Element>(
+        componentOrElement: Component<any, any> | Element): TElement;
+    function findDOMNode(
+        componentOrElement: Component<any, any> | Element): Element;
+
+    var DOM: ReactDOM;
+    var PropTypes: ReactPropTypes;
+    var Children: ReactChildren;
+
+    //
+    // Component API
+    // ----------------------------------------------------------------------
+
+    // Base component for plain JS classes
+    class Component<P, S> implements ComponentLifecycle<P, S> {
+        constructor(props?: P, context?: any);
+        setState(f: (prevState: S, props: P) => S, callback?: () => any): void;
+        setState(state: S, callback?: () => any): void;
+        forceUpdate(): void;
+        props: P;
+        state: S;
+        context: any;
+        refs: {
+            [key: string]: Component<any, any>
+        };
+    }
+
+    interface ClassicComponent<P, S> extends Component<P, S> {
+        replaceState(nextState: S, callback?: () => any): void;
+        getDOMNode<TElement extends Element>(): TElement;
+        getDOMNode(): Element;
+        isMounted(): boolean;
+        getInitialState?(): S;
+        setProps(nextProps: P, callback?: () => any): void;
+        replaceProps(nextProps: P, callback?: () => any): void;
+    }
+
+    interface DOMComponent<P> extends ClassicComponent<P, any> {
+        tagName: string;
+    }
+
+    type HTMLComponent = DOMComponent<HTMLAttributes>;
+    type SVGComponent = DOMComponent<SVGAttributes>;
+
+    interface ChildContextProvider<CC> {
+        getChildContext(): CC;
+    }
+
+    //
+    // Class Interfaces
+    // ----------------------------------------------------------------------
+
+    interface ComponentClass<P> {
+        new(props?: P, context?: any): Component<P, any>;
+        propTypes?: ValidationMap<P>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>;
+        defaultProps?: P;
+    }
+
+    interface ClassicComponentClass<P> extends ComponentClass<P> {
+        new(props?: P, context?: any): ClassicComponent<P, any>;
+        getDefaultProps?(): P;
+        displayName?: string;
+    }
+
+    //
+    // Component Specs and Lifecycle
+    // ----------------------------------------------------------------------
+
+    interface ComponentLifecycle<P, S> {
+        componentWillMount?(): void;
+        componentDidMount?(): void;
+        componentWillReceiveProps?(nextProps: P, nextContext: any): void;
+        shouldComponentUpdate?(nextProps: P, nextState: S, nextContext: any): boolean;
+        componentWillUpdate?(nextProps: P, nextState: S, nextContext: any): void;
+        componentDidUpdate?(prevProps: P, prevState: S, prevContext: any): void;
+        componentWillUnmount?(): void;
+    }
+
+    interface Mixin<P, S> extends ComponentLifecycle<P, S> {
+        mixins?: Mixin<P, S>;
+        statics?: {
+            [key: string]: any;
+        };
+
+        displayName?: string;
+        propTypes?: ValidationMap<any>;
+        contextTypes?: ValidationMap<any>;
+        childContextTypes?: ValidationMap<any>
+
+        getDefaultProps?(): P;
+        getInitialState?(): S;
+    }
+
+    interface ComponentSpec<P, S> extends Mixin<P, S> {
+        render(): ReactElement<any>;
+    }
+
+    //
+    // Event System
+    // ----------------------------------------------------------------------
+
+    interface SyntheticEvent {
+        bubbles: boolean;
+        cancelable: boolean;
+        currentTarget: EventTarget;
+        defaultPrevented: boolean;
+        eventPhase: number;
+        isTrusted: boolean;
+        nativeEvent: Event;
+        preventDefault(): void;
+        stopPropagation(): void;
+        target: EventTarget;
+        timeStamp: Date;
+        type: string;
+    }
+
+    interface DragEvent extends SyntheticEvent {
+        dataTransfer: DataTransfer;
+    }
+
+    interface ClipboardEvent extends SyntheticEvent {
+        clipboardData: DataTransfer;
+    }
+
+    interface KeyboardEvent extends SyntheticEvent {
+        altKey: boolean;
+        charCode: number;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        key: string;
+        keyCode: number;
+        locale: string;
+        location: number;
+        metaKey: boolean;
+        repeat: boolean;
+        shiftKey: boolean;
+        which: number;
+    }
+
+    interface FocusEvent extends SyntheticEvent {
+        relatedTarget: EventTarget;
+    }
+
+    interface FormEvent extends SyntheticEvent {
+    }
+
+    interface MouseEvent extends SyntheticEvent {
+        altKey: boolean;
+        button: number;
+        buttons: number;
+        clientX: number;
+        clientY: number;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        pageX: number;
+        pageY: number;
+        relatedTarget: EventTarget;
+        screenX: number;
+        screenY: number;
+        shiftKey: boolean;
+    }
+
+    interface TouchEvent extends SyntheticEvent {
+        altKey: boolean;
+        changedTouches: TouchList;
+        ctrlKey: boolean;
+        getModifierState(key: string): boolean;
+        metaKey: boolean;
+        shiftKey: boolean;
+        targetTouches: TouchList;
+        touches: TouchList;
+    }
+
+    interface UIEvent extends SyntheticEvent {
+        detail: number;
+        view: AbstractView;
+    }
+
+    interface WheelEvent extends SyntheticEvent {
+        deltaMode: number;
+        deltaX: number;
+        deltaY: number;
+        deltaZ: number;
+    }
+
+    //
+    // Event Handler Types
+    // ----------------------------------------------------------------------
+
+    interface EventHandler<E extends SyntheticEvent> {
+        (event: E): void;
+    }
+
+    interface DragEventHandler extends EventHandler<DragEvent> {}
+    interface ClipboardEventHandler extends EventHandler<ClipboardEvent> {}
+    interface KeyboardEventHandler extends EventHandler<KeyboardEvent> {}
+    interface FocusEventHandler extends EventHandler<FocusEvent> {}
+    interface FormEventHandler extends EventHandler<FormEvent> {}
+    interface MouseEventHandler extends EventHandler<MouseEvent> {}
+    interface TouchEventHandler extends EventHandler<TouchEvent> {}
+    interface UIEventHandler extends EventHandler<UIEvent> {}
+    interface WheelEventHandler extends EventHandler<WheelEvent> {}
+
+    //
+    // Props / DOM Attributes
+    // ----------------------------------------------------------------------
+
+    interface Props<T> {
+        children?: ReactNode;
+        key?: string | number;
+        ref?: string | ((component: T) => any);
+    }
+
+    interface DOMAttributes extends Props<DOMComponent<any>> {
+        onCopy?: ClipboardEventHandler;
+        onCut?: ClipboardEventHandler;
+        onPaste?: ClipboardEventHandler;
+        onKeyDown?: KeyboardEventHandler;
+        onKeyPress?: KeyboardEventHandler;
+        onKeyUp?: KeyboardEventHandler;
+        onFocus?: FocusEventHandler;
+        onBlur?: FocusEventHandler;
+        onChange?: FormEventHandler;
+        onInput?: FormEventHandler;
+        onSubmit?: FormEventHandler;
+        onClick?: MouseEventHandler;
+        onDoubleClick?: MouseEventHandler;
+        onDrag?: DragEventHandler;
+        onDragEnd?: DragEventHandler;
+        onDragEnter?: DragEventHandler;
+        onDragExit?: DragEventHandler;
+        onDragLeave?: DragEventHandler;
+        onDragOver?: DragEventHandler;
+        onDragStart?: DragEventHandler;
+        onDrop?: DragEventHandler;
+        onMouseDown?: MouseEventHandler;
+        onMouseEnter?: MouseEventHandler;
+        onMouseLeave?: MouseEventHandler;
+        onMouseMove?: MouseEventHandler;
+        onMouseOut?: MouseEventHandler;
+        onMouseOver?: MouseEventHandler;
+        onMouseUp?: MouseEventHandler;
+        onTouchCancel?: TouchEventHandler;
+        onTouchEnd?: TouchEventHandler;
+        onTouchMove?: TouchEventHandler;
+        onTouchStart?: TouchEventHandler;
+        onScroll?: UIEventHandler;
+        onWheel?: WheelEventHandler;
+
+        dangerouslySetInnerHTML?: {
+            __html: string;
+        };
+    }
+
+    // This interface is not complete. Only properties accepting
+    // unitless numbers are listed here (see CSSProperty.js in React)
+    interface CSSProperties {
+        boxFlex?: number;
+        boxFlexGroup?: number;
+        columnCount?: number;
+        flex?: number | string;
+        flexGrow?: number;
+        flexShrink?: number;
+        fontWeight?: number | string;
+        lineClamp?: number;
+        lineHeight?: number | string;
+        opacity?: number;
+        order?: number;
+        orphans?: number;
+        widows?: number;
+        zIndex?: number;
+        zoom?: number;
+
+        // SVG-related properties
+        fillOpacity?: number;
+        strokeOpacity?: number;
+        strokeWidth?: number;
+    }
+
+    interface HTMLAttributes extends DOMAttributes {
+        ref?: string | ((component: HTMLComponent) => void);
+
+        accept?: string;
+        acceptCharset?: string;
+        accessKey?: string;
+        action?: string;
+        allowFullScreen?: boolean;
+        allowTransparency?: boolean;
+        alt?: string;
+        async?: boolean;
+        autoComplete?: boolean;
+        autoFocus?: boolean;
+        autoPlay?: boolean;
+        cellPadding?: number | string;
+        cellSpacing?: number | string;
+        charSet?: string;
+        checked?: boolean;
+        classID?: string;
+        className?: string;
+        cols?: number;
+        colSpan?: number;
+        content?: string;
+        contentEditable?: boolean;
+        contextMenu?: string;
+        controls?: any;
+        coords?: string;
+        crossOrigin?: string;
+        data?: string;
+        dateTime?: string;
+        defer?: boolean;
+        dir?: string;
+        disabled?: boolean;
+        download?: any;
+        draggable?: boolean;
+        encType?: string;
+        form?: string;
+        formAction?: string;
+        formEncType?: string;
+        formMethod?: string;
+        formNoValidate?: boolean;
+        formTarget?: string;
+        frameBorder?: number | string;
+        headers?: string;
+        height?: number | string;
+        hidden?: boolean;
+        high?: number;
+        href?: string;
+        hrefLang?: string;
+        htmlFor?: string;
+        httpEquiv?: string;
+        icon?: string;
+        id?: string;
+        label?: string;
+        lang?: string;
+        list?: string;
+        loop?: boolean;
+        low?: number;
+        manifest?: string;
+        marginHeight?: number;
+        marginWidth?: number;
+        max?: number | string;
+        maxLength?: number;
+        media?: string;
+        mediaGroup?: string;
+        method?: string;
+        min?: number | string;
+        multiple?: boolean;
+        muted?: boolean;
+        name?: string;
+        noValidate?: boolean;
+        open?: boolean;
+        optimum?: number;
+        pattern?: string;
+        placeholder?: string;
+        poster?: string;
+        preload?: string;
+        radioGroup?: string;
+        readOnly?: boolean;
+        rel?: string;
+        required?: boolean;
+        role?: string;
+        rows?: number;
+        rowSpan?: number;
+        sandbox?: string;
+        scope?: string;
+        scoped?: boolean;
+        scrolling?: string;
+        seamless?: boolean;
+        selected?: boolean;
+        shape?: string;
+        size?: number;
+        sizes?: string;
+        span?: number;
+        spellCheck?: boolean;
+        src?: string;
+        srcDoc?: string;
+        srcSet?: string;
+        start?: number;
+        step?: number | string;
+        style?: CSSProperties;
+        tabIndex?: number;
+        target?: string;
+        title?: string;
+        type?: string;
+        useMap?: string;
+        value?: string;
+        width?: number | string;
+        wmode?: string;
+
+        // Non-standard Attributes
+        autoCapitalize?: boolean;
+        autoCorrect?: boolean;
+        property?: string;
+        itemProp?: string;
+        itemScope?: boolean;
+        itemType?: string;
+        unselectable?: boolean;
+    }
+
+    interface SVGElementAttributes extends HTMLAttributes {
+        viewBox?: string;
+        preserveAspectRatio?: string;
+    }
+
+    interface SVGAttributes extends DOMAttributes {
+        ref?: string | ((component: SVGComponent) => void);
+
+        cx?: number | string;
+        cy?: number | string;
+        d?: string;
+        dx?: number | string;
+        dy?: number | string;
+        fill?: string;
+        fillOpacity?: number | string;
+        fontFamily?: string;
+        fontSize?: number | string;
+        fx?: number | string;
+        fy?: number | string;
+        gradientTransform?: string;
+        gradientUnits?: string;
+        markerEnd?: string;
+        markerMid?: string;
+        markerStart?: string;
+        offset?: number | string;
+        opacity?: number | string;
+        patternContentUnits?: string;
+        patternUnits?: string;
+        points?: string;
+        preserveAspectRatio?: string;
+        r?: number | string;
+        rx?: number | string;
+        ry?: number | string;
+        spreadMethod?: string;
+        stopColor?: string;
+        stopOpacity?: number | string;
+        stroke?: string;
+        strokeDasharray?: string;
+        strokeLinecap?: string;
+        strokeOpacity?: number | string;
+        strokeWidth?: number | string;
+        textAnchor?: string;
+        transform?: string;
+        version?: string;
+        viewBox?: string;
+        x1?: number | string;
+        x2?: number | string;
+        x?: number | string;
+        y1?: number | string;
+        y2?: number | string
+        y?: number | string;
+    }
+
+    //
+    // React.DOM
+    // ----------------------------------------------------------------------
+
+    interface ReactDOM {
+        // HTML
+        a: HTMLFactory;
+        abbr: HTMLFactory;
+        address: HTMLFactory;
+        area: HTMLFactory;
+        article: HTMLFactory;
+        aside: HTMLFactory;
+        audio: HTMLFactory;
+        b: HTMLFactory;
+        base: HTMLFactory;
+        bdi: HTMLFactory;
+        bdo: HTMLFactory;
+        big: HTMLFactory;
+        blockquote: HTMLFactory;
+        body: HTMLFactory;
+        br: HTMLFactory;
+        button: HTMLFactory;
+        canvas: HTMLFactory;
+        caption: HTMLFactory;
+        cite: HTMLFactory;
+        code: HTMLFactory;
+        col: HTMLFactory;
+        colgroup: HTMLFactory;
+        data: HTMLFactory;
+        datalist: HTMLFactory;
+        dd: HTMLFactory;
+        del: HTMLFactory;
+        details: HTMLFactory;
+        dfn: HTMLFactory;
+        dialog: HTMLFactory;
+        div: HTMLFactory;
+        dl: HTMLFactory;
+        dt: HTMLFactory;
+        em: HTMLFactory;
+        embed: HTMLFactory;
+        fieldset: HTMLFactory;
+        figcaption: HTMLFactory;
+        figure: HTMLFactory;
+        footer: HTMLFactory;
+        form: HTMLFactory;
+        h1: HTMLFactory;
+        h2: HTMLFactory;
+        h3: HTMLFactory;
+        h4: HTMLFactory;
+        h5: HTMLFactory;
+        h6: HTMLFactory;
+        head: HTMLFactory;
+        header: HTMLFactory;
+        hr: HTMLFactory;
+        html: HTMLFactory;
+        i: HTMLFactory;
+        iframe: HTMLFactory;
+        img: HTMLFactory;
+        input: HTMLFactory;
+        ins: HTMLFactory;
+        kbd: HTMLFactory;
+        keygen: HTMLFactory;
+        label: HTMLFactory;
+        legend: HTMLFactory;
+        li: HTMLFactory;
+        link: HTMLFactory;
+        main: HTMLFactory;
+        map: HTMLFactory;
+        mark: HTMLFactory;
+        menu: HTMLFactory;
+        menuitem: HTMLFactory;
+        meta: HTMLFactory;
+        meter: HTMLFactory;
+        nav: HTMLFactory;
+        noscript: HTMLFactory;
+        object: HTMLFactory;
+        ol: HTMLFactory;
+        optgroup: HTMLFactory;
+        option: HTMLFactory;
+        output: HTMLFactory;
+        p: HTMLFactory;
+        param: HTMLFactory;
+        picture: HTMLFactory;
+        pre: HTMLFactory;
+        progress: HTMLFactory;
+        q: HTMLFactory;
+        rp: HTMLFactory;
+        rt: HTMLFactory;
+        ruby: HTMLFactory;
+        s: HTMLFactory;
+        samp: HTMLFactory;
+        script: HTMLFactory;
+        section: HTMLFactory;
+        select: HTMLFactory;
+        small: HTMLFactory;
+        source: HTMLFactory;
+        span: HTMLFactory;
+        strong: HTMLFactory;
+        style: HTMLFactory;
+        sub: HTMLFactory;
+        summary: HTMLFactory;
+        sup: HTMLFactory;
+        table: HTMLFactory;
+        tbody: HTMLFactory;
+        td: HTMLFactory;
+        textarea: HTMLFactory;
+        tfoot: HTMLFactory;
+        th: HTMLFactory;
+        thead: HTMLFactory;
+        time: HTMLFactory;
+        title: HTMLFactory;
+        tr: HTMLFactory;
+        track: HTMLFactory;
+        u: HTMLFactory;
+        ul: HTMLFactory;
+        "var": HTMLFactory;
+        video: HTMLFactory;
+        wbr: HTMLFactory;
+
+        // SVG
+        svg: SVGElementFactory;
+        circle: SVGFactory;
+        defs: SVGFactory;
+        ellipse: SVGFactory;
+        g: SVGFactory;
+        line: SVGFactory;
+        linearGradient: SVGFactory;
+        mask: SVGFactory;
+        path: SVGFactory;
+        pattern: SVGFactory;
+        polygon: SVGFactory;
+        polyline: SVGFactory;
+        radialGradient: SVGFactory;
+        rect: SVGFactory;
+        stop: SVGFactory;
+        text: SVGFactory;
+        tspan: SVGFactory;
+    }
+
+    //
+    // React.PropTypes
+    // ----------------------------------------------------------------------
+
+    interface Validator<T> {
+        (object: T, key: string, componentName: string): Error;
+    }
+
+    interface Requireable<T> extends Validator<T> {
+        isRequired: Validator<T>;
+    }
+
+    interface ValidationMap<T> {
+        [key: string]: Validator<T>;
+    }
+
+    interface ReactPropTypes {
+        any: Requireable<any>;
+        array: Requireable<any>;
+        bool: Requireable<any>;
+        func: Requireable<any>;
+        number: Requireable<any>;
+        object: Requireable<any>;
+        string: Requireable<any>;
+        node: Requireable<any>;
+        element: Requireable<any>;
+        instanceOf(expectedClass: {}): Requireable<any>;
+        oneOf(types: any[]): Requireable<any>;
+        oneOfType(types: Validator<any>[]): Requireable<any>;
+        arrayOf(type: Validator<any>): Requireable<any>;
+        objectOf(type: Validator<any>): Requireable<any>;
+        shape(type: ValidationMap<any>): Requireable<any>;
+    }
+
+    //
+    // React.Children
+    // ----------------------------------------------------------------------
+
+    interface ReactChildren {
+        map<T>(children: ReactNode, fn: (child: ReactChild) => T): { [key:string]: T };
+        forEach(children: ReactNode, fn: (child: ReactChild) => any): void;
+        count(children: ReactNode): number;
+        only(children: ReactNode): ReactChild;
+    }
+
+    //
+    // Browser Interfaces
+    // https://github.com/nikeee/2048-typescript/blob/master/2048/js/touch.d.ts
+    // ----------------------------------------------------------------------
+
+    interface AbstractView {
+        styleMedia: StyleMedia;
+        document: Document;
+    }
+
+    interface Touch {
+        identifier: number;
+        target: EventTarget;
+        screenX: number;
+        screenY: number;
+        clientX: number;
+        clientY: number;
+        pageX: number;
+        pageY: number;
+    }
+
+    interface TouchList {
+        [index: number]: Touch;
+        length: number;
+        item(index: number): Touch;
+        identifiedTouch(identifier: number): Touch;
+    }
+}
+
+declare module JSX {
+    interface Element extends React.ReactElement<any> { }
+    interface ElementClass extends React.Component<any, any> {
+        render(): JSX.Element;
+    }
+    interface ElementAttributesProperty { props: {}; }
+
+    interface IntrinsicElements {
+        // HTML
+        a: React.HTMLAttributes;
+        abbr: React.HTMLAttributes;
+        address: React.HTMLAttributes;
+        area: React.HTMLAttributes;
+        article: React.HTMLAttributes;
+        aside: React.HTMLAttributes;
+        audio: React.HTMLAttributes;
+        b: React.HTMLAttributes;
+        base: React.HTMLAttributes;
+        bdi: React.HTMLAttributes;
+        bdo: React.HTMLAttributes;
+        big: React.HTMLAttributes;
+        blockquote: React.HTMLAttributes;
+        body: React.HTMLAttributes;
+        br: React.HTMLAttributes;
+        button: React.HTMLAttributes;
+        canvas: React.HTMLAttributes;
+        caption: React.HTMLAttributes;
+        cite: React.HTMLAttributes;
+        code: React.HTMLAttributes;
+        col: React.HTMLAttributes;
+        colgroup: React.HTMLAttributes;
+        data: React.HTMLAttributes;
+        datalist: React.HTMLAttributes;
+        dd: React.HTMLAttributes;
+        del: React.HTMLAttributes;
+        details: React.HTMLAttributes;
+        dfn: React.HTMLAttributes;
+        dialog: React.HTMLAttributes;
+        div: React.HTMLAttributes;
+        dl: React.HTMLAttributes;
+        dt: React.HTMLAttributes;
+        em: React.HTMLAttributes;
+        embed: React.HTMLAttributes;
+        fieldset: React.HTMLAttributes;
+        figcaption: React.HTMLAttributes;
+        figure: React.HTMLAttributes;
+        footer: React.HTMLAttributes;
+        form: React.HTMLAttributes;
+        h1: React.HTMLAttributes;
+        h2: React.HTMLAttributes;
+        h3: React.HTMLAttributes;
+        h4: React.HTMLAttributes;
+        h5: React.HTMLAttributes;
+        h6: React.HTMLAttributes;
+        head: React.HTMLAttributes;
+        header: React.HTMLAttributes;
+        hr: React.HTMLAttributes;
+        html: React.HTMLAttributes;
+        i: React.HTMLAttributes;
+        iframe: React.HTMLAttributes;
+        img: React.HTMLAttributes;
+        input: React.HTMLAttributes;
+        ins: React.HTMLAttributes;
+        kbd: React.HTMLAttributes;
+        keygen: React.HTMLAttributes;
+        label: React.HTMLAttributes;
+        legend: React.HTMLAttributes;
+        li: React.HTMLAttributes;
+        link: React.HTMLAttributes;
+        main: React.HTMLAttributes;
+        map: React.HTMLAttributes;
+        mark: React.HTMLAttributes;
+        menu: React.HTMLAttributes;
+        menuitem: React.HTMLAttributes;
+        meta: React.HTMLAttributes;
+        meter: React.HTMLAttributes;
+        nav: React.HTMLAttributes;
+        noscript: React.HTMLAttributes;
+        object: React.HTMLAttributes;
+        ol: React.HTMLAttributes;
+        optgroup: React.HTMLAttributes;
+        option: React.HTMLAttributes;
+        output: React.HTMLAttributes;
+        p: React.HTMLAttributes;
+        param: React.HTMLAttributes;
+        picture: React.HTMLAttributes;
+        pre: React.HTMLAttributes;
+        progress: React.HTMLAttributes;
+        q: React.HTMLAttributes;
+        rp: React.HTMLAttributes;
+        rt: React.HTMLAttributes;
+        ruby: React.HTMLAttributes;
+        s: React.HTMLAttributes;
+        samp: React.HTMLAttributes;
+        script: React.HTMLAttributes;
+        section: React.HTMLAttributes;
+        select: React.HTMLAttributes;
+        small: React.HTMLAttributes;
+        source: React.HTMLAttributes;
+        span: React.HTMLAttributes;
+        strong: React.HTMLAttributes;
+        style: React.HTMLAttributes;
+        sub: React.HTMLAttributes;
+        summary: React.HTMLAttributes;
+        sup: React.HTMLAttributes;
+        table: React.HTMLAttributes;
+        tbody: React.HTMLAttributes;
+        td: React.HTMLAttributes;
+        textarea: React.HTMLAttributes;
+        tfoot: React.HTMLAttributes;
+        th: React.HTMLAttributes;
+        thead: React.HTMLAttributes;
+        time: React.HTMLAttributes;
+        title: React.HTMLAttributes;
+        tr: React.HTMLAttributes;
+        track: React.HTMLAttributes;
+        u: React.HTMLAttributes;
+        ul: React.HTMLAttributes;
+        "var": React.HTMLAttributes;
+        video: React.HTMLAttributes;
+        wbr: React.HTMLAttributes;
+
+        // SVG
+        svg: React.SVGElementAttributes;
+
+        circle: React.SVGAttributes;
+        defs: React.SVGAttributes;
+        ellipse: React.SVGAttributes;
+        g: React.SVGAttributes;
+        line: React.SVGAttributes;
+        linearGradient: React.SVGAttributes;
+        mask: React.SVGAttributes;
+        path: React.SVGAttributes;
+        pattern: React.SVGAttributes;
+        polygon: React.SVGAttributes;
+        polyline: React.SVGAttributes;
+        radialGradient: React.SVGAttributes;
+        rect: React.SVGAttributes;
+        stop: React.SVGAttributes;
+        text: React.SVGAttributes;
+        tspan: React.SVGAttributes;
+    }
+}
diff --git a/react/react-jsx.d.ts b/react/react-jsx.d.ts
deleted file mode 100644
index 26ee4b2201..0000000000
--- a/react/react-jsx.d.ts
+++ /dev/null
@@ -1,147 +0,0 @@
-// Type definitions for React v0.13.1 (JSX support)
-// Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
-// Definitions: https://github.com/borisyankov/DefinitelyTyped
-/// <reference path="react.d.ts" />
-
-declare module JSX {
-    interface Element extends React.ReactElement<any> { }
-    interface ElementClass extends React.Component<any, any> { }
-    interface ElementAttributesProperty { props: {}; }
-
-    interface IntrinsicElements {
-        // HTML
-        a: React.HTMLAttributes;
-        abbr: React.HTMLAttributes;
-        address: React.HTMLAttributes;
-        area: React.HTMLAttributes;
-        article: React.HTMLAttributes;
-        aside: React.HTMLAttributes;
-        audio: React.HTMLAttributes;
-        b: React.HTMLAttributes;
-        base: React.HTMLAttributes;
-        bdi: React.HTMLAttributes;
-        bdo: React.HTMLAttributes;
-        big: React.HTMLAttributes;
-        blockquote: React.HTMLAttributes;
-        body: React.HTMLAttributes;
-        br: React.HTMLAttributes;
-        button: React.HTMLAttributes;
-        canvas: React.HTMLAttributes;
-        caption: React.HTMLAttributes;
-        cite: React.HTMLAttributes;
-        code: React.HTMLAttributes;
-        col: React.HTMLAttributes;
-        colgroup: React.HTMLAttributes;
-        data: React.HTMLAttributes;
-        datalist: React.HTMLAttributes;
-        dd: React.HTMLAttributes;
-        del: React.HTMLAttributes;
-        details: React.HTMLAttributes;
-        dfn: React.HTMLAttributes;
-        dialog: React.HTMLAttributes;
-        div: React.HTMLAttributes;
-        dl: React.HTMLAttributes;
-        dt: React.HTMLAttributes;
-        em: React.HTMLAttributes;
-        embed: React.HTMLAttributes;
-        fieldset: React.HTMLAttributes;
-        figcaption: React.HTMLAttributes;
-        figure: React.HTMLAttributes;
-        footer: React.HTMLAttributes;
-        form: React.HTMLAttributes;
-        h1: React.HTMLAttributes;
-        h2: React.HTMLAttributes;
-        h3: React.HTMLAttributes;
-        h4: React.HTMLAttributes;
-        h5: React.HTMLAttributes;
-        h6: React.HTMLAttributes;
-        head: React.HTMLAttributes;
-        header: React.HTMLAttributes;
-        hr: React.HTMLAttributes;
-        html: React.HTMLAttributes;
-        i: React.HTMLAttributes;
-        iframe: React.HTMLAttributes;
-        img: React.HTMLAttributes;
-        input: React.HTMLAttributes;
-        ins: React.HTMLAttributes;
-        kbd: React.HTMLAttributes;
-        keygen: React.HTMLAttributes;
-        label: React.HTMLAttributes;
-        legend: React.HTMLAttributes;
-        li: React.HTMLAttributes;
-        link: React.HTMLAttributes;
-        main: React.HTMLAttributes;
-        map: React.HTMLAttributes;
-        mark: React.HTMLAttributes;
-        menu: React.HTMLAttributes;
-        menuitem: React.HTMLAttributes;
-        meta: React.HTMLAttributes;
-        meter: React.HTMLAttributes;
-        nav: React.HTMLAttributes;
-        noscript: React.HTMLAttributes;
-        object: React.HTMLAttributes;
-        ol: React.HTMLAttributes;
-        optgroup: React.HTMLAttributes;
-        option: React.HTMLAttributes;
-        output: React.HTMLAttributes;
-        p: React.HTMLAttributes;
-        param: React.HTMLAttributes;
-        picture: React.HTMLAttributes;
-        pre: React.HTMLAttributes;
-        progress: React.HTMLAttributes;
-        q: React.HTMLAttributes;
-        rp: React.HTMLAttributes;
-        rt: React.HTMLAttributes;
-        ruby: React.HTMLAttributes;
-        s: React.HTMLAttributes;
-        samp: React.HTMLAttributes;
-        script: React.HTMLAttributes;
-        section: React.HTMLAttributes;
-        select: React.HTMLAttributes;
-        small: React.HTMLAttributes;
-        source: React.HTMLAttributes;
-        span: React.HTMLAttributes;
-        strong: React.HTMLAttributes;
-        style: React.HTMLAttributes;
-        sub: React.HTMLAttributes;
-        summary: React.HTMLAttributes;
-        sup: React.HTMLAttributes;
-        table: React.HTMLAttributes;
-        tbody: React.HTMLAttributes;
-        td: React.HTMLAttributes;
-        textarea: React.HTMLAttributes;
-        tfoot: React.HTMLAttributes;
-        th: React.HTMLAttributes;
-        thead: React.HTMLAttributes;
-        time: React.HTMLAttributes;
-        title: React.HTMLAttributes;
-        tr: React.HTMLAttributes;
-        track: React.HTMLAttributes;
-        u: React.HTMLAttributes;
-        ul: React.HTMLAttributes;
-        "var": React.HTMLAttributes;
-        video: React.HTMLAttributes;
-        wbr: React.HTMLAttributes;
-
-        // SVG
-        svg: React.SVGElementAttributes;
-
-        circle: React.SVGAttributes;
-        defs: React.SVGAttributes;
-        ellipse: React.SVGAttributes;
-        g: React.SVGAttributes;
-        line: React.SVGAttributes;
-        linearGradient: React.SVGAttributes;
-        mask: React.SVGAttributes;
-        path: React.SVGAttributes;
-        pattern: React.SVGAttributes;
-        polygon: React.SVGAttributes;
-        polyline: React.SVGAttributes;
-        radialGradient: React.SVGAttributes;
-        rect: React.SVGAttributes;
-        stop: React.SVGAttributes;
-        text: React.SVGAttributes;
-        tspan: React.SVGAttributes;
-    }
-}
diff --git a/react/react.d.ts b/react/react.d.ts
index b23a8240ea..5fbad0d227 100644
--- a/react/react.d.ts
+++ b/react/react.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for React v0.13.1 (internal and external module)
+// Type definitions for React v0.13.1 (external module)
 // Project: http://facebook.github.io/react/
-// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>
+// Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
-declare module React {
+declare module __React {
     //
     // React Elements
     // ----------------------------------------------------------------------
@@ -48,6 +48,7 @@ declare module React {
 
     type HTMLFactory = DOMFactory<HTMLAttributes>;
     type SVGFactory = DOMFactory<SVGAttributes>;
+    type SVGElementFactory = DOMFactory<SVGElementAttributes>;
 
     //
     // React Nodes
@@ -691,6 +692,7 @@ declare module React {
         wbr: HTMLFactory;
 
         // SVG
+        svg: SVGElementFactory;
         circle: SVGFactory;
         defs: SVGFactory;
         ellipse: SVGFactory;
@@ -705,7 +707,6 @@ declare module React {
         radialGradient: SVGFactory;
         rect: SVGFactory;
         stop: SVGFactory;
-        svg: SVGFactory;
         text: SVGFactory;
         tspan: SVGFactory;
     }
@@ -785,5 +786,151 @@ declare module React {
 }
 
 declare module "react" {
-    export = React;
+    export = __React;
+}
+
+declare module JSX {
+    import React = __React;
+
+    interface Element extends React.ReactElement<any> { }
+    interface ElementClass extends React.Component<any, any> {
+        render(): JSX.Element;
+    }
+    interface ElementAttributesProperty { props: {}; }
+
+    interface IntrinsicElements {
+        // HTML
+        a: React.HTMLAttributes;
+        abbr: React.HTMLAttributes;
+        address: React.HTMLAttributes;
+        area: React.HTMLAttributes;
+        article: React.HTMLAttributes;
+        aside: React.HTMLAttributes;
+        audio: React.HTMLAttributes;
+        b: React.HTMLAttributes;
+        base: React.HTMLAttributes;
+        bdi: React.HTMLAttributes;
+        bdo: React.HTMLAttributes;
+        big: React.HTMLAttributes;
+        blockquote: React.HTMLAttributes;
+        body: React.HTMLAttributes;
+        br: React.HTMLAttributes;
+        button: React.HTMLAttributes;
+        canvas: React.HTMLAttributes;
+        caption: React.HTMLAttributes;
+        cite: React.HTMLAttributes;
+        code: React.HTMLAttributes;
+        col: React.HTMLAttributes;
+        colgroup: React.HTMLAttributes;
+        data: React.HTMLAttributes;
+        datalist: React.HTMLAttributes;
+        dd: React.HTMLAttributes;
+        del: React.HTMLAttributes;
+        details: React.HTMLAttributes;
+        dfn: React.HTMLAttributes;
+        dialog: React.HTMLAttributes;
+        div: React.HTMLAttributes;
+        dl: React.HTMLAttributes;
+        dt: React.HTMLAttributes;
+        em: React.HTMLAttributes;
+        embed: React.HTMLAttributes;
+        fieldset: React.HTMLAttributes;
+        figcaption: React.HTMLAttributes;
+        figure: React.HTMLAttributes;
+        footer: React.HTMLAttributes;
+        form: React.HTMLAttributes;
+        h1: React.HTMLAttributes;
+        h2: React.HTMLAttributes;
+        h3: React.HTMLAttributes;
+        h4: React.HTMLAttributes;
+        h5: React.HTMLAttributes;
+        h6: React.HTMLAttributes;
+        head: React.HTMLAttributes;
+        header: React.HTMLAttributes;
+        hr: React.HTMLAttributes;
+        html: React.HTMLAttributes;
+        i: React.HTMLAttributes;
+        iframe: React.HTMLAttributes;
+        img: React.HTMLAttributes;
+        input: React.HTMLAttributes;
+        ins: React.HTMLAttributes;
+        kbd: React.HTMLAttributes;
+        keygen: React.HTMLAttributes;
+        label: React.HTMLAttributes;
+        legend: React.HTMLAttributes;
+        li: React.HTMLAttributes;
+        link: React.HTMLAttributes;
+        main: React.HTMLAttributes;
+        map: React.HTMLAttributes;
+        mark: React.HTMLAttributes;
+        menu: React.HTMLAttributes;
+        menuitem: React.HTMLAttributes;
+        meta: React.HTMLAttributes;
+        meter: React.HTMLAttributes;
+        nav: React.HTMLAttributes;
+        noscript: React.HTMLAttributes;
+        object: React.HTMLAttributes;
+        ol: React.HTMLAttributes;
+        optgroup: React.HTMLAttributes;
+        option: React.HTMLAttributes;
+        output: React.HTMLAttributes;
+        p: React.HTMLAttributes;
+        param: React.HTMLAttributes;
+        picture: React.HTMLAttributes;
+        pre: React.HTMLAttributes;
+        progress: React.HTMLAttributes;
+        q: React.HTMLAttributes;
+        rp: React.HTMLAttributes;
+        rt: React.HTMLAttributes;
+        ruby: React.HTMLAttributes;
+        s: React.HTMLAttributes;
+        samp: React.HTMLAttributes;
+        script: React.HTMLAttributes;
+        section: React.HTMLAttributes;
+        select: React.HTMLAttributes;
+        small: React.HTMLAttributes;
+        source: React.HTMLAttributes;
+        span: React.HTMLAttributes;
+        strong: React.HTMLAttributes;
+        style: React.HTMLAttributes;
+        sub: React.HTMLAttributes;
+        summary: React.HTMLAttributes;
+        sup: React.HTMLAttributes;
+        table: React.HTMLAttributes;
+        tbody: React.HTMLAttributes;
+        td: React.HTMLAttributes;
+        textarea: React.HTMLAttributes;
+        tfoot: React.HTMLAttributes;
+        th: React.HTMLAttributes;
+        thead: React.HTMLAttributes;
+        time: React.HTMLAttributes;
+        title: React.HTMLAttributes;
+        tr: React.HTMLAttributes;
+        track: React.HTMLAttributes;
+        u: React.HTMLAttributes;
+        ul: React.HTMLAttributes;
+        "var": React.HTMLAttributes;
+        video: React.HTMLAttributes;
+        wbr: React.HTMLAttributes;
+
+        // SVG
+        svg: React.SVGElementAttributes;
+
+        circle: React.SVGAttributes;
+        defs: React.SVGAttributes;
+        ellipse: React.SVGAttributes;
+        g: React.SVGAttributes;
+        line: React.SVGAttributes;
+        linearGradient: React.SVGAttributes;
+        mask: React.SVGAttributes;
+        path: React.SVGAttributes;
+        pattern: React.SVGAttributes;
+        polygon: React.SVGAttributes;
+        polyline: React.SVGAttributes;
+        radialGradient: React.SVGAttributes;
+        rect: React.SVGAttributes;
+        stop: React.SVGAttributes;
+        text: React.SVGAttributes;
+        tspan: React.SVGAttributes;
+    }
 }
diff --git a/rx-angular/rx.angular-tests.ts b/rx-angular/rx.angular-tests.ts
new file mode 100644
index 0000000000..3caf011701
--- /dev/null
+++ b/rx-angular/rx.angular-tests.ts
@@ -0,0 +1,21 @@
+// Type definitions for angularjs extensions to rxjs
+// Project: http://reactivex.io/
+// Definitions by: Mick Delaney <https://github.com/mickdelaney/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="rx.angular.d.ts" />
+
+var app = angular.module('testModule');
+
+interface AppScope extends rx.angular.IRxScope {
+}
+
+app.controller('Ctrl', ($scope: AppScope) => {
+    	
+	this.inputObservable = $scope.$toObservable('term')
+								 .throttle(400)
+								 .safeApply($scope, (results: any) => {
+				                      this.results = results;
+				                  });
+				  
+});
diff --git a/rx-angular/rx.angular.d.ts b/rx-angular/rx.angular.d.ts
new file mode 100644
index 0000000000..e2d0ec8c5e
--- /dev/null
+++ b/rx-angular/rx.angular.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for angularjs extensions to rxjs
+// Project: http://reactivex.io/
+// Definitions by: Mick Delaney <https://github.com/mickdelaney/>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../angularjs/angular.d.ts" />
+/// <reference path="../rx/rx.d.ts" />
+/// <reference path="../rx/rx.time.d.ts" />
+
+declare module Rx {
+
+    interface IObservable<T> {
+        safeApply($scope: ng.IScope, callback: (data: any) => void): Rx.Observable<any>;
+    }
+}
+
+declare module rx.angular {
+    
+    export interface IRxScope extends ng.IScope {
+        $toObservable(property: string): Rx.Observable<any>;
+    }    
+}
+    
diff --git a/rx/rx-lite.d.ts b/rx/rx-lite.d.ts
index c5034c3b7a..3ea8c6ed88 100644
--- a/rx/rx-lite.d.ts
+++ b/rx/rx-lite.d.ts
@@ -481,7 +481,7 @@ declare module Rx {
 		* @param [scheduler] Scheduler to run the enumeration of the input sequence on.
 		* @returns The observable sequence whose elements are pulled from the given generator sequence.
 		*/
-		fromItreable<T>(generator: () => { next(): { done: boolean; value?: T; }; }, scheduler?: IScheduler): Observable<T>;
+		fromIterable<T>(generator: () => { next(): { done: boolean; value?: T; }; }, scheduler?: IScheduler): Observable<T>;
 
 		/**
 		*  Converts an iterable into an Observable sequence
@@ -493,7 +493,7 @@ declare module Rx {
 		* @param [scheduler] Scheduler to run the enumeration of the input sequence on.
 		* @returns The observable sequence whose elements are pulled from the given generator sequence.
 		*/
-		fromItreable<T>(iterable: {}, scheduler?: IScheduler): Observable<T>;	// todo: can't describe ES6 Iterable via TypeScript type system
+		fromIterable<T>(iterable: {}, scheduler?: IScheduler): Observable<T>;	// todo: can't describe ES6 Iterable via TypeScript type system
 		generate<TState, TResult>(initialState: TState, condition: (state: TState) => boolean, iterate: (state: TState) => TState, resultSelector: (state: TState) => TResult, scheduler?: IScheduler): Observable<TResult>;
 		never<T>(): Observable<T>;
 
@@ -625,11 +625,11 @@ declare module Rx {
 		hasObservers(): boolean;
 	}
 
-    export interface Subject<T> extends ISubject<T> {
-    }
+	export interface Subject<T> extends ISubject<T> {
+	}
 
-    interface SubjectStatic {
-        new <T>(): Subject<T>;
+	interface SubjectStatic {
+		new <T>(): Subject<T>;
 		create<T>(observer?: Observer<T>, observable?: Observable<T>): ISubject<T>;
 	}
 
diff --git a/seedrandom/seedrandom-tests.ts b/seedrandom/seedrandom-tests.ts
new file mode 100644
index 0000000000..1f913a406b
--- /dev/null
+++ b/seedrandom/seedrandom-tests.ts
@@ -0,0 +1,25 @@
+import seedrandom = require("seedrandom");
+
+var rng = seedrandom("hello.");
+var n = rng();
+
+seedrandom("hello.", {global: true});
+n = Math.random();
+
+rng = seedrandom();
+n = rng();
+
+rng = seedrandom('added entropy.', { entropy: true });
+n = rng();
+
+var rng2 = seedrandom.xor4096('hello.');
+n = rng2();
+
+n = rng.quick();
+n = rng.int32();
+n = rng.double();
+
+var saveable = seedrandom("secret-seed", {state: true});
+for (var j = 0; j < 1e5; ++j) saveable();
+var saved = saveable.state();
+var replica = seedrandom("", {state: saved});
diff --git a/seedrandom/seedrandom.d.ts b/seedrandom/seedrandom.d.ts
new file mode 100644
index 0000000000..6b779c6066
--- /dev/null
+++ b/seedrandom/seedrandom.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for seedrandom 2.4.2
+// Project: https://github.com/davidbau/seedrandom
+// Definitions by: Kern Handa <https://github.com/kernhanda>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare type seedrandomStateType = boolean | (() => prng);
+
+interface prng {
+  new(seed?: string, options?: seedRandomOptions, callback?: any): prng;
+  (): number;
+  quick(): number;
+  int32(): number;
+  double(): number;
+  state(): () => prng;
+}
+
+interface seedrandom_prng {
+  (seed?: string, options?: seedRandomOptions, callback?: any): prng;
+  alea: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+  xor128: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+  tychei: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+  xorwow: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+  xor4096: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+  xorshift7: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+  quick: (seed?: string, options?: seedRandomOptions, callback?: seedrandomCallback) => prng;
+}
+
+interface seedrandomCallback {
+  (prng?: prng, shortseed?: string, global?: boolean, state?: seedrandomStateType): prng;
+}
+
+interface seedRandomOptions {
+  entropy?: boolean;
+  'global'?: boolean;
+  state?: seedrandomStateType;
+  pass?: seedrandomCallback;
+}
+
+declare var seedrandom: seedrandom_prng;
+
+declare module "seedrandom" {
+  export = seedrandom;
+}
diff --git a/selenium-webdriver/selenium-webdriver-tests.ts b/selenium-webdriver/selenium-webdriver-tests.ts
index 73ea8561e7..4ad2a7be60 100644
--- a/selenium-webdriver/selenium-webdriver-tests.ts
+++ b/selenium-webdriver/selenium-webdriver-tests.ts
@@ -14,11 +14,19 @@ function TestChromeOptions() {
 
     options = options.addArguments("a", "b", "c");
     options = options.addExtensions("a", "b", "c");
+    options = options.excludeSwitches("a", "b", "c");
     options = options.detachDriver(true);
     options = options.setChromeBinaryPath("path");
     options = options.setChromeLogFile("logfile");
     options = options.setLocalState("state");
+    options = options.androidActivity("com.example.Activity");
+    options = options.androidDeviceSerial("emulator-5554");
+    options = options.androidChrome();
+    options = options.androidPackage("com.android.chrome");
+    options = options.androidProcess("com.android.chrome");
+    options = options.androidUseRunningApp(true);
     options = options.setLoggingPrefs(new webdriver.logging.Preferences());
+    options = options.setPerfLoggingPrefs({enableNetwork: true, enablePage: true, enableTimeline: true, tracingCategories: "category", bufferUsageReportingInterval: 1000});
     options = options.setProxy({ proxyType: "proxyType" });
     options = options.setUserPreferences("preferences");
     var capabilities: webdriver.Capabilities = options.toCapabilities();
@@ -31,13 +39,14 @@ function TestServiceBuilder() {
     builder = new chrome.ServiceBuilder("exe");
 
     var anything: any = builder.build();
-    builder = builder.enableVerboseLogging();
+    builder = builder.usingPort(8080);
+    builder = builder.setAdbPort(5037);
     builder = builder.loggingTo("path");
+    builder = builder.enableVerboseLogging();
     builder = builder.setNumHttpThreads(5);
+    builder = builder.setUrlBasePath("path");
     builder = builder.setStdio("config");
     builder = builder.setStdio(["A", "B"]);
-    builder = builder.setUrlBasePath("path");
-    builder = builder.usingPort(8080);
     builder = builder.withEnvironment({ "A": "a", "B": "b" });
 }
 
diff --git a/selenium-webdriver/selenium-webdriver.d.ts b/selenium-webdriver/selenium-webdriver.d.ts
index c4af933c96..3950f78142 100644
--- a/selenium-webdriver/selenium-webdriver.d.ts
+++ b/selenium-webdriver/selenium-webdriver.d.ts
@@ -33,6 +33,14 @@ declare module chrome {
         prefs?: any;
     }
 
+    interface IPerfLoggingPrefs {
+      enableNetwork: boolean;
+      enablePage: boolean;
+      enableTimeline: boolean;
+      tracingCategories: string;
+      bufferUsageReportingInterval: number;
+    }
+
     /**
      * Class for managing ChromeDriver specific options.
      */
@@ -62,6 +70,16 @@ declare module chrome {
         addArguments(...var_args: string[]): Options;
 
 
+        /**
+         * List of Chrome command line switches to exclude that ChromeDriver by default
+         * passes when starting Chrome.  Do not prefix switches with "--".
+         *
+         * @param {...(string|!Array<string>)} var_args The switches to exclude.
+         * @return {!Options} A self reference.
+         */
+        excludeSwitches(...var_args: string[]): Options;
+
+
         /**
          * Add additional extensions to install when launching Chrome. Each extension
          * should be specified as the path to the packed CRX file, or a Buffer for an
@@ -114,6 +132,32 @@ declare module chrome {
          */
         setLoggingPrefs(prefs: webdriver.logging.Preferences): Options;
 
+        /**
+         * Sets the performance logging preferences. Options include:
+         *
+         * - `enableNetwork`: Whether or not to collect events from Network domain.
+         * - `enablePage`: Whether or not to collect events from Page domain.
+         * - `enableTimeline`: Whether or not to collect events from Timeline domain.
+         *     Note: when tracing is enabled, Timeline domain is implicitly disabled,
+         *     unless `enableTimeline` is explicitly set to true.
+         * - `tracingCategories`: A comma-separated string of Chrome tracing categories
+         *     for which trace events should be collected. An unspecified or empty
+         *     string disables tracing.
+         * - `bufferUsageReportingInterval`: The requested number of milliseconds
+         *     between DevTools trace buffer usage events. For example, if 1000, then
+         *     once per second, DevTools will report how full the trace buffer is. If a
+         *     report indicates the buffer usage is 100%, a warning will be issued.
+         *
+         * @param {{enableNetwork: boolean,
+         *          enablePage: boolean,
+         *          enableTimeline: boolean,
+         *          tracingCategories: string,
+         *          bufferUsageReportingInterval: number}} prefs The performance
+         *     logging preferences.
+         * @return {!Options} A self reference.
+         */
+        setPerfLoggingPrefs(prefs: IPerfLoggingPrefs): Options;
+
 
         /**
          * Sets preferences for the "Local State" file in Chrome's user data
@@ -124,6 +168,69 @@ declare module chrome {
         setLocalState(state: any): Options;
 
 
+        /**
+         * Sets the name of the activity hosting a Chrome-based Android WebView. This
+         * option must be set to connect to an [Android WebView](
+         * https://sites.google.com/a/chromium.org/chromedriver/getting-started/getting-started---android)
+         *
+         * @param {string} name The activity name.
+         * @return {!Options} A self reference.
+         */
+        androidActivity(name: string): Options;
+
+
+        /**
+         * Sets the device serial number to connect to via ADB. If not specified, the
+         * ChromeDriver will select an unused device at random. An error will be
+         * returned if all devices already have active sessions.
+         *
+         * @param {string} serial The device serial number to connect to.
+         * @return {!Options} A self reference.
+         */
+        androidDeviceSerial(serial: string): Options;
+
+
+        /**
+         * Configures the ChromeDriver to launch Chrome on Android via adb. This
+         * function is shorthand for
+         * {@link #androidPackage options.androidPackage('com.android.chrome')}.
+         * @return {!Options} A self reference.
+         */
+        androidChrome(): Options;
+
+
+        /**
+         * Sets the package name of the Chrome or WebView app.
+         *
+         * @param {?string} pkg The package to connect to, or `null` to disable Android
+         *     and switch back to using desktop Chrome.
+         * @return {!Options} A self reference.
+         */
+        androidPackage(pkg: string): Options;
+
+
+        /**
+         * Sets the process name of the Activity hosting the WebView (as given by `ps`).
+         * If not specified, the process name is assumed to be the same as
+         * {@link #androidPackage}.
+         *
+         * @param {string} processName The main activity name.
+         * @return {!Options} A self reference.
+         */
+        androidProcess(processName: string): Options;
+
+
+        /**
+         * Sets whether to connect to an already-running instead of the specified
+         * {@linkplain #androidProcess app} instead of launching the app with a clean
+         * data directory.
+         *
+         * @param {boolean} useRunning Whether to connect to a running instance.
+         * @return {!Options} A self reference.
+         */
+        androidUseRunningApp(useRunning: boolean): Options;
+
+
         /**
          * Sets the path to Chrome's log file. This path should exist on the machine
          * that will launch Chrome.
@@ -189,6 +296,17 @@ declare module chrome {
         usingPort(port: number): ServiceBuilder;
 
 
+        /**
+         * Sets which port adb is listening to. _The ChromeDriver will connect to adb
+         * if an {@linkplain Options#androidPackage Android session} is requested, but
+         * adb **must** be started beforehand._
+         *
+         * @param {number} port Which port adb is running on.
+         * @return {!ServiceBuilder} A self reference.
+         */
+        setAdbPort(port: number): ServiceBuilder;
+
+
         /**
          * Sets the path of the log file the driver should log to. If a log file is
          * not specified, the driver will log to stderr.
diff --git a/sequelize/sequelize.d.ts b/sequelize/sequelize.d.ts
index 85d473f28d..1bb6be593e 100644
--- a/sequelize/sequelize.d.ts
+++ b/sequelize/sequelize.d.ts
@@ -2703,7 +2703,6 @@ declare module "sequelize"
         }
 
         interface Lodash extends _.LoDashStatic {
-            includes(str: string, needle: string): boolean;
             camelizeIf(str: string, condition: boolean): string;
             camelizeIf(str: string, condition: any): string;
             underscoredIf(str: string, condition: boolean): string;
@@ -2785,4 +2784,4 @@ declare module "sequelize"
     var sequelize: sequelize.SequelizeStatic;
 
     export = sequelize;
-}
\ No newline at end of file
+}
diff --git a/shortid/shortid-tests.ts b/shortid/shortid-tests.ts
new file mode 100644
index 0000000000..31ee0df1d1
--- /dev/null
+++ b/shortid/shortid-tests.ts
@@ -0,0 +1,10 @@
+/// <reference path="shortid.d.ts" />
+
+import shortid = require('shortid');
+
+var my_short_id: string = shortid.generate();
+console.log(my_short_id);
+
+console.log('Is valid short id? => %s', shortid.isValid(my_short_id)); // => true
+console.log('Is valid short id? => %s', shortid.isValid(5)); // => false
+console.log('Is valid short id? => %s', shortid.isValid('i have spaces')); // => false
diff --git a/shortid/shortid.d.ts b/shortid/shortid.d.ts
new file mode 100644
index 0000000000..049e539695
--- /dev/null
+++ b/shortid/shortid.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for shortid
+// Project: https://github.com/dylang/shortid
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "shortid" {
+	export function generate(): string;
+	export function characters(string: string): string;
+	export function isValid(id: any): boolean;
+	export function worker(integer: number): void;
+	export function seed(float: number): void;
+}
diff --git a/skyway/skyway-tests.ts b/skyway/skyway-tests.ts
new file mode 100644
index 0000000000..a7eced27d4
--- /dev/null
+++ b/skyway/skyway-tests.ts
@@ -0,0 +1,51 @@
+/// <reference path="./skyway.d.ts" />
+/// <reference path="../webrtc/RTCPeerConnection.d.ts" />
+
+var peerByOption: PeerJs.Peer = new Peer({
+    key: 'peerKey',
+    debug: 3,
+    logFunction: ()=>{
+    }
+});
+
+peerByOption.listAllPeers(function(items){
+    for(var i in items){
+        console.log(decodeURI(items[i]));
+    }
+});
+
+var peerById: PeerJs.Peer = new Peer("peerid");
+
+var peerByIdAndOption: PeerJs.Peer = new Peer(
+    "peerId",
+    {
+        key: 'peerKey',
+        debug: 3,
+        logFunction: ()=>{
+        }
+    });
+
+var id = peerByOption.id;
+var connections = peerByOption.connections;
+var flag = peerByOption.disconnected;
+flag = peerByOption.destroyed;
+
+peerByOption.disconnect();
+peerByOption.destroy();
+
+var connection = peerById.connect("id", {
+    label: 'chat',
+    serialization: 'none',
+    metadata: {message: 'hi i want to chat with you!'}
+});
+
+var call = peerById.call('callto-id', (<any>window).localStream);
+
+var openHandler=()=> console.log("open");
+peerById.on("open", openHandler);
+peerById.on("connection", (c)=> console.log("connection"));
+peerById.on("call", (media)=> console.log("call"));
+peerById.on("close", ()=> console.log("close"));
+peerById.on("disconnected", ()=> console.log("disconnected"));
+peerById.on("error", (err)=> console.log(err));
+peerById.off("open", openHandler);
diff --git a/skyway/skyway.d.ts b/skyway/skyway.d.ts
new file mode 100644
index 0000000000..681d358b89
--- /dev/null
+++ b/skyway/skyway.d.ts
@@ -0,0 +1,184 @@
+// Type definitions for SkyWay
+// Project: http://nttcom.github.io/skyway/
+// Definitions by: Toshiya Nakakura <https://github.com/nakakura>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path='../webrtc/RTCPeerConnection.d.ts' />
+
+declare module PeerJs{
+    interface PeerJSOption{
+        key?: string;
+        host?: string;
+        port?: number;
+        path?: string;
+        secure?: boolean;
+        turn?: boolean;
+        config?: RTCPeerConnectionConfig;
+        debug?: number;
+    }
+
+    interface PeerConnectOption{
+        label?: string;
+        metadata?: any;
+        serialization?: string;
+        reliable?: boolean;
+    }
+
+    interface DataConnection{
+        send(data: any): void;
+        close(): void;
+        on(event: string, cb: ()=>void): void;
+        on(event: 'data', cb: (data: any)=>void): void;
+        on(event: 'open', cb: ()=>void): void;
+        on(event: 'close', cb: ()=>void): void;
+        on(event: 'error', cb: (err: any)=>void): void;
+        off(event: string, fn: Function, once?: boolean): void;
+        bufferSize: number;
+        dataChannel: RTCDataChannel;
+        label: string;
+        metadata: any;
+        open: boolean;
+        peerConnection: any;
+        peer: string;
+        reliable: boolean;
+        serialization: string;
+        type: string;
+    }
+
+    interface MediaConnection{
+        answer(stream?: any): void;
+        close(): void;
+        on(event: string, cb: ()=>void): void;
+        on(event: 'stream', cb: (stream: any)=>void): void;
+        on(event: 'close', cb: ()=>void): void;
+        on(event: 'error', cb: (err: any)=>void): void;
+        off(event: string, fn: Function, once?: boolean): void;
+        open: boolean;
+        metadata: any;
+        peer: string;
+        type: string;
+    }
+
+    interface utilSupportsObj {
+        audioVideo: boolean;
+        data: boolean;
+        binary: boolean;
+        reliable: boolean;
+    }
+
+    interface util{
+        browser: string;
+        supports: utilSupportsObj;
+    }
+
+    export interface Peer{
+        /**
+         *
+         * @param id The brokering ID of the remote peer (their peer.id).
+         * @param options for specifying details about Peer Connection
+         */
+        connect(id: string, options?: PeerJs.PeerJSOption): PeerJs.DataConnection;
+        /**
+         * Connects to the remote peer specified by id and returns a data connection.
+         * @param id The brokering ID of the remote peer (their peer.id).
+         * @param stream The caller's media stream
+         */
+        call(id: string, stream: any): PeerJs.MediaConnection;
+        /**
+         * Calls the remote peer specified by id and returns a media connection.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: string, cb: ()=>void): void;
+        /**
+         * Emitted when a connection to the PeerServer is established.
+         * @param event Event name
+         * @param cb id is the brokering ID of the peer
+         */
+        on(event: 'open', cb: (id: string)=>void): void;
+        /**
+         * Emitted when a new data connection is established from a remote peer.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'connection', cb: (dataConnection: PeerJs.DataConnection)=>void): void;
+        /**
+         * Emitted when a remote peer attempts to call you.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'call', cb: (mediaConnection: PeerJs.MediaConnection)=>void): void;
+        /**
+         * Emitted when the peer is destroyed and can no longer accept or create any new connections.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'close', cb: ()=>void): void;
+        /**
+         * Emitted when the peer is disconnected from the signalling server
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'disconnected', cb: ()=>void): void;
+        /**
+         * Errors on the peer are almost always fatal and will destroy the peer.
+         * @param event Event name
+         * @param cb Callback Function
+         */
+        on(event: 'error', cb: (err: any)=>void): void;
+        /**
+         * Remove event listeners.(EventEmitter3)
+         * @param {String} event The event we want to remove.
+         * @param {Function} fn The listener that we need to find.
+         * @param {Boolean} once Only remove once listeners.
+         */
+        off(event: string, fn: Function, once?: boolean): void;
+        /**
+         * Close the connection to the server, leaving all existing data and media connections intact.
+         */
+        disconnect(): void;
+        /**
+         * Close the connection to the server and terminate all existing connections.
+         */
+        destroy(): void;
+        /**
+         * Get a list of available peer IDs
+         * @param callback
+         */
+        listAllPeers(callback: (peerIds: Array<string>)=>void): void;
+
+        /**
+         * The brokering ID of this peer
+         */
+        id: string;
+        /**
+         * A hash of all connections associated with this peer, keyed by the remote peer's ID.
+         */
+        connections: any;
+        /**
+         * false if there is an active connection to the PeerServer.
+         */
+        disconnected: boolean;
+        /**
+         * true if this peer and all of its connections can no longer be used.
+         */
+        destroyed: boolean;
+    }
+}
+
+declare var Peer: {
+    prototype: RTCIceServer;
+    /**
+     * A peer can connect to other peers and listen for connections.
+     * @param id Other peers can connect to this peer using the provided ID.
+     *     If no ID is given, one will be generated by the brokering server.
+     * @param options for specifying details about PeerServer
+     */
+    new (id: string, options?: PeerJs.PeerJSOption): PeerJs.Peer;
+
+    /**
+     * A peer can connect to other peers and listen for connections.
+     * @param options for specifying details about PeerServer
+     */
+    new (options: PeerJs.PeerJSOption): PeerJs.Peer;
+};
diff --git a/slickgrid/SlickGrid.d.ts b/slickgrid/SlickGrid.d.ts
index cfdd3c690a..54686df9f2 100644
--- a/slickgrid/SlickGrid.d.ts
+++ b/slickgrid/SlickGrid.d.ts
@@ -1557,7 +1557,7 @@ declare module Slick {
 
 			public getLength(): number;
 			public getItem(index: number): T;
-			public getItemMetadata(): void;
+			public getItemMetadata(index?: number): void;
 
 			public onRowCountChanged: Slick.Event<OnRowCountChangedEventData>;
 			public onRowsChanged: Slick.Event<OnRowsChangedEventData>;
diff --git a/steam/steam-tests.ts b/steam/steam-tests.ts
new file mode 100644
index 0000000000..4bca1059ee
--- /dev/null
+++ b/steam/steam-tests.ts
@@ -0,0 +1,13 @@
+// Type definitions for steam
+// Project: https://github.com/seishun/node-steam
+// Definitions by: Andrey Kurdyumov <https://github.com/kant2002>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="steam.d.ts" />
+
+var bot = new Steam.SteamClient();
+bot.logOn({
+    accountName: 'username',
+    password: 'password'
+});
+bot.on('loggedOn', function () { /* ... */ });
diff --git a/steam/steam.d.ts b/steam/steam.d.ts
new file mode 100644
index 0000000000..3f31aef3f1
--- /dev/null
+++ b/steam/steam.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for steam
+// Project: https://github.com/seishun/node-steam
+// Definitions by: Andrey Kurdyumov <https://github.com/kant2002>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../node/node.d.ts" />
+
+declare module Steam {
+    export var servers: any;
+
+    export interface LogonOptions {
+        accountName: string;
+        password: string;
+        shaSentryfile?: string;
+        authCode?: string;
+    }
+
+    export enum EResult {
+        AccountLogonDenied
+    }
+
+    export enum EPersonaState {
+        Online
+    }
+
+    export enum EChatEntryType {
+        ChatMsg
+    }
+
+    export enum EChatMemberStateChange {
+        Kicked
+    }
+
+    export class SteamClient implements NodeJS.EventEmitter {
+        sessionId: string;
+        cookie: string[];
+        steamID: string;
+        users: {};
+
+        logOn(options: LogonOptions): void;
+        webLogOn(callback: (cookie: any[]) => void): void;
+
+        joinChat(chatId: string): void;
+        sendMessage(source: any, message: string, entryType: EChatEntryType): void;
+
+        setPersonaState(state: EPersonaState): void;
+        setPersonaName(name: string): void;
+
+        // Event emitter
+        addListener(event: string, listener: Function): NodeJS.EventEmitter;
+        on(event: string, listener: Function): NodeJS.EventEmitter;
+        once(event: string, listener: Function): NodeJS.EventEmitter;
+        removeListener(event: string, listener: Function): NodeJS.EventEmitter;
+        removeAllListeners(event?: string): NodeJS.EventEmitter;
+        setMaxListeners(n: number): void;
+        listeners(event: string): Function[];
+        emit(event: string, ...args: any[]): boolean;
+    }
+}
+
+declare module "steam" {
+    export = Steam;
+}
+
diff --git a/stylus/stylus.d.ts b/stylus/stylus.d.ts
index d6fd6ef5ba..5809570b90 100644
--- a/stylus/stylus.d.ts
+++ b/stylus/stylus.d.ts
@@ -43,6 +43,7 @@ declare module Stylus {
          * Expose middleware.
          */
         middleware(dir: string): Middleware;
+        middleware(options: any): Middleware;
 
         /**
          * Convert the given `css` to `stylus` source.
diff --git a/title-case/title-case-tests.ts b/title-case/title-case-tests.ts
new file mode 100644
index 0000000000..d1183db8f1
--- /dev/null
+++ b/title-case/title-case-tests.ts
@@ -0,0 +1,7 @@
+/// <reference path="title-case.d.ts" />
+
+import titleCase = require('title-case');
+
+console.log(titleCase('string')); 	// => "String"
+console.log(titleCase('PascalCase'));	// => "Pascal Case"
+console.log(titleCase('STRING', 'tr'));	// => "Strıng" 
diff --git a/title-case/title-case.d.ts b/title-case/title-case.d.ts
new file mode 100644
index 0000000000..c8e4dee309
--- /dev/null
+++ b/title-case/title-case.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for title-case
+// Project: https://github.com/blakeembrey/title-case
+// Definitions by: Sam Saint-Pettersen <https://github.com/stpettersens>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+declare module "title-case" {
+	function titleCase(string1: string, string2?: string): string;
+	export = titleCase;
+}
\ No newline at end of file
diff --git a/ui-grid/ui-grid-tests.ts b/ui-grid/ui-grid-tests.ts
new file mode 100644
index 0000000000..6bdae2f64c
--- /dev/null
+++ b/ui-grid/ui-grid-tests.ts
@@ -0,0 +1,88 @@
+/// <reference path="ui-grid.d.ts" />
+/// <reference path="../angularjs/angular.d.ts" />
+
+var columnDef: uiGrid.IColumnDef;
+columnDef.aggregationHideLabel = true;
+columnDef.aggregationHideLabel = false;
+columnDef.aggregationType = 1;
+columnDef.aggregationType = function () { return 1; };
+columnDef.cellClass = 'test';
+columnDef.cellClass = function (gridRow: uiGrid.IGridRow, gridCol: uiGrid.IGridColumn, index: number) {
+    return 'pizza';
+};
+columnDef.cellFilter = 'date';
+columnDef.cellTemplate = '<div blah="something">hello</div>';
+columnDef.cellTooltip = 'blah';
+columnDef.cellTooltip = function (gridRow: uiGrid.IGridRow, gridCol: uiGrid.IGridColumn) {
+    return 'blah';
+};
+columnDef.displayName = 'Jumper';
+columnDef.enableColumnMenu = false;
+columnDef.enableColumnMenus = false;
+columnDef.enableFiltering = true;
+columnDef.enableHiding = false;
+columnDef.enableSorting = true;
+columnDef.field = 'blam';
+columnDef.filter = {
+    condition: 2,
+    term: 'yes',
+    placeholder: 'testing',
+    noTerm: false,
+    flags: {
+        caseSensitive: true
+    },
+    type: 1,
+    selectOptions: [{value: 4, label: 'test'}],
+    disableCancelButton: false
+};
+columnDef.filterCellFiltered = false;
+columnDef.filterHeaderTemplate = '<div blah="test"></div>';
+columnDef.filters = [columnDef.filter];
+columnDef.footerCellClass =
+    (gridRow: uiGrid.IGridRow, rowRenderIndex: number, gridCol: uiGrid.IGridColumn, colRenderIndex: number) => {
+        return 'blah';
+    };
+columnDef.footerCellClass = 'theClass';
+columnDef.footerCellFilter = 'currency:$';
+columnDef.footerCellTemplate = '<div class="yoshi"></div>';
+columnDef.headerCellClass =
+    (gridRow: uiGrid.IGridRow, rowRenderIndex: number, gridCol: uiGrid.IGridColumn, colRenderIndex: number) => {
+        return 'blah';
+    };
+columnDef.headerCellClass = 'classy';
+columnDef.headerCellFilter = 'currency:$';
+columnDef.headerCellTemplate = '<div class="yoshi"></div>';
+columnDef.headerTooltip = false;
+columnDef.headerTooltip = 'The Tooltip';
+columnDef.headerTooltip = (col: uiGrid.IGridColumn) => {
+    return 'tooly';
+};
+columnDef.maxWidth = 200;
+columnDef.menuItems = [{
+    title: 'title',
+    icon: 'ico',
+    action: ($event: ng.IAngularEvent) => {
+        alert('click');
+    },
+    shown: () => { return true; },
+    active: () => { return false },
+    context: {a: 'lala'},
+    leaveOpen: false
+}];
+columnDef.minWidth = 100;
+columnDef.name = 'MyColumn';
+columnDef.sort = {
+    direction: 0,
+    ignoreSort: false,
+    priority: 1
+};
+columnDef.sortCellFiltered = false;
+columnDef.sortingAlgorithm = (a: any, b: any) => {
+    return -1;
+};
+columnDef.suppressRemoveSort = false;
+columnDef.type = 'Date';
+columnDef.visible = true;
+columnDef.width = 100;
+columnDef.width = '*';
+
diff --git a/ui-grid/ui-grid.d.ts b/ui-grid/ui-grid.d.ts
new file mode 100644
index 0000000000..f27700e701
--- /dev/null
+++ b/ui-grid/ui-grid.d.ts
@@ -0,0 +1,660 @@
+// Type definitions for ui-grid
+// Project: http://www.ui-grid.info/
+// Definitions by: Ben Tesser <https://github.com/btesser>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+// These are very definitely preliminary. Please feel free to improve.
+
+// Changelog:
+// 7/8/2015 ui-grid v3.0.0-rc.22-482dc67
+//   Added primary interfaces for row, column, api, grid, columnDef, and gridOptions.  Needs more tests!
+
+/// <reference path='../angularjs/angular.d.ts' />
+
+declare module uiGrid {
+    export interface IGridInstance {
+        appScope?: ng.IScope;
+        columnFooterHeight?: number;
+        footerHeight?: number;
+        isScrollingHorizontally?: boolean;
+        isScrollingVertically?: boolean;
+        scrollDirection?: number;
+        addRowHeaderColumn(column: IGridColumn): void;
+        assignTypes(): void;
+        buildColumnDefsFromData(rowBuilder: IRowBuilder): void;
+        buildColumns(options: IBuildColumnsOptions): ng.IPromise<any>;
+        buildStyles(): void;
+        callDataChangeCallbacks(type: number): void;
+        clearAllFilters(refreshRows: boolean, clearConditions: boolean, clearFlags: boolean): void;
+        columnRefreshCallback(name: string): void;
+        createLeftContainer(): void;
+        createRightContainer(): void;
+        flagScrollingHorizontally(): void;
+        flagScrollingVertically(): void;
+        getCellDisplayValue(row: IGridRow, col: IGridColumn): string;
+        getCellValue(row: IGridRow, col: IGridColumn): any;
+        getColDef(name: string): IColumnDef;
+        getColumn(name: string): IGridColumn;
+        getColumnSorting(): Array<IGridColumn>;
+        getGridQualifiedColField(col: IGridColumn): any;
+        getOnlyDataColumns(): Array<IGridColumn>;
+        getRow(rowEntity: any, rows?: Array<IGridRow>): IGridRow;
+        handleWindowResize(): void;
+        hasLeftContainer(): boolean;
+        hasRightContainer(): boolean;
+        hasLeftContainerColumns(): boolean;
+        hasRightContainerColumns(): boolean;
+        isRTL(): boolean;
+        isRowHeaderColumn(col: IGridColumn): boolean;
+        modifyRows(): void;
+        notifyDataChange(type: string): void;
+        precompileCellTemplates(): void;
+        processRowBuilders(gridRow: IGridRow): IGridRow;
+        processRowsCallback(name: string): void;
+        queueGridRefresh(): void;
+        queueRefresh(): void;
+        redrawCanvas(rowsAdded?: boolean): void;
+        refresh(rowsAltered?: boolean): void;
+        refreshCanvas(buildStyles?: boolean): ng.IPromise<any>;
+        refreshRows(): ng.IPromise<any>;
+        registerColumnBuilder(columnBuilder: IColumnBuilder): void;
+        registerColumnsProcessor(columnProcessor: IColumnProcessor, priority: number): void;
+        registerDataChangeCallback(callback: (grid: IGridInstance) => void, types: Array<string>): Function;
+        registerRowBuilder(rowBuilder: IRowBuilder): void;
+        registerRowsProcessor(rowProcessor: IRowProcessor, priority: number): void;
+        registerStyleComputation(styleComputation: ($scope: ng.IScope) => string): void;
+        removeRowsProcessor(rows: IRowProcessor): void;
+        resetColumnSorting(excludedColumn: IGridColumn): void;
+        scrollTo(rowEntity: any, colDef: IColumnDef): ng.IPromise<any>;
+        scrollToIfNecessary(gridRow: IGridRow, gridCol: IGridColumn): ng.IPromise<any>;
+        sortColumn(column: IGridColumn, direction?: number, add?: boolean): ng.IPromise<IGridColumn>;
+        updateCanvasHeight(): void;
+        updateFooterHeightCallback(name: string): void;
+    }
+    export interface IBuildColumnsOptions {
+        orderByColumnDefs?: boolean;
+    }
+    export interface IColumnBuilder {
+        (colDef: IColumnDef, col: IGridColumn, gridOptions: IGridOptions): void;
+    }
+    export interface IRowBuilder {
+        (row: IGridRow, gridOptions: IGridOptions): void;
+    }
+    export interface IRowProcessor {
+        (renderedRowsToProcess: Array<IGridRow>, columns: Array<IGridColumn>): Array<IGridRow>;
+    }
+    export interface IColumnProcessor {
+        (renderedColumnsToProcess: Array<IGridColumn>, rows: Array<IGridRow>): Array<IGridColumn>;
+    }
+    export interface IGridOptions {
+        aggregationCalcThrottle?: number;
+        appScopeProvider?: ng.IScope;
+        columnDefs?: IColumnDef;
+        columnFooterHeight?: number;
+        columnVirtualizationThreshold?: number;
+        data?: Array<any>;
+        enableColumnMenus?: boolean;
+        enableFiltering?: boolean;
+        enableHorizontalScrollbar?: boolean;
+        enableMinHeightCheck?: boolean;
+        enableRowHashing?: boolean;
+        enableRowSelection?: boolean;
+        enableSorting?: boolean;
+        enableVerticalScrollbar?: boolean;
+        excessColumns?: number;
+        excessRows?: number;
+        excludeProperties?: Array<string>;
+        flatEntityAccess?: boolean;
+        footerTemplate?: string;
+        gridFooterTemplate?: string;
+        gridMenuCustomItems?: Array<IMenuItem>;
+        gridMenuShowHideColumns?: boolean;
+        gridMenuTitleFilter: (title: string) => ng.IPromise<string> | string;
+        headerTemplate?: string;
+        horizontalScrollThreshold?: number;
+        infiniteScrollDown?: boolean;
+        infiniteScrollRowsFromEnd?: number;
+        infiniteScrollUp?: boolean;
+        maxVisibleColumnCount?: number;
+        minRowsToShow?: number;
+        minimumColumnSize?: number;
+        onRegisterApi: (gridApi: IGridApi) => void;
+        rowHeight?: number;
+        rowTemplate?: string;
+        scrollDebounce?: number;
+        scrollThreshold?: number;
+        showColumnFooter?: boolean;
+        showGridFooter?: boolean;
+        showHeader?: boolean;
+        useExternalFiltering?: boolean;
+        useExternalSorting?: boolean;
+        virtualizationThreshold?: number;
+        wheelScrollThrottle?: number;
+        getRowIdentity(): any;
+        rowEquality(entityA: IGridRow, entityB: IGridRow): boolean;
+        rowIdentity(): any;
+    }
+    export interface IGridApiConstructor {
+        new(grid: IGridInstance): IGridApi;
+    }
+    export interface IGridApi {
+        /**
+         * Registers a new event for the given feature. The event will get a .raise and .on prepended to it
+         *
+         * .raise.eventName() - takes no arguments
+         *
+         * .on.eventName(scope, callBackFn, _this)
+         * scope - a scope reference to add a deregister call to the scopes .$on('destroy').
+         * Scope is optional and can be a null value, but in this case you must deregister it yourself via the returned
+         * deregister function
+         * callBackFn - The function to call
+         * _this - optional this context variable for callbackFn. If omitted, grid.api will be used for the context
+         *
+         * .on.eventName returns a dereg function that will remove the listener. It's not necessary to use it as the
+         * listener will be removed when the scope is destroyed.
+         * @param featureName name of the feature that raises the event
+         * @param eventName name of the event
+         */
+        registerEvent(featureName: string, eventName: string): void;
+        /**
+         * Registers features and events from a simple objectMap.
+         * eventObjectMap must be in this format (multiple features allowed)
+         * @param eventObjectMap map of feature/event names
+         */
+        registerEventsFromObject(eventObjectMap: any): void;
+        /**
+         * Registers a new event for the given feature
+         * @param featureName name of the feature
+         * @param methodName name of the method
+         * @param callBackFn function to execute
+         * @param _this binds to callBackFn. Defaults to gridApi.grid
+         */
+        registerMethod(featureName: string, methodName: string, callBackFn: Function, _this: any): void;
+        /**
+         * Registers features and methods from a simple objectMap.
+         * eventObjectMap must be in this format (multiple features allowed)
+         * {featureName: { methodNameOne:function(args){}, methodNameTwo:function(args){} }
+         * @param eventObjectMap map of feature/event names
+         * @param _this binds this to _this for all functions. Defaults to gridApi.grid
+         */
+        registerMethodsFromObject(eventObjectMap: any, _this: any): void;
+        /**
+         * Used to execute a function while disabling the specified event listeners.
+         * Disables the listenerFunctions, executes the callbackFn, and then enables the listenerFunctions again
+         * @param listenerFuncs listenerFunc or array of listenerFuncs to suppress.
+         *                      These must be the same functions that were used in the .on.eventName method
+         * @param callBackFn function to execute
+         */
+        suppressEvents(listenerFuncs: Function | Array<Function>, callBackFn: Function): void;
+    }
+    export interface IGridRowConstructor {
+        /**
+         * GridRow is the viewModel for one logical row on the grid.
+         * A grid Row is not necessarily a one-to-one relation to gridOptions.data.
+         * @param entity the array item from GridOptions.data
+         * @param index the current position of the row in the array
+         * @param reference to the parent grid
+         */
+        new(entity: any, index: number, reference: IGridInstance): IGridRow;
+    }
+    export interface IGridRow {
+        /** A reference to an item in gridOptions.data[] */
+        entity: any;
+        /** A reference back to the grid */
+        grid: IGridInstance;
+        /**
+         * height of each individual row. changing the height will flag all
+         * row renderContainers to recalculate their canvas height
+         */
+        height: number;
+        /** uniqueId of row */
+        uid: string;
+        /** if true, row will be rendered */
+        visible: boolean;
+        // Additional features enabled by other modules
+        /** enable editing on row, grouping for example might disable editing on group header rows */
+        enableCellEdit: boolean;
+        /**
+         * Enable row selection for this row, only settable by internal code.
+         *
+         * The grouping feature, for example, might set group header rows to not be selectable.
+         * Defaults to true
+         * @default true
+         */
+        enableSelection: boolean;
+        /**
+         * Selected state of row.
+         * Should be readonly.
+         * Make any changes to selected state using setSelected().
+         * Defaults to false
+         *
+         * @readonly
+         * @default false
+         */
+        isSelected: boolean;
+        /**
+         * If set to false, then don't export this row,
+         * notwithstanding visible or other settings
+         * Defaults to true
+         * @default true
+         */
+        exporterEnableExporting: boolean;
+        /**
+         * Sets the isSelected property and updates the selectedCount
+         * Changes to isSelected state should only be made via this function
+         * @param selected Value to set
+         */
+        setSelected(selected: boolean): void;
+        /**
+         * Clears an override on the row that forces it to always be invisible.
+         * Emits the rowsVisibleChanged event if it changed the row visibility.
+         *
+         * This method can be called from the api, passing in the gridRow we want altered.
+         * It should really work by calling gridRow.clearRowInvisible,
+         * but that's not the way I coded it, and too late to change now.
+         * Changed to just call the internal function row.clearThisRowInvisible().
+         * @param row the row we want to clear the invisible flag
+         */
+        clearRowInvisible(row: IGridRow): void;
+        /**
+         * Clears any override on the row visibility, returning it to normal visibility calculations.
+         * Emits the rowsVisibleChanged event
+         * @param reason the reason (usually the module) for the row to be invisible. E.g. grouping, user, filter
+         * @param fromRowsProcessor whether we were called from a rowsProcessor, passed through to evaluateRowVisibility
+         */
+        clearRowInvisible(reason: string, fromRowsProcessor: boolean): void;
+        /**
+         * Determines whether the row should be visible based on invisibleReason,
+         * and if it changes the row visibility, then emits the rowsVisibleChanged event.
+         * Queues a grid refresh, but doesn't call it directly to avoid hitting lots of
+         * grid refreshes.
+         */
+        evaluateRowVisibility(fromRowProcessor: boolean): void;
+        /**
+         * returns the qualified field name minus the row path ie: entity.fieldA
+         * @param col column instance
+         * @returns resulting name that can be evaluated against a row
+         */
+        getEntityQualifiedColField(col: IGridColumn): string;
+        /**
+         * returns the qualified field name as it exists on scope ie: row.entity.fieldA
+         * @param col column instance
+         * @returns resulting name that can be evaluated on scope
+         */
+        getQualifiedColField(col: IGridColumn): string;
+        /**
+         * Sets an override on the row that forces it to always be invisible.
+         * Emits the rowsVisibleChanged event if it changed the row visibility.
+         * This method can be called from the api, passing in the gridRow we want altered.
+         * It should really work by calling gridRow.setRowInvisible,
+         * but that's not the way I coded it, and too late to change now.
+         * Changed to just call the internal function row.setThisRowInvisible().
+         * @param row the row we want to set to invisible
+         */
+        setRowInvisible(row: IGridRow): void;
+        /**
+         * Sets an override on the row that forces it to always be invisible.
+         * Emits the rowsVisibleChanged event if it changed the row visibility
+         * @param reason the reason (usually the module) for the row to be invisible. E.g. grouping, user, filter
+         * @param fromRowsProcessor whether we were called from a rowsProcessor, passed through to evaluateRowVisibility
+         */
+        setThisRowInvisible(reason: string, fromRowsProcessor: boolean): void;
+    }
+
+    export interface IGridColumnConstructor {
+        /**
+         * Represents the viewModel for each column.
+         * Any state or methods needed for a Grid Column are defined on this prototype
+         * @param gridCol Column definition
+         * @param index the current position of the column in the array
+         * @param grid reference to the grid
+         */
+        new(gridCol: IColumnDef, index: number, grid: IGridInstance): IGridColumn;
+    }
+
+    export interface IGridColumn {
+        /**
+         * Column name that will be shown in the header.
+         * If displayName is not provided then one is generated using the name.
+         */
+        displayName?: string;
+        /**
+         * field must be provided if you wish to bind to a property in the data source.
+         * Should be an angular expression that evaluates against grid.options.data array element.
+         * Can be a complex expression: employee.address.city, or can be a function: employee.getFullAddress().
+         * See the angular docs on binding expressions.
+         */
+        field?: string;
+        /** Filter on this column */
+        filter?: IFilterOptions;
+        /** Filters for this column. Includes 'term' property bound to filter input elements */
+        filters?: Array<IFilterOptions>;
+        name?: string;
+        /** Algorithm to use for sorting this column. Takes 'a' and 'b' parameters like any normal sorting function. */
+        sortingAlgorithm?: (a: any, b: any) => number;
+        /**
+         * Initializes a column
+         * @param colDef the column def to associate with this column
+         * @param uid The unique and immutable uid we'd like to allocate to this column
+         * @param grid the grid we'd like to create this column in
+         */
+        GridColumn(colDef: IColumnDef, uid: number, grid: IGridInstance): void;
+        /**
+         * Gets the aggregation label from colDef.aggregationLabel if specified or by using i18n,
+         * including deciding whether or not to display based on colDef.aggregationHideLabel.
+         * @param label the i18n lookup value to use for the column label
+         */
+        getAggregationText(label: string): void;
+        /**
+         * gets the aggregation value based on the aggregation type for this column.
+         * Debounced using scrollDebounce option setting
+         */
+        getAggregationValue(): string;
+        /**
+         * Returns the class name for the column
+         * @param prefixDot if true, will return .className instead of className
+         */
+        getColClass(prefixDot: boolean): string;
+        /** Returns the class definition for th column */
+        getColClassDefinition(): string;
+        /**
+         * Returns the render container object that this column belongs to.
+         * Columns will be default be in the body render container
+         * if they aren't allocated to one specifically.
+         */
+        getRenderContainer(): any; // @todo replace with interface for render container
+        /** Hides the column by setting colDef.visible = false */
+        hideColumn(): void;
+        /** Returns true if column is in the left render container */
+        isPinnedLeft(): boolean;
+        /** Returns true if column is in the right render container */
+        isPinnedRight(): boolean;
+        /**
+         * Sets a property on the column using the passed in columnDef,
+         * and setting the defaultValue if the value cannot be found on the colDef
+         * @param colDef the column def to look in for the property value
+         * @param propName the property name we'd like to set
+         * @param defaultValue the value to use if the colDef doesn't provide the setting
+         */
+        setPropertyOrDefault(colDef: IColumnDef, propName: string, defaultValue: any): void;
+        /** Makes the column visible by setting colDef.visible = true */
+        showColumn(): void;
+        /**
+         * Moves settings from the columnDef down onto the column, and sets properties as appropriate
+         * @param colDef the column def to look in for property value
+         * @param isNew whether the column is being newly created, if not we're updating an existing
+         *              column, and some items such as the sort shouldn't be copied down
+         */
+        updateColumnDef(colDef: IColumnDef, isNew: boolean): void;
+    }
+
+    /**
+     * Definition / configuration of an individual column,
+     * which would typically be one of many column definitions within the
+     * gridOptions.columnDefs array
+     */
+    export interface IColumnDef {
+        /**
+         * defaults to false
+         * if set to true hides the label text in the aggregation footer, so only the value is displayed.
+         */
+        aggregationHideLabel?: boolean;
+        /**
+         * The aggregation that you'd like to show in the columnFooter for this column.
+         * Valid values are in uiGridConstants, and currently include:
+         * uiGridConstants.aggregationTypes.count, uiGridConstants.aggregationTypes.sum,
+         * uiGridConstants.aggregationTypes.avg, uiGridConstants.aggregationTypes.min,
+         * uiGridConstants.aggregationTypes.max.
+         *
+         * You can also provide a function as the aggregation type,
+         * in this case your function needs to accept the full set of visible rows,
+         * and return a value that should be shown
+         */
+        aggregationType: number | Function;
+        /**
+         * cellClass can be a string specifying the class to append to a cell
+         * or it can be a function(row,rowRenderIndex, col, colRenderIndex)
+         * that returns a class name
+         */
+        cellClass?: string | ICellClassGetter;
+        /** cellFilter is a filter to apply to the content of each cell */
+        cellFilter?: string;
+        /**
+         * a custom template for each cell in this column.
+         * The default is ui-grid/uiGridCell.
+         * If you are using the cellNav feature,
+         * this template must contain a div that can receive focus.
+         */
+        cellTemplate?: string;
+        /**
+         * Whether or not to show a tooltip when a user hovers over the cell.
+         * If set to false, no tooltip.
+         * If true, the cell value is shown in the tooltip (useful if you have long values in your cells),
+         * if a function then that function is called passing in the row and the col cellTooltip(row, col)
+         * and the return value is shown in the tooltip,
+         * if it is a static string then displays that static string.
+         * Defaults to false
+         * @default false
+         */
+        cellTooltip?: boolean | string | ICellTooltipGetter;
+        /**
+         * Column name that will be shown in the header.
+         * If displayName is not provided then one is generated using the name.
+         */
+        displayName?: string;
+        /**
+         * if column menus are enabled, controls the column menus for this specific column
+         * (i.e. if gridOptions.enableColumnMenus, then you can control column menus using this option.
+         * If gridOptions.enableColumnMenus === false then you get no column menus irrespective of the value of this
+         * option
+         * ). Defaults to true.
+         * @default true
+         */
+        enableColumnMenu?: boolean;
+        /**
+         * Override for column menus everywhere - if set to false then you get no column menus.
+         * Defaults to true
+         * @default true
+         */
+        enableColumnMenus?: boolean;
+        /** turn off filtering for an individual column, where you've turned on filtering for the overall grid */
+        enableFiltering?: boolean;
+        /**
+         * When set to false, this setting prevents a user from hiding the column using the column menu or the grid
+         * menu.
+         * @default true
+         */
+        enableHiding?: boolean;
+        /**
+         * When enabled, this setting adds sort widgets to the column header, allowing sorting of the data in the
+         * individual column.
+         * @default true
+         */
+        enableSorting?: boolean;
+        /**
+         * field must be provided if you wish to bind to a property in the data source.
+         * Should be an angular expression that evaluates against grid.options.data array element
+         * Can be a complex expression: employee.address.city, or can be a function: employee.getFullAddress().
+         * See the angular docs on binding expressions.
+         */
+        field?: string;
+        /**
+         * Specify a single filter field on this column.
+         * A filter consists of a condition, a term, and a placeholder:
+         */
+        filter?: IFilterOptions;
+        /**
+         * @default false
+         * When true uiGrid will apply the cellFilter before applying search filters
+         */
+        filterCellFiltered?: boolean;
+        /**
+         * a custom template for the filter input. The default is ui-grid/ui-grid-filter
+         */
+        filterHeaderTemplate?: string;
+        /** Specify multiple filter fields */
+        filters?: Array<IFilterOptions>;
+        /**
+         * footerCellClass can be a string specifying the class to append to a cell or it can be
+         * a function(row,rowRenderIndex, col, colRenderIndex) that returns a class name
+         */
+        footerCellClass?: string | IHeaderFooterCellClassGetter;
+        /** footerCellFilter is a filter to apply to the content of the column footer */
+        footerCellFilter?: string;
+        /** a custom template for the footer for this column. The default is ui-grid/uiGridFooterCell */
+        footerCellTemplate?: string;
+        /**
+         * headerCellClass can be a string specifying the class to append to a cell or it can be
+         * a function(row,rowRenderIndex, col, colRenderIndex) that returns a class name
+         */
+        headerCellClass?: string | IHeaderFooterCellClassGetter;
+        /** headerCellFilter is a filter to apply to the content of the column header */
+        headerCellFilter?: string;
+        /** a custom template for the header for this column. The default is ui-grid/uiGridHeaderCell */
+        headerCellTemplate?: string;
+        /**
+         * Whether or not to show a tooltip when a user hovers over the header cell.
+         * If set to false, no tooltip.
+         * If true, the displayName is shown in the tooltip
+         * (useful if you have long values in your headers),
+         * if a function then that function is called passing in the row and the col
+         * headerTooltip( col ), and the return value is shown in the tooltip,
+         * if a static string then shows that static string.
+         * @default false
+         */
+        headerTooltip?: boolean | string | IHeaderTooltipGetter;
+        /** sets the maximum column width */
+        maxWidth?: number;
+        /** used to add menu items to a column. Refer to the tutorial on this functionality */
+        menuItems?: Array<IMenuItem>;
+        /** Sets the minimum column width */
+        minWidth?: number;
+        /**
+         * (mandatory) each column should have a name,
+         * although for backward compatibility with 2.x name can be omitted if field is present
+         */
+        name?: string;
+        /** An object of sort information */
+        sort?: ISortInfo;
+        /**
+         * @default false
+         * When true uiGrid will apply the cellFilter before sorting the data
+         * Note that when using this option uiGrid will assume that the displayed value is a string,
+         * and use the sortAlpha sortFn.
+         * It is possible to return a non-string value from an angularjs filter,
+         * in which case you should define a sortingAlgorithm for the column
+         * which handles the returned type.
+         * You may specify one of the sortingAlgorithms found in the rowSorter service.
+         */
+        sortCellFiltered?: boolean;
+        /** Algorithm to use for sorting this column */
+        sortingAlgorithm?: (a: any, b: any) => number;
+        /**
+         * When enabled, this setting hides the removeSort option in the menu,
+         * and prevents users from manually removing the sort
+         * @default false
+         */
+        suppressRemoveSort?: boolean;
+        /**
+         * the type of the column, used in sorting. If not provided then the grid will guess the type.
+         * Add this only if the grid guessing is not to your satisfaction.
+         * Note that if you choose date, your dates should be in a javascript date type
+         * One of:
+         * 'string', 'boolean', 'number', 'date', 'object', 'numberStr'
+         */
+        type?: string;
+        /**
+         * sets whether or not the column is visible
+         * @default true
+         */
+        visible?: boolean;
+        /**
+         * sets the column width.  Can be either a number or a percentage, or an * for auto.
+         */
+        width?: number | string;
+    }
+
+    export interface ICellClassGetter {
+        (gridRow?: IGridRow, gridCol?: IGridColumn, colRenderIndex?: number): string;
+    }
+
+    export interface ICellTooltipGetter {
+        (gridRow: IGridRow, gridCol: IGridColumn): string;
+    }
+    export interface IHeaderTooltipGetter {
+        (gridCol: IGridColumn): string;
+    }
+    export interface IHeaderFooterCellClassGetter {
+        (gridRow: IGridRow, rowRenderIndex: number, gridCol: IGridColumn, colRenderIndex: number): string;
+    }
+    export interface IMenuItem {
+        /** controls the title that is displayed in the menu */
+        title?: string;
+        /** the icon shown alongside that title */
+        icon?: string;
+        /** the method to call when the menu is clicked */
+        action?: ($event: ng.IAngularEvent) => void;
+        /** a function to evaluate to determine whether or not to show the item */
+        shown?: () => boolean;
+        /** a function to evaluate to determine whether or not the item is currently selected */
+        active?: () => boolean;
+        /** context to pass to the action function, available in this.context in your handler */
+        context?: any;
+        /** if set to true, the menu should stay open after the action, defaults to false */
+        leaveOpen?: boolean;
+    }
+    export interface ISortInfo {
+        direction?: number;
+        ignoreSort?: boolean;
+        priority?: number;
+    }
+
+    export interface IFilterOptions {
+        /**
+         * condition defines how rows are chosen as matching the filter term.
+         * This can be set to one of the constants in uiGridConstants.filter,
+         * or you can supply a custom filter function that gets passed the
+         * following arguments: [searchTerm, cellValue, row, column].
+         */
+        condition?: number;
+        /**
+         * If set, the filter field will be pre-populated with this value
+         */
+        term?: string;
+        /** String that will be set to the <input>.placeholder attribute */
+        placeholder?: string;
+        /**
+         * set this to true if you have defined a custom function in condition,
+         * and your custom function doesn't require a term
+         * (so it can run even when the term is null)
+         */
+        noTerm?: boolean;
+        /**
+         * only flag currently available is caseSensitive, set to false if you don't want case sensitive matching
+         */
+        flags?: IFilterFlags;
+        /**
+         * defaults to uiGridConstants.filter.INPUT, which gives a text box. If set to uiGridConstants.filter.SELECT
+         * then a select box will be shown with options selectOptions
+         */
+        type?: number;
+        /**
+         * options in the format [{ value: 1, label: 'male' }]. No i18n filter is provided, you need to perform the i18n
+         * on the values before you provide them
+         */
+        selectOptions?: Array<ISelectOption>;
+        /**
+         * If set to true then the 'x' button that cancels/clears the filter will not be shown.
+         * @default false
+         */
+        disableCancelButton?: boolean;
+    }
+    export interface ISelectOption {
+        value: number;
+        label: string;
+    }
+
+    export interface IFilterFlags {
+        caseSensitive?: boolean;
+    }
+}
diff --git a/velocity-animate/velocity-animate.d.ts b/velocity-animate/velocity-animate.d.ts
index 00c4218965..6946da972a 100644
--- a/velocity-animate/velocity-animate.d.ts
+++ b/velocity-animate/velocity-animate.d.ts
@@ -34,6 +34,16 @@ declare module jquery.velocity {
 		animate(options: {elements: NodeListOf<HTMLElement>; properties: Object; options: VelocityOptions}): void;
 		animate(elements: NodeListOf<HTMLElement>, properties: Object, options: VelocityOptions): void;
 		animate(element: HTMLElement, properties: Object, options: VelocityOptions): void;
+		/** 
+        	 * Get a hook value. Hooks are the subvalues of multi-value CSS properties.
+        	 * It features the same API as $.css().
+        	 */
+        	hook(element: HTMLElement|JQuery, cssKey: string): string;
+        	/** 
+        	 * Set a hook value. Hooks are the subvalues of multi-value CSS properties.
+        	 * It features the same API as $.css().
+        	 */
+        	hook(element: HTMLElement|JQuery, cssKey: string, cssValue: string): void;
 	}
 
 	interface VelocityOptions {
diff --git a/webrtc/MediaStream-tests.ts b/webrtc/MediaStream-tests.ts
index fde0d65dfb..0d4e710b83 100644
--- a/webrtc/MediaStream-tests.ts
+++ b/webrtc/MediaStream-tests.ts
@@ -23,6 +23,7 @@ navigator.webkitGetUserMedia(mediaStreamConstraints,
     console.log('label:' + stream.label);
     console.log('ended:' + stream.ended);
     stream.onended = (event:Event) => console.log('Stream ended');
+    stream.addEventListener("ended", (event:Event) => console.log('Stream ended'));
     var objectUrl = URL.createObjectURL(stream);
     var wkObjectUrl = webkitURL.createObjectURL(stream);
   },
@@ -37,6 +38,7 @@ navigator.mozGetUserMedia(mediaStreamConstraints,
     console.log('label:' + stream.label);
     console.log('ended:' + stream.ended);
     stream.onended = (event:Event) => console.log('Stream ended');
+    stream.addEventListener("ended", (event:Event) => console.log('Stream ended'));
     var objectUrl = URL.createObjectURL(stream);
     var wkObjectUrl = webkitURL.createObjectURL(stream);
   },
diff --git a/webrtc/MediaStream.d.ts b/webrtc/MediaStream.d.ts
index 98afabf47d..54de34e386 100644
--- a/webrtc/MediaStream.d.ts
+++ b/webrtc/MediaStream.d.ts
@@ -88,7 +88,7 @@ declare var webkitMediaStreamTrackList: {
   new (): MediaStreamTrackList;
 };
 
-interface MediaStream {
+interface MediaStream extends EventTarget{
   label: string;
   id: string;
   getAudioTracks(): MediaStreamTrackList;
@@ -126,7 +126,7 @@ interface LocalMediaStream extends MediaStream {
   stop(): void;
 }
 
-interface MediaStreamTrack {
+interface MediaStreamTrack extends EventTarget{
   kind: string;
   label: string;
   enabled: boolean;
@@ -163,4 +163,3 @@ declare var webkitURL: {
   new (): streamURL;
   createObjectURL(stream: MediaStream): string;
 };
-
diff --git a/webvr-api/webvr-api-tests.ts b/webvr-api/webvr-api-tests.ts
new file mode 100644
index 0000000000..df2a72438a
--- /dev/null
+++ b/webvr-api/webvr-api-tests.ts
@@ -0,0 +1,62 @@
+/// <reference path="./webvr-api.d.ts" />
+
+function fieldOfViewToProjectionMatrix(fov: WebVRApi.VRFieldOfView, zNear: number, zFar: number) {
+    var upTan = Math.tan(fov.upDegrees * Math.PI/180.0);
+    var downTan = Math.tan(fov.downDegrees * Math.PI/180.0);
+    var leftTan = Math.tan(fov.leftDegrees * Math.PI/180.0);
+    var rightTan = Math.tan(fov.rightDegrees * Math.PI/180.0);
+    var xScale = 2.0 / (leftTan + rightTan);
+    var yScale = 2.0 / (upTan + downTan);
+
+    var out = new Float32Array(16);
+    out[0] = xScale;
+    out[1] = 0.0;
+    out[2] = 0.0;
+    out[3] = 0.0;
+    out[4] = 0.0;
+    out[5] = yScale;
+    out[6] = 0.0;
+    out[7] = 0.0;
+    out[8] = -((leftTan - rightTan) * xScale * 0.5);
+    out[9] = ((upTan - downTan) * yScale * 0.5);
+    out[10] = -(zNear + zFar) / (zFar - zNear);
+    out[11] = -1.0;
+    out[12] = 0.0;
+    out[13] = 0.0;
+    out[14] = -(2.0 * zFar * zNear) / (zFar - zNear);
+    out[15] = 0.0;
+
+    return out;
+}
+
+var hmd: HMDVRDevice;
+var leftEyeParams = hmd.getEyeParameters("left");
+var rightEyeParams = hmd.getEyeParameters("right");
+var leftEyeRect = leftEyeParams.renderRect;
+var rightEyeRect = rightEyeParams.renderRect;
+
+var canvas: HTMLCanvasElement;
+canvas.width = rightEyeRect.x + rightEyeRect.width;
+canvas.height = Math.max(leftEyeRect.y + leftEyeRect.height, rightEyeRect.y + rightEyeRect.height);
+
+var gHMD: WebVRApi.VRDevice;
+var gPositionSensor: WebVRApi.VRDevice;
+
+navigator.getVRDevices().then(function(devices) {
+    for (var i = 0; i < devices.length; ++i) {
+        if (devices[i] instanceof HMDVRDevice) {
+            gHMD = devices[i];
+            break;
+        }
+    }
+
+    if (gHMD) {
+        for (var i = 0; i < devices.length; ++i) {
+            if (devices[i] instanceof PositionSensorVRDevice &&
+                devices[i].hardwareUnitId == gHMD.hardwareUnitId) {
+                gPositionSensor = devices[i];
+                break;
+            }
+        }
+    }
+});
diff --git a/webvr-api/webvr-api.d.ts b/webvr-api/webvr-api.d.ts
new file mode 100644
index 0000000000..16918cf303
--- /dev/null
+++ b/webvr-api/webvr-api.d.ts
@@ -0,0 +1,175 @@
+// Type definitions for WebVR API
+// Project: http://mozvr.github.io/webvr-spec/webvr.html
+// Definitions by: Toshiya Nakakura <https://github.com/nakakura>
+// Definitions: https://github.com/borisyankov/DefinitelyTyped
+
+/// <reference path="../geometry-dom/geometry-dom.d.ts" />
+/// <reference path="../es6-promise/es6-promise.d.ts" />
+
+declare type VREye = string;
+
+declare module WebVRApi {
+    export interface VRFieldOfViewReadOnly {
+        upDegrees: number;
+        rightDegrees: number;
+        downDegrees: number;
+        leftDegrees: number;
+    }
+
+    export interface VRFieldOfViewInit {
+        upDegrees: number;
+        rightDegrees: number;
+        downDegrees: number;
+        leftDegrees: number;
+    }
+
+    export interface VRFieldOfView extends VRFieldOfViewReadOnly {
+        constructor(upDegrees:number, rightDegrees:number, downDegrees:number, leftDegrees:number): VRFieldOfView;
+        upDegrees: number;
+        rightDegrees: number;
+        downDegrees: number;
+        leftDegrees: number;
+    }
+
+    export interface VRPositionState {
+        /**
+         * Monotonically increasing value that allows the author to determine if position state data been updated from the hardware.
+         */
+        timeStamp: number;
+        /**
+         * True if the position attribute is valid. If false position MUST be null.
+         */
+        hasPosition: boolean;
+        /**
+         * Position of the sensor at timeStamp as a 3D vector.
+         */
+        position?: GeometryDom.DOMPoint;
+        /**
+         * Linear velocity of the sensor at timeStamp.
+         */
+        linearVelocity?: GeometryDom.DOMPoint;
+        /**
+         * Linear acceleration of the sensor at timeStamp.
+         */
+        linearAcceleration?: GeometryDom.DOMPoint;
+        /**
+         * True if the orientation attribute is valid. If false orientation MUST be null.
+         */
+        hasOrientation: boolean;
+        /**
+         * Orientation of the sensor at timeStamp as a quaternion.
+         */
+        orientation?: GeometryDom.DOMPoint;
+        /**
+         * Angular velocity of the sensor at timeStamp.
+         */
+        angularVelocity?: GeometryDom.DOMPoint;
+        /**
+         * Angular acceleration of the sensor at timeStamp.
+         */
+        angularAcceleration?: GeometryDom.DOMPoint;
+    }
+
+    export interface VREyeParameters {
+        /**
+         * Describes the minimum supported field of view for the eye.
+         */
+        minimumFieldOfView: VRFieldOfView;
+        /**
+         * Describes the maximum supported field of view for the eye.
+         */
+        maximumFieldOfView: VRFieldOfView;
+        /**
+         * Describes the recommended field of view for the eye.
+         */
+        recommendedFieldOfView: VRFieldOfView;
+        /**
+         * Offset from the center of the users head to the eye in meters.
+         */
+        eyeTranslation: GeometryDom.DOMPoint;
+        /**
+         * The current field of view for the eye, as specified by setFieldOfView.
+         */
+        currentFieldOfView: VRFieldOfView;
+        /**
+         * Describes the viewport of a canvas into which visuals for this eye should be rendered.
+         */
+        renderRect: GeometryDom.DOMRect;
+    }
+
+    export interface VRDevice {
+        /**
+         * An identifier for the distinct hardware unit that this VRDevice is a part of.
+         */
+        hardwareUnitId: string;
+        /**
+         * An identifier for this distinct sensor/device on a physical hardware device.
+         */
+        deviceId: string;
+        /**
+         * A user-readable name identifying the device.
+         */
+        deviceName: string;
+    }
+}
+
+declare class HMDVRDevice implements WebVRApi.VRDevice {
+    /**
+     * An identifier for the distinct hardware unit that this VRDevice is a part of.
+     */
+    hardwareUnitId: string;
+    /**
+     * An identifier for this distinct sensor/device on a physical hardware device.
+     */
+    deviceId: string;
+    /**
+     * A user-readable name identifying the device.
+     */
+    deviceName: string;
+
+    /**
+     * Return the current VREyeParameters for the given eye.
+     */
+    getEyeParameters(whichEye: VREye): WebVRApi.VREyeParameters;
+    /**
+     * Set the field of view for both eyes. If
+     */
+    setFieldOfView(leftFOV?: WebVRApi.VRFieldOfViewInit, rightFOV?: WebVRApi.VRFieldOfViewInit, zNear?: number, zFar?: number): void;
+}
+
+declare class PositionSensorVRDevice implements WebVRApi.VRDevice {
+    /**
+     * An identifier for the distinct hardware unit that this VRDevice is a part of.
+     */
+    hardwareUnitId: string;
+    /**
+     * An identifier for this distinct sensor/device on a physical hardware device.
+     */
+    deviceId: string;
+    /**
+     * A user-readable name identifying the device.
+     */
+    deviceName: string;
+
+    /**
+     * Return a VRPositionState dictionary containing the state of this position sensor state for the current frame (if within a requestAnimationFrame context) or for the previous frame.
+     */
+    getState(): WebVRApi.VRPositionState;
+    /**
+     * Return the current instantaneous sensor state.
+     */
+    getImmediateState(): WebVRApi.VRPositionState;
+
+    /**
+     * Reset this sensor, treating its current position and orientation yaw as the "origin/zero" values.
+     */
+    resetSensor(): void;
+}
+
+interface Navigator {
+    /**
+     * Return a Promise which resolves to a list of available VRDevices.
+     */
+    getVRDevices(): Promise<Array<WebVRApi.VRDevice>>;
+}
+